[PATCH tip/core/rcu 05/45] torture: Rename RCU_INITRD to TORTURE_INITRD
From: "Paul E. McKenney"
This commit makes the torture scripts a bit more RCU-independent.
Signed-off-by: Paul E. McKenney
---
tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-build.sh
b/tools/testing/selftests/rcutorture/bin/kvm-build.sh
index 197901ec10bf..d8e68a5e4411 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-build.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-build.sh
@@ -47,7 +47,7 @@ mkdir $T
cat ${config_template} | grep -v CONFIG_RCU_TORTURE_TEST > $T/config
cat << ___EOF___ >> $T/config
-CONFIG_INITRAMFS_SOURCE="$RCU_INITRD"
+CONFIG_INITRAMFS_SOURCE="$TORTURE_INITRD"
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_CONSOLE=y
___EOF___
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh
b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 740676255c6a..a52a077ee258 100644
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -38,7 +38,7 @@ dur=30
dryrun=""
KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
PATH=${KVM}/bin:$PATH; export PATH
-RCU_INITRD="$KVM/initrd"; export RCU_INITRD
+TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
TORTURE_SUITE=rcu
resdir=""
@@ -125,7 +125,7 @@ do
shift
;;
--no-initrd)
- RCU_INITRD=""; export RCU_INITRD
+ TORTURE_INITRD=""; export TORTURE_INITRD
;;
--qemu-args)
checkarg --qemu-args "-qemu args" $# "$2" '^-' '^error'
@@ -367,7 +367,7 @@ then
echo KVPATH="$KVPATH; export KVPATH"
echo PATH="$PATH; export PATH"
echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
- echo RCU_INITRD="$RCU_INITRD; export RCU_INITRD"
+ echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG"
echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export
RCU_QEMU_INTERACTIVE"
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH tip/core/rcu 05/45] torture: Rename RCU_INITRD to TORTURE_INITRD
From: Paul E. McKenney paul...@linux.vnet.ibm.com
This commit makes the torture scripts a bit more RCU-independent.
Signed-off-by: Paul E. McKenney paul...@linux.vnet.ibm.com
---
tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-build.sh
b/tools/testing/selftests/rcutorture/bin/kvm-build.sh
index 197901ec10bf..d8e68a5e4411 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-build.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-build.sh
@@ -47,7 +47,7 @@ mkdir $T
cat ${config_template} | grep -v CONFIG_RCU_TORTURE_TEST $T/config
cat ___EOF___ $T/config
-CONFIG_INITRAMFS_SOURCE=$RCU_INITRD
+CONFIG_INITRAMFS_SOURCE=$TORTURE_INITRD
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_CONSOLE=y
___EOF___
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh
b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 740676255c6a..a52a077ee258 100644
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -38,7 +38,7 @@ dur=30
dryrun=
KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM
PATH=${KVM}/bin:$PATH; export PATH
-RCU_INITRD=$KVM/initrd; export RCU_INITRD
+TORTURE_INITRD=$KVM/initrd; export TORTURE_INITRD
RCU_KMAKE_ARG=; export RCU_KMAKE_ARG
TORTURE_SUITE=rcu
resdir=
@@ -125,7 +125,7 @@ do
shift
;;
--no-initrd)
- RCU_INITRD=; export RCU_INITRD
+ TORTURE_INITRD=; export TORTURE_INITRD
;;
--qemu-args)
checkarg --qemu-args -qemu args $# $2 '^-' '^error'
@@ -367,7 +367,7 @@ then
echo KVPATH=$KVPATH; export KVPATH
echo PATH=$PATH; export PATH
echo RCU_BUILDONLY=$RCU_BUILDONLY; export RCU_BUILDONLY
- echo RCU_INITRD=$RCU_INITRD; export RCU_INITRD
+ echo TORTURE_INITRD=$TORTURE_INITRD; export TORTURE_INITRD
echo RCU_KMAKE_ARG=$RCU_KMAKE_ARG; export RCU_KMAKE_ARG
echo RCU_QEMU_CMD=$RCU_QEMU_CMD; export RCU_QEMU_CMD
echo RCU_QEMU_INTERACTIVE=$RCU_QEMU_INTERACTIVE; export
RCU_QEMU_INTERACTIVE
--
1.8.1.5
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
