diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-02-26 18:39:41 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-05-14 12:45:45 -0400 |
commit | 805ffee232dc9e3e102e379142181034e86e3357 (patch) | |
tree | b4e2b78f8b49e11914fda0616b6f5e376e1a4b78 /tools/testing | |
parent | 98bc8cc8715e814c3cd63040f08876ce7347e9d2 (diff) |
torture: Rename RCU_BUILDONLY to TORTURE_BUILDONLY
This commit makes the torture scripts a bit more RCU-independent by
changing RCU_BUILDONLY to TORTURE_BUILDONLY. It also removes an
unnecessary export command.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'tools/testing')
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 2 | ||||
-rw-r--r-- | tools/testing/selftests/rcutorture/bin/kvm.sh | 9 |
2 files changed, 7 insertions, 4 deletions
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 e82f4f201c8c..86e6ffe6df45 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | |||
@@ -152,7 +152,7 @@ boot_args="`configfrag_boot_params "$boot_args" "$config_template"`" | |||
152 | boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`" | 152 | boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`" |
153 | 153 | ||
154 | echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd | 154 | echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd |
155 | if test -n "$RCU_BUILDONLY" | 155 | if test -n "$TORTURE_BUILDONLY" |
156 | then | 156 | then |
157 | echo Build-only run specified, boot/test omitted. | 157 | echo Build-only run specified, boot/test omitted. |
158 | exit 0 | 158 | exit 0 |
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 08c90cba79d2..73c586f6bdf6 100644 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh | |||
@@ -81,7 +81,7 @@ do | |||
81 | shift | 81 | shift |
82 | ;; | 82 | ;; |
83 | --buildonly) | 83 | --buildonly) |
84 | RCU_BUILDONLY=1; export RCU_BUILDONLY | 84 | TORTURE_BUILDONLY=1 |
85 | ;; | 85 | ;; |
86 | --configs) | 86 | --configs) |
87 | checkarg --configs "(list of config files)" "$#" "$2" '^[^/]*$' '^--' | 87 | checkarg --configs "(list of config files)" "$#" "$2" '^[^/]*$' '^--' |
@@ -374,7 +374,7 @@ then | |||
374 | echo KVM="$KVM; export KVM" | 374 | echo KVM="$KVM; export KVM" |
375 | echo KVPATH="$KVPATH; export KVPATH" | 375 | echo KVPATH="$KVPATH; export KVPATH" |
376 | echo PATH="$PATH; export PATH" | 376 | echo PATH="$PATH; export PATH" |
377 | echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY" | 377 | echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_BUILDONLY" |
378 | echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD" | 378 | echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD" |
379 | echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG" | 379 | echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG" |
380 | echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD" | 380 | echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD" |
@@ -402,4 +402,7 @@ echo | |||
402 | echo | 402 | echo |
403 | echo " --- `date` Test summary:" | 403 | echo " --- `date` Test summary:" |
404 | echo Results directory: $resdir/$ds | 404 | echo Results directory: $resdir/$ds |
405 | kvm-recheck.sh $resdir/$ds | 405 | if test -n "$TORTURE_BUILDONLY" |
406 | then | ||
407 | kvm-recheck.sh $resdir/$ds | ||
408 | fi | ||