Messages in this thread |  | | Date | Wed, 17 Apr 2019 22:22:05 -0400 | From | Steven Rostedt <> | Subject | Re: [PATCH] ktest: Add workaround to avoid unexpected power cycle |
| |
On Wed, 17 Apr 2019 16:59:13 -0400 Masayoshi Mizuma <msys.mizuma@gmail.com> wrote:
> > > diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl > > > index ea07d43856b8..765c6bc83ab4 100755 > > > --- a/tools/testing/ktest/ktest.pl > > > +++ b/tools/testing/ktest/ktest.pl > > > @@ -1737,6 +1737,11 @@ sub run_command { > > > my $dord = 0; > > > my $dostdout = 0; > > > my $pid; > > > + my $is_default_reboot = 0; > > > + > > > + if ($command eq $default{REBOOT}) { > > > + $is_default_reboot = 1; > > > + } > > > > Do we really need to add this variable? > > > > > > > > > $command =~ s/\$SSH_USER/$ssh_user/g; > > > $command =~ s/\$MACHINE/$machine/g; > > $command is modified here, so...
Ah thanks. This is what I get for reviewing patches without looking at the code it touches ;-)
> > > > @@ -1791,6 +1796,10 @@ sub run_command { > > > # shift 8 for real exit status > > > $run_command_status = $? >> 8; > > > > > > + if ($run_command_status == 255 && $is_default_reboot) { > > > > Instead can we have: > > > > if ($command eq $default{REBOOT} && > > $run_command_status == $reboot_return_code) { > > > > ? > > How about the following? > > @@ -1737,6 +1740,7 @@ sub run_command { > my $dord = 0; > my $dostdout = 0; > my $pid; > + my $command_orig = $command; > > $command =~ s/\$SSH_USER/$ssh_user/g; > $command =~ s/\$MACHINE/$machine/g; > @@ -1791,6 +1795,11 @@ sub run_command { > # shift 8 for real exit status > $run_command_status = $? >> 8; > > + if ($command_orig eq $default{REBOOT} && > + $run_command_status == $reboot_return_code) { > + $run_command_status = 0; > + } > +
Looks fine to me.
Thanks!
-- Steve
> close(CMD); > close(LOG) if ($dolog); > close(RD) if ($dord); > > Thanks! > Masa
|  |