aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2021-02-11 11:54:43 -0800
committerPaul E. McKenney <paulmck@kernel.org>2021-03-08 14:23:01 -0800
commit4cd54518c3d8afadd11ebd6ad4f03b00859f5e85 (patch)
treea624cf0bd0ad29f31df7924effeaa4a822a3c839 /tools/testing
parenttorture: Eliminate jitter_pids file (diff)
downloadlinux-dev-4cd54518c3d8afadd11ebd6ad4f03b00859f5e85.tar.xz
linux-dev-4cd54518c3d8afadd11ebd6ad4f03b00859f5e85.zip
torture: Reverse jittering and duration parameters for jitter.sh
Remote rcutorture testing requires that jitter.sh continue to be invoked from the generated script for local runs, but that it instead be invoked on the remote system for distributed runs. This argues for common jitterstart and jitterstop scripts. But it would be good for jitterstart and jitterstop to control the name and location of the "jittering" file, while continuing to have the duration controlled by the caller of these new scripts. This commit therefore reverses the order of the jittering and duration parameters for jitter.sh, so that the jittering parameter precedes the duration parameter. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/testing')
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/jitter.sh6
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/kvm.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/jitter.sh b/tools/testing/selftests/rcutorture/bin/jitter.sh
index ed0ea86ddf5d..ff1d3e468e53 100755
--- a/tools/testing/selftests/rcutorture/bin/jitter.sh
+++ b/tools/testing/selftests/rcutorture/bin/jitter.sh
@@ -5,7 +5,7 @@
# of this script is to inflict random OS jitter on a concurrently running
# test.
#
-# Usage: jitter.sh me duration jittering-path [ sleepmax [ spinmax ] ]
+# Usage: jitter.sh me jittering-path duration [ sleepmax [ spinmax ] ]
#
# me: Random-number-generator seed salt.
# duration: Time to run in seconds.
@@ -18,8 +18,8 @@
# Authors: Paul E. McKenney <paulmck@linux.ibm.com>
me=$(($1 * 1000))
-duration=$2
-jittering=$3
+jittering=$2
+duration=$3
sleepmax=${4-1000000}
spinmax=${5-1000}
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index de93802c3d00..a2ee3f2fff3c 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -504,7 +504,7 @@ function dump(first, pastlast, batchnum)
print "\techo ---- Starting kernels. `date` | tee -a " rd "log";
print "\ttouch " rd "jittering"
for (j = 0; j < njitter; j++)
- print "\tjitter.sh " j " " dur " " rd "jittering " ja[2] " " ja[3] "&"
+ print "\tjitter.sh " j " " rd "jittering " dur " " ja[2] " " ja[3] "&"
print "\twhile ls $runfiles > /dev/null 2>&1"
print "\tdo"
print "\t\t:"