Skip to contentSkip to conversation

Torture-test changes for 4.10

PATCH In review Paul E. McKenney 2 participants 4 messages Nov 14, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Torture-test changes for 4.10

Hello!

This series contains a couple of torture-test changes:

1. Remove obsolete files from the rcutorture .gitignore file.

2. Prevent the --jitter flag from delaying --build-only runs.

Thanx, Paul

------------------------------------------------------------------------

 .gitignore |    2 --
 bin/kvm.sh |    5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)
#1 lore raw

PATCH 1/2 torture: Remove obsolete files from rcutorture .gitignore

---
 tools/testing/selftests/rcutorture/.gitignore | 2 --
 1 file changed, 2 deletions(-)
tools/testing/selftests/rcutorture/.gitignore +0 -2
index 05838f6f2ebe..ccc240275d1c 100644
@@ -1,6 +1,4 @@
 initrd
-linux-2.6
 b[0-9]*
-rcu-test-image
 res
 *.swp
Signature · 1 line
2.5.2
#2 lore raw

PATCH 2/2 torture: Prevent jitter from delaying build-only runs

In reply to Paul E. McKenney

Currently, if the --jitter flag specifies jitter for a --build-only run, the system will obediently build a kernel, refuse to launch it, launch the requested number of jitter processes, and wait for the specified kernel run time, which defaults to 30 minutes. This is of course quite pointless.

This commit therefore disables jitter on build-only runs.

---
 tools/testing/selftests/rcutorture/bin/kvm.sh | 5 +++++
 1 file changed, 5 insertions(+)
tools/testing/selftests/rcutorture/bin/kvm.sh +5 -0
index 0aed965f0062..3b3c1b693ee1 100755
@@ -303,6 +303,7 @@ then
 fi
 ___EOF___
 awk < $T/cfgcpu.pack \
+	-v TORTURE_BUILDONLY="$TORTURE_BUILDONLY" \
 	-v CONFIGDIR="$CONFIGFRAG/" \
 	-v KVM="$KVM" \
 	-v ncpus=$cpus \
@@ -375,6 +376,10 @@ function dump(first, pastlast, batchnum)
 		njitter = ncpus;
 	else
 		njitter = ja[1];
+	if (TORTURE_BUILDONLY && njitter != 0) {
+		njitter = 0;
+		print "echo Build-only run, so suppressing jitter >> " rd "/log"
+	}
 	for (j = 0; j < njitter; j++)
 		print "jitter.sh " j " " dur " " ja[2] " " ja[3] "&"
 	print "wait"
Signature · 1 line
2.5.2