torture: Make torture.sh create a properly formatted log file

Currently, if the torture.sh allmodconfig step fails, this is counted as
an error (as it should be), but there is also an extraneous complaint
about a missing log file.  This commit therefore adds that log file,
which is hoped to reduce confused reactions to the error report.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/tools/testing/selftests/rcutorture/bin/torture.sh b/tools/testing/selftests/rcutorture/bin/torture.sh
index a0be34525c0bff0bb131ab43c1ef681108f1495c..130d0de4c3bbd3e5c4133823f5bfb7650a0a4f06 100755 (executable)
--- a/tools/testing/selftests/rcutorture/bin/torture.sh
+++ b/tools/testing/selftests/rcutorture/bin/torture.sh
@@ -330,20 +330,34 @@ then
        echo " --- allmodconfig:" Start `date` | tee -a $T/log
        amcdir="tools/testing/selftests/rcutorture/res/$ds/allmodconfig"
        mkdir -p "$amcdir"
-       echo " --- make clean" > "$amcdir/Make.out" 2>&1
+       echo " --- make clean" | tee $amcdir/log > "$amcdir/Make.out" 2>&1
        make -j$MAKE_ALLOTED_CPUS clean >> "$amcdir/Make.out" 2>&1
-       echo " --- make allmodconfig" >> "$amcdir/Make.out" 2>&1
-       cp .config $amcdir
-       make -j$MAKE_ALLOTED_CPUS allmodconfig >> "$amcdir/Make.out" 2>&1
-       echo " --- make " >> "$amcdir/Make.out" 2>&1
-       make -j$MAKE_ALLOTED_CPUS >> "$amcdir/Make.out" 2>&1
-       retcode="$?"
-       echo $retcode > "$amcdir/Make.exitcode"
-       if test "$retcode" == 0
+       retcode=$?
+       buildphase='"make clean"'
+       if test "$retcode" -eq 0
+       then
+               echo " --- make allmodconfig" | tee -a $amcdir/log >> "$amcdir/Make.out" 2>&1
+               cp .config $amcdir
+               make -j$MAKE_ALLOTED_CPUS allmodconfig >> "$amcdir/Make.out" 2>&1
+               retcode=$?
+               buildphase='"make allmodconfig"'
+       fi
+       if test "$retcode" -eq 0
+       then
+               echo " --- make " | tee -a $amcdir/log >> "$amcdir/Make.out" 2>&1
+               make -j$MAKE_ALLOTED_CPUS >> "$amcdir/Make.out" 2>&1
+               retcode="$?"
+               echo $retcode > "$amcdir/Make.exitcode"
+               buildphase='"make"'
+       fi
+       if test "$retcode" -eq 0
        then
                echo "allmodconfig($retcode)" $amcdir >> $T/successes
+               echo Success >> $amcdir/log
        else
                echo "allmodconfig($retcode)" $amcdir >> $T/failures
+               echo " --- allmodconfig Test summary:" >> $amcdir/log
+               echo " --- Summary: Exit code $retcode from $buildphase, see Make.out" >> $amcdir/log
        fi
 fi