simtest: Fix do_test script

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

diff --git a/Makefile.in b/Makefile.in
index c6d827ce765cb0ec486d764207e60560e1e2cef3..0c44e9f3e9fd45f292bb6f88c0746f36ae52c628 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -824,10 +824,10 @@ extraunit:
 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!
+#      @$(foreach x, $(TESTLIST), $(MAKE) X=$x unit || exit;)
+#      rm -f tests/root
+#      ln -s root1 tests/root
+#      @echo Simulation tests: Success!
 
 extratest: DFLAGS += -DTEST
 
@@ -839,6 +839,7 @@ extratest: all
 
 clean:
        rm -f sadc sar sadf iostat tapestat mpstat pidstat cifsiostat *.o *.a core TAGS tests/*.tmp tests/extra/*.tmp
+       rm -f tests/LAST tests/SKIPPED
        rm -f nfsiostat* man/nfsiostat*
        rm -f tests/sa[0123]*
        rm -f tests/root

diff --git a/do_test b/do_test
index a73e0bf25eff2ab9b24dd7e87da7497b718bee29..019c9e94a7a9c364ba19afcf7f5fd7614d9a26b1 100755 (executable)
--- a/do_test
+++ b/do_test
@@ -15,14 +15,14 @@ then
 elif [ "$1" = "comp" ]
 then
        # Compile sysstat in test mode
-       make TFLAGS="-DTEST"
+       make simtest TFLAGS="-DTEST"
 else
        if [ "$1" != "sim" ]
        then
                # Configure then compile sysstat in test mode
                make distclean
 #              ./configure sa_lib_dir=. sar_dir=. conf_dir=. conf_file=sysstat.sysconfig sa_dir=tests --enable-debuginfo && make TFLAGS="-DTEST" && make simtest
-               ./configure sa_lib_dir=. sar_dir=. conf_dir=. conf_file=sysstat.sysconfig sa_dir=tests --enable-debuginfo && make TFLAGS="-DTEST" && make testcomp TFLAGS="-DTEST"
+               ./configure sa_lib_dir=. sar_dir=. conf_dir=. conf_file=sysstat.sysconfig sa_dir=tests --enable-debuginfo && make simtest TFLAGS="-DTEST"
        fi
        rm -f tests/results.tmp
        COUNT=0