From: Steven Rostedt (VMware) <rostedt@goodmis.org>
Date: Fri, 6 Apr 2018 21:16:39 +0000 (-0400)
Subject: ktest.pl: Allow dodie be recursive
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=255769a17b86838eb724da5501eba6a31b0ed1ba;p=linux.git

ktest.pl: Allow dodie be recursive

If dodie cause a function that itself will call dodie, then be able to
handle that. This will allow dodie functions to call run_command, which
could possibly call dodie. If dodie is called again, simply ignore it.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 3400a23e6a41b..ac6750bb59426 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1433,7 +1433,14 @@ sub do_not_reboot {
 	($test_type eq "config_bisect" && $opt{"CONFIG_BISECT_TYPE[$i]"} eq "build");
 }
 
+my $in_die = 0;
+
 sub dodie {
+
+    # avoid recusion
+    return if ($in_die);
+    $in_die = 1;
+
     doprint "CRITICAL FAILURE... ", @_, "\n";
 
     my $i = $iteration;