|
|
@@ -215,7 +215,7 @@ tstunits:
|
|
|
# Copy test environment dependent files ctest.o, cext3.o, cext4.o to test/cg etc
|
|
|
#
|
|
|
|
|
|
-.PHONY: create_c_objects delete_c_objects copyfiles
|
|
|
+.PHONY: create_c_objects delete_c_objects copyfiles test_c_objects
|
|
|
|
|
|
C_SOURCE_DIR=test/cg/obj
|
|
|
C_SOURCES=ctest.c tcext3.c tcext4.c tcext5.c tcext6.c
|
|
|
@@ -261,6 +261,7 @@ copyfiles: $(TEST_OUTPUTDIR)
|
|
|
-$(COPY) $(CPP_OBJECTS) $(TEST_OUTPUTDIR)/test/cg
|
|
|
-$(MKDIRTREE) $(TEST_OUTPUTDIR)/test/units/system
|
|
|
|
|
|
+
|
|
|
################################
|
|
|
# Preparation for tests
|
|
|
#
|
|
|
@@ -429,6 +430,12 @@ endif
|
|
|
|
|
|
alltests: alltest alltbs alltbf allwebtbs allwebtbf
|
|
|
|
|
|
+test_c_objects: testprep
|
|
|
+ $(MAKE) $(patsubst %.pp,%.log, $(wildcard test/cg/cdecl/tcalext*.pp)))
|
|
|
+ $(MAKE) $(patsubst %.pp,%.elg, $(wildcard test/cg/cdecl/tcalext*.pp)))
|
|
|
+ $(MAKE) $(patsubst %.pp,%.log, $(wildcard test/cg/cdecl/tcppcl*.pp)))
|
|
|
+ $(MAKE) $(patsubst %.pp,%.elg, $(wildcard test/cg/cdecl/tcppcl*.pp)))
|
|
|
+
|
|
|
################################
|
|
|
# Compile and Run tests
|
|
|
#
|
|
|
@@ -467,7 +474,11 @@ $(TEST_OUTPUTDIR)/%.testlog : $(TESTREQ)
|
|
|
$(Q)$(ECHO) -n >> $(TEST_OUTPUTDIR)/longlog.testlog
|
|
|
|
|
|
# run all tests, then merge log files
|
|
|
-allexectests: $(TEST_OUTPUTDIR)/log.testlog $(TEST_OUTPUTDIR)/log.tbslog $(TEST_OUTPUTDIR)/log.tbflog $(TEST_OUTPUTDIR)/log.webtbslog $(TEST_OUTPUTDIR)/log.webtbflog $(addprefix $(TEST_OUTPUTDIR)/,$(foreach EXT, $(LOGEXT), $(addsuffix $(EXT), faillist longlog))) $(addsuffix .mergedlog, $(LOGFILES))
|
|
|
+allexectests: $(TEST_OUTPUTDIR)/log.testlog $(TEST_OUTPUTDIR)/log.tbslog \
|
|
|
+ $(TEST_OUTPUTDIR)/log.tbflog $(TEST_OUTPUTDIR)/log.webtbslog \
|
|
|
+ $(TEST_OUTPUTDIR)/log.webtbflog \
|
|
|
+ $(addprefix $(TEST_OUTPUTDIR)/,$(foreach EXT, $(LOGEXT), $(addsuffix $(EXT), faillist longlog))) \
|
|
|
+ $(addsuffix .mergedlog, $(LOGFILES))
|
|
|
|
|
|
# SINGLEDOTESTRUNS
|
|
|
else
|
|
|
@@ -480,7 +491,7 @@ $(GPARMAKE): $(COMPILER_UNITTARGETDIR) utils/gparmake.pp
|
|
|
$(FPC) $(FPCOPT) -FE. utils/gparmake.pp $(OPT)
|
|
|
|
|
|
# Can't have testprep as prerequisite, because that is a phony target and
|
|
|
-# phony targets are always remade. Since the makefile will be reparsed
|
|
|
+# phony targets are always remade. Since the makefile will be reparsed
|
|
|
# after making the MakeChunks file (because it has to be included) and all
|
|
|
# up-to-date checks will be re-evaluated, this means that the testprep rule
|
|
|
# (or testprep timestamp file, which depends on phony rules and hence has
|
|
|
@@ -493,11 +504,12 @@ $(GPARMAKE): $(COMPILER_UNITTARGETDIR) utils/gparmake.pp
|
|
|
# building it via the utils Makefile
|
|
|
$(MAKEINC): $(GPARMAKE) $(TEST_OUTPUTDIR)
|
|
|
# generate rules for parallel executions of dotest
|
|
|
-# gparmake now also needs an additional parameter for the name of the
|
|
|
+# gparmake now also needs an additional parameter for the name of the
|
|
|
# used subdirectory. Note also that the index must be increasing for each
|
|
|
# new call with a gap insuring that all the previous files have lower index
|
|
|
# even if CHUNKSIZE is equal to 1.
|
|
|
- $(Q)$(GPARMAKE) $(MAKEINC) test 1 $(CHUNKSIZE) $(sort $(wildcard $(addsuffix /t*.pp,$(TESTDIRS))))
|
|
|
+ $(Q)$(GPARMAKE) $(MAKEINC) test 1 $(CHUNKSIZE) $(sort $(wildcard $(addsuffix /t*.pp,test)))
|
|
|
+ $(Q)$(GPARMAKE) $(MAKEINC) test 5000 $(CHUNKSIZE) $(sort $(wildcard $(addsuffix /t*.pp,$(addprefix /,$(TESTSUBDIRS)))))
|
|
|
$(Q)$(GPARMAKE) -a $(MAKEINC) tbs 10000 $(CHUNKSIZE) $(sort $(wildcard tbs/t*.pp))
|
|
|
$(Q)$(GPARMAKE) -a $(MAKEINC) tbf 15000 $(CHUNKSIZE) $(sort $(wildcard tbf/t*.pp))
|
|
|
$(Q)$(GPARMAKE) -a $(MAKEINC) webtbs 20000 $(CHUNKSIZE) $(sort $(wildcard webtbs/t*.pp))
|
|
|
@@ -527,7 +539,7 @@ allexectests: $(MAKEINC)
|
|
|
|
|
|
# SINGLEDOTESTRUNS
|
|
|
endif
|
|
|
-
|
|
|
+
|
|
|
|
|
|
################################
|
|
|
# Clean
|
|
|
@@ -579,6 +591,9 @@ $(TEST_OUTPUTDIR)/dbdigest.cfg:
|
|
|
$(ECHOREDIR) CPU=$(TEST_CPU_TARGET) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
|
|
|
$(ECHOREDIR) Version=$(TEST_FPC_VERSION) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
|
|
|
$(ECHOREDIR) LogFile=log >> $(TEST_OUTPUTDIR)/dbdigest.cfg
|
|
|
+ifneq ($(TEST_USE_LONGLOG),)
|
|
|
+ $(ECHOREDIR) LongLogFile=longlog >> $(TEST_OUTPUTDIR)/dbdigest.cfg
|
|
|
+endif
|
|
|
$(ECHOREDIR) Submitter=$(TEST_USER) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
|
|
|
$(ECHOREDIR) Machine=$(TEST_HOSTNAME) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
|
|
|
$(ECHOREDIR) Comment=$(TEST_OPT) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
|
|
|
@@ -606,6 +621,14 @@ else
|
|
|
TARFROM=--files-from=tar.lst
|
|
|
endif
|
|
|
|
|
|
+# Pass option -ll to perpup if we use longlog file
|
|
|
+# instead of add all *.log and *.elg files to DB_TARGZ
|
|
|
+ifneq ($(TEST_USE_LONGLOG),)
|
|
|
+PREPUP_OPT=-ll
|
|
|
+else
|
|
|
+PREPUP_OPT=
|
|
|
+endif
|
|
|
+
|
|
|
ifndef inWinDOS
|
|
|
$(TEST_OUTPUTDIR)/tar.lst:
|
|
|
ifdef inOS2
|
|
|
@@ -614,6 +637,9 @@ ifdef inOS2
|
|
|
$(ECHOREDIR) dbdigest.cfg>> $(TEST_OUTPUTDIR)/tar.lst
|
|
|
else
|
|
|
cd $(TEST_OUTPUTDIR) && find . -name '*.log' -o -name '*.elg' > tar.lst
|
|
|
+else
|
|
|
+ $(ECHOREDIR) "longlog" > $(TEST_OUTPUTDIR)/tar.lst
|
|
|
+endif
|
|
|
$(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
|
|
|
$(ECHOREDIR) "dbdigest.cfg" >> $(TEST_OUTPUTDIR)/tar.lst
|
|
|
endif
|
pierre