Commit a0edd47c authored by Paul E. McKenney's avatar Paul E. McKenney

torture: Rename RCU_QEMU_INTERACTIVE to TORTURE_QEMU_INTERACTIVE

This commit makes the torture scripts a bit more RCU-independent.
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 805ffee2
...@@ -107,14 +107,14 @@ identify_qemu () { ...@@ -107,14 +107,14 @@ identify_qemu () {
# identify_qemu_append qemu-cmd # identify_qemu_append qemu-cmd
# #
# Output arguments for the qemu "-append" string based on CPU type # Output arguments for the qemu "-append" string based on CPU type
# and the RCU_QEMU_INTERACTIVE environment variable. # and the TORTURE_QEMU_INTERACTIVE environment variable.
identify_qemu_append () { identify_qemu_append () {
case "$1" in case "$1" in
qemu-system-x86_64|qemu-system-i386) qemu-system-x86_64|qemu-system-i386)
echo noapic selinux=0 initcall_debug debug echo noapic selinux=0 initcall_debug debug
;; ;;
esac esac
if test -n "$RCU_QEMU_INTERACTIVE" if test -n "$TORTURE_QEMU_INTERACTIVE"
then then
echo root=/dev/sda echo root=/dev/sda
else else
...@@ -125,7 +125,7 @@ identify_qemu_append () { ...@@ -125,7 +125,7 @@ identify_qemu_append () {
# identify_qemu_args qemu-cmd serial-file # identify_qemu_args qemu-cmd serial-file
# #
# Output arguments for qemu arguments based on the RCU_QEMU_MAC # Output arguments for qemu arguments based on the RCU_QEMU_MAC
# and RCU_QEMU_INTERACTIVE environment variables. # and TORTURE_QEMU_INTERACTIVE environment variables.
identify_qemu_args () { identify_qemu_args () {
case "$1" in case "$1" in
qemu-system-x86_64|qemu-system-i386) qemu-system-x86_64|qemu-system-i386)
...@@ -133,17 +133,17 @@ identify_qemu_args () { ...@@ -133,17 +133,17 @@ identify_qemu_args () {
qemu-system-ppc64) qemu-system-ppc64)
echo -enable-kvm -M pseries -cpu POWER7 -nodefaults echo -enable-kvm -M pseries -cpu POWER7 -nodefaults
echo -device spapr-vscsi echo -device spapr-vscsi
if test -n "$RCU_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC" if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC"
then then
echo -device spapr-vlan,netdev=net0,mac=$RCU_QEMU_MAC echo -device spapr-vlan,netdev=net0,mac=$RCU_QEMU_MAC
echo -netdev bridge,br=br0,id=net0 echo -netdev bridge,br=br0,id=net0
elif test -n "$RCU_QEMU_INTERACTIVE" elif test -n "$TORTURE_QEMU_INTERACTIVE"
then then
echo -net nic -net user echo -net nic -net user
fi fi
;; ;;
esac esac
if test -n "$RCU_QEMU_INTERACTIVE" if test -n "$TORTURE_QEMU_INTERACTIVE"
then then
echo -monitor stdio -serial pty -S echo -monitor stdio -serial pty -S
else else
......
...@@ -114,7 +114,7 @@ do ...@@ -114,7 +114,7 @@ do
shift shift
;; ;;
--interactive) --interactive)
RCU_QEMU_INTERACTIVE=1; export RCU_QEMU_INTERACTIVE TORTURE_QEMU_INTERACTIVE=1; export TORTURE_QEMU_INTERACTIVE
;; ;;
--kmake-arg) --kmake-arg)
checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$' checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$'
...@@ -378,7 +378,7 @@ then ...@@ -378,7 +378,7 @@ then
echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD" echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG" echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD" echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE" echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE; export TORTURE_QEMU_INTERACTIVE"
echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC" echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"
echo "mkdir -p "$resdir" || :" echo "mkdir -p "$resdir" || :"
echo "mkdir $resdir/$ds" echo "mkdir $resdir/$ds"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment