aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/rcutorture/bin/parse-build.sh
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2020-12-23 16:00:27 -0800
committerPaul E. McKenney <paulmck@kernel.org>2021-01-04 14:01:25 -0800
commitb79b0b67791316e6ca0502bd0f2ecd7018d6d9e8 (patch)
tree4255c5bca0cc0c4479a6d4cb54d22dc617ab42e5 /tools/testing/selftests/rcutorture/bin/parse-build.sh
parenttorture: Remove "Failed to add ttynull console" false positive (diff)
downloadlinux-dev-b79b0b67791316e6ca0502bd0f2ecd7018d6d9e8.tar.xz
linux-dev-b79b0b67791316e6ca0502bd0f2ecd7018d6d9e8.zip
torture: Allow standalone kvm-recheck.sh run detect --trust-make
Normally, kvm-recheck.sh is run from kvm.sh, which provides the TORTURE_TRUST_MAKE environment variable that, if a non-empty string, indicates that the --trust-make command-line parameter has been passed to kvm.sh. If there was no --trust-make, kvm-recheck.sh insists that the Make.out file contain at least one "CC" command. Thus, when kvm-recheck.sh is run standalone to evaluate a prior --trust-make run, it will incorrectly insist that a proper kernel build did not happen. This commit therefore causes kvm-recheck.sh to also search the "log" file in the top-level results directory for the string "--trust-make". Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/testing/selftests/rcutorture/bin/parse-build.sh')
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/parse-build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/parse-build.sh b/tools/testing/selftests/rcutorture/bin/parse-build.sh
index 09155c15ea65..9313e5065ae9 100755
--- a/tools/testing/selftests/rcutorture/bin/parse-build.sh
+++ b/tools/testing/selftests/rcutorture/bin/parse-build.sh
@@ -21,7 +21,7 @@ mkdir $T
. functions.sh
-if grep -q CC < $F || test -n "$TORTURE_TRUST_MAKE"
+if grep -q CC < $F || test -n "$TORTURE_TRUST_MAKE" || grep -qe --trust-make < `dirname $F`/../log
then
:
else