Add make debug and no-silent options

This commit is contained in:
Hugo Melder 2022-08-04 16:54:04 +02:00
parent 1c7079bf16
commit 9cfc8a3700

View file

@ -49,6 +49,8 @@ export GSTESTDIR
GSTESTMODE=normal
GSMAKEOPTIONS="debug=yes"
# Argument checking
while test $# != 0
do
@ -60,6 +62,12 @@ do
--debug)
GSTESTDBG="$GSTESTDIR/gdb.cmds"
;;
--make-debug)
GSMAKEOPTIONS+=" --debug"
;;
--make-no-silent)
GSMAKEOPTIONS+=" --no-silent"
;;
--developer)
GSTESTDEV=yes
;;
@ -82,6 +90,7 @@ do
;;
--verbose)
GSVERBOSE=yes
GSMAKEOPTIONS+=" messages=yes"
;;
--failfast)
GSTESTMODE=failfast
@ -96,6 +105,8 @@ do
echo "Use 'gnustep-tests --clean' to remove old logs and leftover files."
echo "Use 'gnustep-tests --failfast' to stop after the first failure."
echo "Use 'gnustep-tests --debug' to run gdb for any failed tests."
echo "Use 'gnustep-tests --make-debug' to enable make debug output."
echo "Use 'gnustep-tests --make-no-silent' to disable silent make output."
echo "Use 'gnustep-tests --developer' to treat hopes as real tests."
echo "Use 'gnustep-tests --verbose' for full/detailed log output."
echo "Use 'gnustep-tests --sequential' to disable parallel building."
@ -350,23 +361,19 @@ build_test ()
tmp=`basename $TESTFILE .c`
if test x"$tmp" = x"$TESTFILE"
then
BUILD_CMD="$CXX -o ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CXXFLAGS $ADDITIONAL_LDFLAGS"
BUILD_CMD="$CXX -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CXXFLAGS $ADDITIONAL_LDFLAGS"
else
BUILD_CMD="$CC -o ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CFLAGS $ADDITIONAL_LDFLAGS"
BUILD_CMD="$CC -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CFLAGS $ADDITIONAL_LDFLAGS"
fi
else
BUILD_CMD="$OBJCXX -o ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
BUILD_CMD="$OBJCXX -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
fi
else
BUILD_CMD="$CC -o ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
BUILD_CMD="$CC -o $GSVERBOSECFLAG ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
fi
else
if test x"$GSVERBOSE" = xyes
then
BUILD_CMD="$MAKE_CMD messages=yes debug=yes $TESTNAME"
else
BUILD_CMD="$MAKE_CMD debug=yes $TESTNAME"
fi
echo $GSMAKEOPTIONS
BUILD_CMD="$MAKE_CMD $GSMAKEOPTIONS $TESTNAME"
fi
# Redirect errors to stdout so it shows up in the log,
@ -716,9 +723,9 @@ ${tmp}_OBJC_FILES=$TESTFILE"
echo "Building in $dir" >>$GSTESTLOG
if test -r ./make-check.env
then
( . ./make-check.env; . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 debug=yes) >>$GSTESTLOG 2>&1
( . ./make-check.env; . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 $GSMAKEOPTIONS) >>$GSTESTLOG 2>&1
else
( . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 debug=yes) >>$GSTESTLOG 2>&1
( . ./TestInfo > /dev/null 2>&1; $MAKE_CMD -j 4 $GSMAKEOPTIONS) >>$GSTESTLOG 2>&1
fi
build_state=$?
fi