diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-09-30 17:49:43 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-12-03 13:11:13 -0500 |
commit | 330a76f15651a715a54bc2022586a7be151c9963 (patch) | |
tree | ab2cf3f1cbecf7896b4be8b74ae5d263ec339e9e /tools/testing/selftests/rcutorture/bin | |
parent | 0f66f92d11f80d0972b180f0151e629fc0c12cb1 (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-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 @@ | |||
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 | ||
17 | echo configinit.sh $* | ||
18 | |||
19 | T=/tmp/configinit.sh.$$ | 17 | T=/tmp/configinit.sh.$$ |
20 | trap 'rm -rf $T' 0 | 18 | trap 'rm -rf $T' 0 |
21 | mkdir $T | 19 | 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 | |||
62 | fi | 62 | fi |
63 | cp $config_template $resdir/ConfigFragment | 63 | cp $config_template $resdir/ConfigFragment |
64 | echo ' ---' `date`: Starting build | 64 | echo ' ---' `date`: Starting build |
65 | echo ' ---' Kconfig fragment at: $config_template | 65 | echo ' ---' Kconfig fragment at: $config_template >> $resdir/log |
66 | cat << '___EOF___' >> $T | 66 | cat << '___EOF___' >> $T |
67 | CONFIG_RCU_TORTURE_TEST=y | 67 | CONFIG_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 | ||
30 | scriptname=$0 | 30 | scriptname=$0 |
31 | args="$*" | ||
31 | 32 | ||
32 | dur=30 | 33 | dur=30 |
33 | KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM | 34 | KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM |
@@ -73,7 +74,6 @@ checkarg () { | |||
73 | 74 | ||
74 | while test $# -gt 0 | 75 | while test $# -gt 0 |
75 | do | 76 | do |
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 |
134 | done | 134 | done |
135 | 135 | ||
136 | echo "builddir=$builddir" | ||
137 | echo "dur=$dur" | ||
138 | echo "KVM=$KVM" | ||
139 | echo "resdir=$resdir" | ||
140 | |||
141 | PATH=${KVM}/bin:$PATH; export PATH | 136 | PATH=${KVM}/bin:$PATH; export PATH |
142 | CONFIGFRAG=${KVM}/configs; export CONFIGFRAG | 137 | CONFIGFRAG=${KVM}/configs; export CONFIGFRAG |
143 | KVPATH=${CONFIGFRAG}/$kversion; export KVPATH | 138 | KVPATH=${CONFIGFRAG}/$kversion; export KVPATH |
@@ -150,12 +145,19 @@ fi | |||
150 | if test -z "$resdir" | 145 | if test -z "$resdir" |
151 | then | 146 | then |
152 | resdir=$KVM/res | 147 | resdir=$KVM/res |
153 | mkdir $resdir || : | 148 | if ! test -e $resdir |
149 | then | ||
150 | mkdir $resdir || : | ||
151 | fi | ||
154 | else | 152 | else |
155 | mkdir -p "$resdir" || : | 153 | if ! test -e $resdir |
154 | then | ||
155 | mkdir -p "$resdir" || : | ||
156 | fi | ||
156 | fi | 157 | fi |
157 | mkdir $resdir/$ds | 158 | mkdir $resdir/$ds |
158 | echo Datestamp: $ds | 159 | touch $resdir/$ds/log |
160 | echo $scriptname $args >> $resdir/$ds/log | ||
159 | 161 | ||
160 | pwd > $resdir/$ds/testid.txt | 162 | pwd > $resdir/$ds/testid.txt |
161 | if test -d .git | 163 | if 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 |
165 | fi | 167 | fi |
166 | builddir=$KVM/b1 | 168 | builddir=$KVM/b1 |
167 | mkdir $builddir || : | 169 | if ! test -e $builddir |
170 | then | ||
171 | mkdir $builddir || : | ||
172 | fi | ||
168 | 173 | ||
169 | for CF in $configs | 174 | for CF in $configs |
170 | do | 175 | do |