diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-07 22:34:25 +0200 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-07 22:34:25 +0200 |
commit | d832d743385dd5e735660951aa9d7d36a6a4176a (patch) | |
tree | 19d28a395d71ac95715c95416914e7cca324de88 /tools/testing/ktest | |
parent | ktest: Fix check for new kernel success on rebooting to good kernel (diff) | |
download | linux-d832d743385dd5e735660951aa9d7d36a6a4176a.tar.xz linux-d832d743385dd5e735660951aa9d7d36a6a4176a.zip |
ktest: Don't bother with bisect good or bad on replay
If git bisect reply is being used in the bisect tests, don't bother
doing the git bisect good or git bisect bad calls. The git bisect
reply will override them anyway, and that's called immediately
after the other two. Going the git bisect (good|bad) is just a
waste of time.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools/testing/ktest')
-rwxr-xr-x | tools/testing/ktest/ktest.pl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index c518b0fb6d01..bf1398180785 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -2736,15 +2736,17 @@ sub bisect { run_command "git bisect start$start_files" or dodie "could not start bisect"; - run_command "git bisect good $good" or - dodie "could not set bisect good to $good"; - - run_git_bisect "git bisect bad $bad" or - dodie "could not set bisect bad to $bad"; - if (defined($replay)) { run_command "git bisect replay $replay" or dodie "failed to run replay"; + } else { + + run_command "git bisect good $good" or + dodie "could not set bisect good to $good"; + + run_git_bisect "git bisect bad $bad" or + dodie "could not set bisect bad to $bad"; + } if (defined($start)) { |