diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-09-29 14:13:46 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-12-03 13:11:11 -0500 |
commit | 4275be83b807c2926d2b23e67eb61692a1810080 (patch) | |
tree | 8a38da9120e8e9d2ed4e797067e9afb8c91d19e8 /tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | |
parent | bb918535a15a0c9ca217a99394dcae0c44711f1c (diff) |
rcutorture: Add per-version default Kconfig fragments and module parameters
Different Kconfig parameters apply to different kernel versions, as
do different rcutorture module parameters. This commit allows the
rcutorture test scripts to adjust for different kernel versions.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh')
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh index 3b53078c5ff2..0a3f037a8bb3 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | |||
@@ -44,6 +44,7 @@ T=/tmp/kvm-test-1-rcu.sh.$$ | |||
44 | trap 'rm -rf $T' 0 | 44 | trap 'rm -rf $T' 0 |
45 | 45 | ||
46 | . $KVM/bin/functions.sh | 46 | . $KVM/bin/functions.sh |
47 | . $KVPATH/ver_functions.sh | ||
47 | 48 | ||
48 | config_template=${1} | 49 | config_template=${1} |
49 | title=`echo $config_template | sed -e 's/^.*\///'` | 50 | title=`echo $config_template | sed -e 's/^.*\///'` |
@@ -133,14 +134,9 @@ else | |||
133 | fi | 134 | fi |
134 | 135 | ||
135 | # Generate CPU-hotplug boot parameters | 136 | # Generate CPU-hotplug boot parameters |
136 | if ! bootparam_hotplug_cpu "$bootargs" | 137 | boot_args="`rcutorture_param_onoff "$boot_args" $builddir/.config`" |
137 | then | 138 | # Generate rcu_barrier() boot parameter |
138 | if configfrag_hotplug_cpu $builddir/.config | 139 | boot_args="`rcutorture_param_n_barrier_cbs "$boot_args"`" |
139 | then | ||
140 | echo Kernel configured for CPU hotplug, adding rcutorture. | ||
141 | bootargs="$bootargs rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30" | ||
142 | fi | ||
143 | fi | ||
144 | 140 | ||
145 | echo $QEMU -name rcu-test -serial file:$builddir/console.log $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"noapic selinux=0 console=ttyS0 initcall_debug debug rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 $boot_args\" > $resdir/qemu-cmd | 141 | echo $QEMU -name rcu-test -serial file:$builddir/console.log $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"noapic selinux=0 console=ttyS0 initcall_debug debug rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 $boot_args\" > $resdir/qemu-cmd |
146 | $QEMU -name rcu-test -serial file:$builddir/console.log $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append "noapic selinux=0 console=ttyS0 initcall_debug debug rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 $boot_args" & | 142 | $QEMU -name rcu-test -serial file:$builddir/console.log $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append "noapic selinux=0 console=ttyS0 initcall_debug debug rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 $boot_args" & |