summaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-06-01 23:25:13 -0400
committerSteven Rostedt <rostedt@goodmis.org>2011-06-02 11:57:56 -0400
commit4da46da2d295c0d9f4aaf28dd2b70a1ecb42d972 (patch)
treea5d01b5c399702afd71969ca0b1e94be4aa1c254 /tools/testing
parent4c8cc55b3c0ebe989e727017933945b68b4327cd (diff)
downloadblackbird-op-linux-4da46da2d295c0d9f4aaf28dd2b70a1ecb42d972.tar.gz
blackbird-op-linux-4da46da2d295c0d9f4aaf28dd2b70a1ecb42d972.zip
ktest: Fix result of rebooting the kernel
The command that is called that reboots the kernel may fail but the return code is not passed back to the ktest.pl script. This is because a ';' is used between the two commands and if the second command fails, only the first command's return code is returned. Using a '&&' between the two commands fixes this. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools/testing')
-rwxr-xr-xtools/testing/ktest/ktest.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 8dc8c3cf3acf..6c68259e730d 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -788,7 +788,7 @@ sub wait_for_input
sub reboot_to {
if ($reboot_type eq "grub") {
- run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch; reboot)'";
+ run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch && reboot)'";
return;
}
OpenPOWER on IntegriCloud