aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/rcutorture/bin
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-09-30 17:49:43 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-12-03 13:11:13 -0500
commit330a76f15651a715a54bc2022586a7be151c9963 (patch)
treeab2cf3f1cbecf7896b4be8b74ae5d263ec339e9e /tools/testing/selftests/rcutorture/bin
parent0f66f92d11f80d0972b180f0151e629fc0c12cb1 (diff)
rcutorture: Make test output less chatty
This commit drops no-longer-needed diagnostics from the output. Some of them are retained in logfiles, in case they are ever needed. 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')
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/configinit.sh2
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh2
-rw-r--r--tools/testing/selftests/rcutorture/bin/kvm.sh25
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 @@
14# for example, "O=/tmp/foo". If this argument is omitted, the .config 14# for example, "O=/tmp/foo". If this argument is omitted, the .config
15# file will be generated directly in the current directory. 15# file will be generated directly in the current directory.
16 16
17echo configinit.sh $*
18
19T=/tmp/configinit.sh.$$ 17T=/tmp/configinit.sh.$$
20trap 'rm -rf $T' 0 18trap 'rm -rf $T' 0
21mkdir $T 19mkdir $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
62fi 62fi
63cp $config_template $resdir/ConfigFragment 63cp $config_template $resdir/ConfigFragment
64echo ' ---' `date`: Starting build 64echo ' ---' `date`: Starting build
65echo ' ---' Kconfig fragment at: $config_template 65echo ' ---' Kconfig fragment at: $config_template >> $resdir/log
66cat << '___EOF___' >> $T 66cat << '___EOF___' >> $T
67CONFIG_RCU_TORTURE_TEST=y 67CONFIG_RCU_TORTURE_TEST=y
68___EOF___ 68___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 @@
28# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com> 28# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
29 29
30scriptname=$0 30scriptname=$0
31args="$*"
31 32
32dur=30 33dur=30
33KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM 34KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM
@@ -73,7 +74,6 @@ checkarg () {
73 74
74while test $# -gt 0 75while test $# -gt 0
75do 76do
76 echo ":$1:"
77 case "$1" in 77 case "$1" in
78 --builddir) 78 --builddir)
79 checkarg --builddir "(absolute pathname)" "$#" "$2" '^/' error 79 checkarg --builddir "(absolute pathname)" "$#" "$2" '^/' error
@@ -133,11 +133,6 @@ do
133 shift 133 shift
134done 134done
135 135
136echo "builddir=$builddir"
137echo "dur=$dur"
138echo "KVM=$KVM"
139echo "resdir=$resdir"
140
141PATH=${KVM}/bin:$PATH; export PATH 136PATH=${KVM}/bin:$PATH; export PATH
142CONFIGFRAG=${KVM}/configs; export CONFIGFRAG 137CONFIGFRAG=${KVM}/configs; export CONFIGFRAG
143KVPATH=${CONFIGFRAG}/$kversion; export KVPATH 138KVPATH=${CONFIGFRAG}/$kversion; export KVPATH
@@ -150,12 +145,19 @@ fi
150if test -z "$resdir" 145if test -z "$resdir"
151then 146then
152 resdir=$KVM/res 147 resdir=$KVM/res
153 mkdir $resdir || : 148 if ! test -e $resdir
149 then
150 mkdir $resdir || :
151 fi
154else 152else
155 mkdir -p "$resdir" || : 153 if ! test -e $resdir
154 then
155 mkdir -p "$resdir" || :
156 fi
156fi 157fi
157mkdir $resdir/$ds 158mkdir $resdir/$ds
158echo Datestamp: $ds 159touch $resdir/$ds/log
160echo $scriptname $args >> $resdir/$ds/log
159 161
160pwd > $resdir/$ds/testid.txt 162pwd > $resdir/$ds/testid.txt
161if test -d .git 163if test -d .git
@@ -164,7 +166,10 @@ then
164 git rev-parse HEAD >> $resdir/$ds/testid.txt 166 git rev-parse HEAD >> $resdir/$ds/testid.txt
165fi 167fi
166builddir=$KVM/b1 168builddir=$KVM/b1
167mkdir $builddir || : 169if ! test -e $builddir
170then
171 mkdir $builddir || :
172fi
168 173
169for CF in $configs 174for CF in $configs
170do 175do