Makefile: Define TEST flag when making simtest/extratest targets

We should be able to enter just 'make simtest' and not 'make simtest TFLAGS="-DTEST"'.
Same for extratest.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/Makefile.in b/Makefile.in
index 54336d2f22b7ded1d6df91f6ab26523f49a8fb3e..d110e4a85ecb93462c630e4059ee2913a93d997e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -797,13 +797,17 @@ extraunit:
        @echo $(X) 2>&1
        @cat $(EXTRADIR)/$(X) | $(TESTRUN)
 
-# Use "do_test" script to make the following target
+# Use "do_test" script to make the following targets
+simtest: DFLAGS += -DTEST
+
 simtest: all testcomp
        @$(foreach x, $(TESTLIST), $(MAKE) X=$x unit || exit;)
        rm -f tests/root
        ln -s root1 tests/root
        @echo Simulation tests: Success!
 
+extratest: DFLAGS += -DTEST
+
 extratest: all
        @$(foreach x, $(EXTRALIST), $(MAKE) X=$x extraunit || exit;)
        rm -f tests/root

diff --git a/do_test b/do_test
index 259b3bcc81a89dc35e7b00028034fe5eea8009cc..8b20579299779a15bea029456d13f600ff709174 100755 (executable)
--- a/do_test
+++ b/do_test
@@ -8,9 +8,9 @@ then
        make TFLAGS="-DTEST"
 else
        make distclean
-       ./configure sa_lib_dir=. sar_dir=. conf_dir=. conf_file=sysstat.sysconfig sa_dir=tests --enable-debuginfo && make TFLAGS="-DTEST" && make simtest TFLAGS="-DTEST"
+       ./configure sa_lib_dir=. sar_dir=. conf_dir=. conf_file=sysstat.sysconfig sa_dir=tests --enable-debuginfo && make TFLAGS="-DTEST" && make simtest
 fi
 if [ "$?" = "0" -a "$1" = "all" ]
 then
-       make extratest TFLAGS="-DTEST" && make distclean && ./configure --disable-nls --disable-sensors --disable-pcp sa_lib_dir=. sar_dir=. conf_dir=. conf_file=sysstat.sysconfig sa_dir=tests --enable-debuginfo && make TFLAGS="-DTEST" && echo "EXTRA TESTS: Success!"
+       make extratest && make distclean && ./configure --disable-nls --disable-sensors --disable-pcp sa_lib_dir=. sar_dir=. conf_dir=. conf_file=sysstat.sysconfig sa_dir=tests --enable-debuginfo && make TFLAGS="-DTEST" && echo "EXTRA TESTS: Success!"
 fi