lkml.org 
[lkml]   [2014]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 10/45] torture: Rename RCU_BUILDONLY to TORTURE_BUILDONLY
    Date
    From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

    This commit makes the torture scripts a bit more RCU-independent.

    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +-
    tools/testing/selftests/rcutorture/bin/kvm.sh | 9 ++++++---
    2 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
    index e82f4f201c8c..86e6ffe6df45 100755
    --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
    +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
    @@ -152,7 +152,7 @@ boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
    boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"

    echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
    -if test -n "$RCU_BUILDONLY"
    +if test -n "$TORTURE_BUILDONLY"
    then
    echo Build-only run specified, boot/test omitted.
    exit 0
    diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
    index 08c90cba79d2..73c586f6bdf6 100644
    --- a/tools/testing/selftests/rcutorture/bin/kvm.sh
    +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
    @@ -81,7 +81,7 @@ do
    shift
    ;;
    --buildonly)
    - RCU_BUILDONLY=1; export RCU_BUILDONLY
    + TORTURE_BUILDONLY=1
    ;;
    --configs)
    checkarg --configs "(list of config files)" "$#" "$2" '^[^/]*$' '^--'
    @@ -374,7 +374,7 @@ then
    echo KVM="$KVM; export KVM"
    echo KVPATH="$KVPATH; export KVPATH"
    echo PATH="$PATH; export PATH"
    - echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
    + echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_BUILDONLY"
    echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
    echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
    echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
    @@ -402,4 +402,7 @@ echo
    echo
    echo " --- `date` Test summary:"
    echo Results directory: $resdir/$ds
    -kvm-recheck.sh $resdir/$ds
    +if test -n "$TORTURE_BUILDONLY"
    +then
    + kvm-recheck.sh $resdir/$ds
    +fi
    --
    1.8.1.5


    \
     
     \ /
      Last update: 2014-04-29 03:21    [W:4.126 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site