diff options
| author | Paul E. McKenney <paulmck@kernel.org> | 2021-02-23 21:07:39 +0100 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2021-03-22 16:29:20 +0100 |
| commit | a5dbe2524f553a1283b3364ff91e96bfb618ceab (patch) | |
| tree | 2a493b62e5a755773a54c26b4e7b71da5400d0c9 /tools/testing | |
| parent | torture: Make kvm-transform.sh update jitter commands (diff) | |
| download | linux-a5dbe2524f553a1283b3364ff91e96bfb618ceab.tar.xz linux-a5dbe2524f553a1283b3364ff91e96bfb618ceab.zip | |
torture: Make TORTURE_TRUST_MAKE available in kvm-again.sh environment
Because the TORTURE_TRUST_MAKE environment variable is not recorded,
kvm-again.sh runs can result in the parse-build.sh script emitting
false-positive "BUG: TREE03 no build" messages. These messages are
intended to complain about any lack of compiler invocations when the
--trust-make flag is not given to kvm.sh. However, when this flag is
given to kvm.sh (and thus when TORTURE_TRUST_MAKE=y), lack of compiler
invocations is expected behavior when rebuilding from identical source
code.
This commit therefore makes kvm-test-1-run.sh record the value of the
TORTURE_TRUST_MAKE environment variable as an additional comment in the
qemu-cmd file, and also makes kvm-again.sh reconstitute that variable
from that comment.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-again.sh | 5 | ||||
| -rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-again.sh b/tools/testing/selftests/rcutorture/bin/kvm-again.sh index 3fb57ce5aafc..f1c80b02af58 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-again.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-again.sh @@ -161,6 +161,11 @@ do fi echo "# TORTURE_KCONFIG_GDB_ARG=''" >> $i done + +# Extract settings from the last qemu-cmd file transformed above. +grep '^#' $i | sed -e 's/^# //' > $T/qemu-cmd-settings +. $T/qemu-cmd-settings + grep -v '^#' $T/batches.oldrun | awk ' BEGIN { oldbatch = 1; diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh index a386ca8dd690..420ed5ce9d32 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh @@ -204,6 +204,7 @@ echo "# seconds=$seconds" >> $resdir/qemu-cmd echo "# TORTURE_KCONFIG_GDB_ARG=\"$TORTURE_KCONFIG_GDB_ARG\"" >> $resdir/qemu-cmd echo "# TORTURE_JITTER_START=\"$TORTURE_JITTER_START\"" >> $resdir/qemu-cmd echo "# TORTURE_JITTER_STOP=\"$TORTURE_JITTER_STOP\"" >> $resdir/qemu-cmd +echo "# TORTURE_TRUST_MAKE=\"$TORTURE_TRUST_MAKE\"; export TORTURE_TRUST_MAKE" >> $resdir/qemu-cmd if test -n "$TORTURE_BUILDONLY" then |