diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-04-23 15:55:54 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-05-27 16:00:00 -0400 |
commit | 8ba8b664d4e43abf6bd896f3f614c8eb22384635 (patch) | |
tree | 4871576ad299897e5812d3bc979d3185be642e25 | |
parent | ccd60ad3f87f6a5f2974a7f206e77b49b251e94c (diff) |
rcutorture: Display "make oldconfig" errors
The current rcutorture scripting fails to dump out errors from
"make oldconfig", so this commit addresses this issue.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/configinit.sh | 2 | ||||
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/configinit.sh b/tools/testing/selftests/rcutorture/bin/configinit.sh index 15f1a17ca96e..3f81a1095206 100755 --- a/tools/testing/selftests/rcutorture/bin/configinit.sh +++ b/tools/testing/selftests/rcutorture/bin/configinit.sh | |||
@@ -66,7 +66,7 @@ make $buildloc $TORTURE_DEFCONFIG > $builddir/Make.defconfig.out 2>&1 | |||
66 | mv $builddir/.config $builddir/.config.sav | 66 | mv $builddir/.config $builddir/.config.sav |
67 | sh $T/upd.sh < $builddir/.config.sav > $builddir/.config | 67 | sh $T/upd.sh < $builddir/.config.sav > $builddir/.config |
68 | cp $builddir/.config $builddir/.config.new | 68 | cp $builddir/.config $builddir/.config.new |
69 | yes '' | make $buildloc oldconfig > $builddir/Make.modconfig.out 2>&1 | 69 | yes '' | make $buildloc oldconfig > $builddir/Make.oldconfig.out 2> $builddir/Make.oldconfig.err |
70 | 70 | ||
71 | # verify new config matches specification. | 71 | # verify new config matches specification. |
72 | configcheck.sh $builddir/.config $c | 72 | configcheck.sh $builddir/.config $c |
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh index 4f5b20f367a9..d86bdd6b6cc2 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | |||
@@ -43,6 +43,10 @@ do | |||
43 | if test -f "$i/console.log" | 43 | if test -f "$i/console.log" |
44 | then | 44 | then |
45 | configcheck.sh $i/.config $i/ConfigFragment | 45 | configcheck.sh $i/.config $i/ConfigFragment |
46 | if test -r $i/Make.oldconfig.err | ||
47 | then | ||
48 | cat $i/Make.oldconfig.err | ||
49 | fi | ||
46 | parse-build.sh $i/Make.out $configfile | 50 | parse-build.sh $i/Make.out $configfile |
47 | parse-torture.sh $i/console.log $configfile | 51 | parse-torture.sh $i/console.log $configfile |
48 | parse-console.sh $i/console.log $configfile | 52 | parse-console.sh $i/console.log $configfile |