Browse Source

Add TEST_FAILLIST, TEST_LOG and TEST_LONGLOG variables, and use those to set LOGFILES list, to avoid troubles if LOG, LONGLOG or FAILLIST variables already are set

Pierre Muller 11 months ago
parent
commit
cfe85a036b
2 changed files with 12 additions and 6 deletions
  1. 6 3
      tests/Makefile
  2. 6 3
      tests/Makefile.fpc

+ 6 - 3
tests/Makefile

@@ -2535,18 +2535,21 @@ endif
 ifndef FAILLIST
 export FAILLIST:=$(TEST_OUTPUTDIR)/faillist
 endif
+export TEST_FAILLIST:=$(TEST_OUTPUTDIR)/faillist
 ifndef LONGLOG
 export LONGLOG:=$(TEST_OUTPUTDIR)/longlog
 endif
+export TEST_LONGLOG:=$(TEST_OUTPUTDIR)/longlog
 ifndef LOG
 export LOG:=$(TEST_OUTPUTDIR)/log
 endif
-ifndef SEPLOG
+export TEST_LOG:=$(TEST_OUTPUTDIR)/log
+ifndef TEST_SEPLOG
 ifdef MAKEINC_SEPARATE
-export SEPLOG:=$(TEST_OUTPUTDIR)/seplog
+export TEST_SEPLOG:=$(TEST_OUTPUTDIR)/seplog
 endif
 endif
-LOGFILES=$(LOG) $(LONGLOG) $(FAILLIST) $(SEPLOG)
+LOGFILES=$(TEST_LOG) $(TEST_LONGLOG) $(TEST_FAILLIST) $(TEST_SEPLOG)
 LOGEXT=.testlog .tbslog .tbflog .webtbslog .webtbflog
 TESTUNITDIRS=system dos crt objects strings sysutils math sharemem strutils matrix lineinfo ucomplex fpwidestring cpu fmtbcd windows classes character dateutil fpcunit softfpu variants sortbase sortalgs linux unixutil types nullable contnrs convutils
 TESTDIRECTDIRS=

+ 6 - 3
tests/Makefile.fpc

@@ -145,23 +145,26 @@ endif
 ifndef FAILLIST
 export FAILLIST:=$(TEST_OUTPUTDIR)/faillist
 endif
+export TEST_FAILLIST:=$(TEST_OUTPUTDIR)/faillist
 
 ifndef LONGLOG
 export LONGLOG:=$(TEST_OUTPUTDIR)/longlog
 endif
+export TEST_LONGLOG:=$(TEST_OUTPUTDIR)/longlog
 
 ifndef LOG
 export LOG:=$(TEST_OUTPUTDIR)/log
 endif
+export TEST_LOG:=$(TEST_OUTPUTDIR)/log
 
-ifndef SEPLOG
+ifndef TEST_SEPLOG
 ifdef MAKEINC_SEPARATE
-export SEPLOG:=$(TEST_OUTPUTDIR)/seplog
+export TEST_SEPLOG:=$(TEST_OUTPUTDIR)/seplog
 endif
 endif
 
 # locations of all logfiles
-LOGFILES=$(LOG) $(LONGLOG) $(FAILLIST) $(SEPLOG)
+LOGFILES=$(TEST_LOG) $(TEST_LONGLOG) $(TEST_FAILLIST) $(TEST_SEPLOG)
 LOGEXT=.testlog .tbslog .tbflog .webtbslog .webtbflog
 
 # Subdirs available in the test subdir