rcutorture: Introduce "rcu" directory level underneath configs
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Fri, 7 Feb 2014 18:29:49 +0000 (10:29 -0800)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Sun, 23 Feb 2014 17:04:36 +0000 (09:04 -0800)
This commit uses the standard software ploy of introducing another
level of indirection below the configs directory.  This allows each
torture-test suite to have its own set of Kconfig files, boot parameters,
and version-specific scripts.  Initially, we have only rcu, but lock
will follow soonish.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
97 files changed:
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
tools/testing/selftests/rcutorture/bin/kvm.sh
tools/testing/selftests/rcutorture/configs/rcu/BUSTED [moved from tools/testing/selftests/rcutorture/configs/BUSTED with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot [moved from tools/testing/selftests/rcutorture/configs/BUSTED.boot with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/CFLIST [moved from tools/testing/selftests/rcutorture/configs/CFLIST with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/CFcommon [moved from tools/testing/selftests/rcutorture/configs/CFcommon with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/SRCU-N [moved from tools/testing/selftests/rcutorture/configs/SRCU-N with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot [moved from tools/testing/selftests/rcutorture/configs/SRCU-N.boot with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/SRCU-P [moved from tools/testing/selftests/rcutorture/configs/SRCU-P with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot [moved from tools/testing/selftests/rcutorture/configs/SRCU-P.boot with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TINY01 [moved from tools/testing/selftests/rcutorture/configs/TINY01 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TINY02 [moved from tools/testing/selftests/rcutorture/configs/TINY02 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE01 [moved from tools/testing/selftests/rcutorture/configs/TREE01 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot [moved from tools/testing/selftests/rcutorture/configs/TREE01.boot with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE02 [moved from tools/testing/selftests/rcutorture/configs/TREE02 with 95% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE03 [moved from tools/testing/selftests/rcutorture/configs/TREE03 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE04 [moved from tools/testing/selftests/rcutorture/configs/TREE04 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot [moved from tools/testing/selftests/rcutorture/configs/TREE04.boot with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE05 [moved from tools/testing/selftests/rcutorture/configs/TREE05 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot [moved from tools/testing/selftests/rcutorture/configs/TREE05.boot with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE06 [moved from tools/testing/selftests/rcutorture/configs/TREE06 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE07 [moved from tools/testing/selftests/rcutorture/configs/TREE07 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE08 [moved from tools/testing/selftests/rcutorture/configs/TREE08 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE08-T [moved from tools/testing/selftests/rcutorture/configs/TREE08-T with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/TREE09 [moved from tools/testing/selftests/rcutorture/configs/TREE09 with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST [moved from tools/testing/selftests/rcutorture/configs/v0.0/CFLIST with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh [moved from tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH [moved from tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh [moved from tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH [moved from tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh [moved from tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST [moved from tools/testing/selftests/rcutorture/configs/v3.12/CFLIST with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh [moved from tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH [moved from tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all [moved from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none [moved from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh [moved from tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH [moved from tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST [moved from tools/testing/selftests/rcutorture/configs/v3.3/CFLIST with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh [moved from tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH [moved from tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh [moved from tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH [moved from tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh [moved from tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST [moved from tools/testing/selftests/rcutorture/configs/v3.5/CFLIST with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh [moved from tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH [moved from tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP [moved from tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp [moved from tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh [moved from tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH [moved from tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh [moved from tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh with 100% similarity]
tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh [moved from tools/testing/selftests/rcutorture/configs/ver_functions.sh with 100% similarity]

index 015d35b..94b28bb 100755 (executable)
@@ -199,5 +199,5 @@ then
 fi
 
 cp $builddir/console.log $resdir
-parse-rcutorture.sh $resdir/console.log $title
+parse-${TORTURE_SUITE}torture.sh $resdir/console.log $title
 parse-console.sh $resdir/console.log $title
index 767097e..c24092c 100644 (file)
@@ -41,6 +41,7 @@ PATH=${KVM}/bin:$PATH; export PATH
 builddir="${KVM}/b1"
 RCU_INITRD="$KVM/initrd"; export RCU_INITRD
 RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
+TORTURE_SUITE=rcu
 resdir=""
 configs=""
 cpus=0
@@ -66,8 +67,9 @@ usage () {
        echo "       --no-initrd"
        echo "       --qemu-args qemu-system-..."
        echo "       --qemu-cmd qemu-system-..."
-       echo "       --results absolute-pathname"
        echo "       --relbuilddir relative-pathname"
+       echo "       --results absolute-pathname"
+       echo "       --torture rcu"
        exit 1
 }
 
@@ -156,6 +158,11 @@ do
                resdir=$2
                shift
                ;;
+       --torture)
+               checkarg --torture "(suite name)" "$#" "$2" '^rcu$' '^--'
+               TORTURE_SUITE=$2
+               shift
+               ;;
        *)
                echo Unknown argument $1
                usage
@@ -164,7 +171,7 @@ do
        shift
 done
 
-CONFIGFRAG=${KVM}/configs; export CONFIGFRAG
+CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG
 KVPATH=${CONFIGFRAG}/$kversion; export KVPATH
 
 if test -z "$configs"
@@ -191,6 +198,7 @@ then
 
        touch $resdir/$ds/log
        echo $scriptname $args >> $resdir/$ds/log
+       echo ${TORTURE_SUITE} > $resdir/$ds/TORTURE_SUITE
 
        pwd > $resdir/$ds/testid.txt
        if test -d .git
@@ -265,6 +273,9 @@ END {
 }'
 
 # Generate a script to execute the tests in appropriate batches.
+cat << ___EOF___ > $T/script
+TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
+___EOF___
 awk < $T/cfgcpu.pack \
        -v CONFIGDIR="$CONFIGFRAG/$kversion/" \
        -v KVM="$KVM" \
@@ -353,7 +364,7 @@ END {
        # Dump the last batch.
        if (ncpus != 0)
                dump(first, i);
-}' > $T/script
+}' >> $T/script
 
 if test "$dryrun" = script
 then
@@ -7,7 +7,7 @@ CONFIG_PREEMPT=y
 CONFIG_HZ_PERIODIC=n
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ_FULL=n
-CONFIG_RCU_FAST_NO_HZ=n 
+CONFIG_RCU_FAST_NO_HZ=n
 CONFIG_RCU_TRACE=n
 CONFIG_HOTPLUG_CPU=n
 CONFIG_SUSPEND=n