Messages in this thread Patch in this message | | | From | "Masami Hiramatsu (Google)" <> | Subject | [PATCH] ktest: Restore stty setting at first in dodie | Date | Fri, 20 Jan 2023 18:16:16 +0900 |
| |
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
The do_send_email() will call die before restoring stty if sendmail setting is not correct or sendmail is not installed. It is safer to restore it in the beginning of dodie().
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> --- tools/testing/ktest/ktest.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index ac59999ed3de..9fb3d79b084c 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1535,6 +1535,11 @@ sub dodie { return if ($in_die); $in_die = 1; + if ($monitor_cnt) { + # restore terminal settings + system("stty $stty_orig"); + } + my $i = $iteration; doprint "CRITICAL FAILURE... [TEST $i] ", @_, "\n"; @@ -1581,11 +1586,6 @@ sub dodie { "Your test started at $script_start_time has failed with:\n@_\n", $log_file); } - if ($monitor_cnt) { - # restore terminal settings - system("stty $stty_orig"); - } - if (defined($post_test)) { run_command $post_test; }
| |