Fix minor glitch.

This commit is contained in:
Philip.Hazel 2015-12-15 18:20:50 +00:00
parent 3ea5c71542
commit 6761a598b5
1 changed files with 12 additions and 9 deletions

View File

@ -127,20 +127,20 @@ runtest()
# causes the message # causes the message
# #
# ar: `u' modifier ignored since `D' is the default (see `U') # ar: `u' modifier ignored since `D' is the default (see `U')
# #
# to be output while linking. This triggers an unwanted error report from this # to be output while linking. This triggers an unwanted error report from this
# script, because it expects no stderr output while making. To get round this # script, because it expects no stderr output while making. To get round this
# we filter the stderr output through sed, removing all occurrences of the # we filter the stderr output through sed, removing all occurrences of the
# above lines. Just for paranoia, check that sed is available before doing # above lines. Just for paranoia, check that sed is available before doing
# this. # this.
echo "Making" echo "Making"
make -j >/dev/null 2>teststderrM make -j >/dev/null 2>teststderrM
makeRC=$? makeRC=$?
if command -v sed >/dev/null 2>&1 ; then if command -v sed >/dev/null 2>&1 ; then
sed "/\`u' modifier ignored since \`D' is the default/ d" \ sed "/\`u' modifier ignored since \`D' is the default/ d" \
teststderrM > teststderrMM teststderrM > teststderrMM
mv -f teststderrMM teststderrM mv -f teststderrMM teststderrM
fi fi
if [ $makeRC -ne 0 -o -s teststderrM ]; then if [ $makeRC -ne 0 -o -s teststderrM ]; then
echo " " echo " "
@ -382,6 +382,10 @@ if [ -f Makefile ]; then
fi fi
fi fi
echo "---------- End of tests in the source directory ----------"
echo "Removing teststdoutM and teststderrM"
rm -rf teststdoutM teststderrM
if [ $usetmp -ne 0 ]; then if [ $usetmp -ne 0 ]; then
echo "---------- Tests in the $tmp directory ----------" echo "---------- Tests in the $tmp directory ----------"
srcdir=`pwd` srcdir=`pwd`
@ -407,12 +411,11 @@ if [ $usetmp -ne 0 ]; then
do do
runtest runtest
done done
echo "Removing $tmp"
rm -rf $tmp
fi fi
echo "Removing $tmp" echo "---------- All done ----------"
rm -rf $tmp
rm -rf teststdoutM teststderrM
echo "All done"
# End # End