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>
This commit is contained in:
Paul E. McKenney 2022-09-04 10:49:56 -07:00
parent cb0982e205
commit f7dd164865

View File

@ -330,20 +330,34 @@ then
echo " --- allmodconfig:" Start `date` | tee -a $T/log echo " --- allmodconfig:" Start `date` | tee -a $T/log
amcdir="tools/testing/selftests/rcutorture/res/$ds/allmodconfig" amcdir="tools/testing/selftests/rcutorture/res/$ds/allmodconfig"
mkdir -p "$amcdir" 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 make -j$MAKE_ALLOTED_CPUS clean >> "$amcdir/Make.out" 2>&1
echo " --- make allmodconfig" >> "$amcdir/Make.out" 2>&1 retcode=$?
cp .config $amcdir buildphase='"make clean"'
make -j$MAKE_ALLOTED_CPUS allmodconfig >> "$amcdir/Make.out" 2>&1 if test "$retcode" -eq 0
echo " --- make " >> "$amcdir/Make.out" 2>&1 then
make -j$MAKE_ALLOTED_CPUS >> "$amcdir/Make.out" 2>&1 echo " --- make allmodconfig" | tee -a $amcdir/log >> "$amcdir/Make.out" 2>&1
retcode="$?" cp .config $amcdir
echo $retcode > "$amcdir/Make.exitcode" make -j$MAKE_ALLOTED_CPUS allmodconfig >> "$amcdir/Make.out" 2>&1
if test "$retcode" == 0 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 then
echo "allmodconfig($retcode)" $amcdir >> $T/successes echo "allmodconfig($retcode)" $amcdir >> $T/successes
echo Success >> $amcdir/log
else else
echo "allmodconfig($retcode)" $amcdir >> $T/failures 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
fi fi