diff options
Diffstat (limited to 'tools/testing')
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/configinit.sh | 2 | ||||
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 2 | ||||
-rw-r--r-- | tools/testing/selftests/rcutorture/bin/kvm.sh | 25 |
3 files changed, 16 insertions, 13 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/configinit.sh b/tools/testing/selftests/rcutorture/bin/configinit.sh index 1f09d599e9d9..926fbd30bcbd 100755 --- a/tools/testing/selftests/rcutorture/bin/configinit.sh +++ b/tools/testing/selftests/rcutorture/bin/configinit.sh @@ -14,8 +14,6 @@ # for example, "O=/tmp/foo". If this argument is omitted, the .config # file will be generated directly in the current directory. -echo configinit.sh $* - T=/tmp/configinit.sh.$$ trap 'rm -rf $T' 0 mkdir $T 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 618aa4d766d3..5526550a5d56 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh @@ -62,7 +62,7 @@ then fi cp $config_template $resdir/ConfigFragment echo ' ---' `date`: Starting build -echo ' ---' Kconfig fragment at: $config_template +echo ' ---' Kconfig fragment at: $config_template >> $resdir/log cat << '___EOF___' >> $T CONFIG_RCU_TORTURE_TEST=y ___EOF___ diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 92f726b01044..bf6d68e96e94 100644 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -28,6 +28,7 @@ # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com> scriptname=$0 +args="$*" dur=30 KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM @@ -73,7 +74,6 @@ checkarg () { while test $# -gt 0 do - echo ":$1:" case "$1" in --builddir) checkarg --builddir "(absolute pathname)" "$#" "$2" '^/' error @@ -133,11 +133,6 @@ do shift done -echo "builddir=$builddir" -echo "dur=$dur" -echo "KVM=$KVM" -echo "resdir=$resdir" - PATH=${KVM}/bin:$PATH; export PATH CONFIGFRAG=${KVM}/configs; export CONFIGFRAG KVPATH=${CONFIGFRAG}/$kversion; export KVPATH @@ -150,12 +145,19 @@ fi if test -z "$resdir" then resdir=$KVM/res - mkdir $resdir || : + if ! test -e $resdir + then + mkdir $resdir || : + fi else - mkdir -p "$resdir" || : + if ! test -e $resdir + then + mkdir -p "$resdir" || : + fi fi mkdir $resdir/$ds -echo Datestamp: $ds +touch $resdir/$ds/log +echo $scriptname $args >> $resdir/$ds/log pwd > $resdir/$ds/testid.txt if test -d .git @@ -164,7 +166,10 @@ then git rev-parse HEAD >> $resdir/$ds/testid.txt fi builddir=$KVM/b1 -mkdir $builddir || : +if ! test -e $builddir +then + mkdir $builddir || : +fi for CF in $configs do |