Browse Source

* preparation stage added, this stage will copy the correct ctest.o
to the test/cg dir

peter 23 years ago
parent
commit
cb33506268
2 changed files with 26 additions and 5 deletions
  1. 11 3
      tests/Makefile
  2. 15 2
      tests/Makefile.fpc

+ 11 - 3
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/07/30]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/08/24]
 #
 default: allexectests
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@@ -756,6 +756,9 @@ endif
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 endif
+ifeq ($(OS_SOURCE),openbsd)
+override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1055,7 +1058,7 @@ units/$(FPCMADE):
 DOTEST=./dotest$(EXEEXT)
 $(DOTEST) : units utils/dotest.pp utils/redir.pp
 	$(FPC) -Fuunits -FE. utils/dotest
-testcheck: units $(DOTEST)
+testcheck: units allpreps $(DOTEST)
 ifneq ($(FPC),ppc386$(EXEEXT))
 override DOTESTOPT+=-c$(FPC)
 endif
@@ -1070,6 +1073,11 @@ DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/objects
 	$(DOTEST) $(DOTESTOPT) $<
 %.elg : %.pp
 	$(DOTEST) $(DOTESTOPT) -e $<
+.PHONY: allpreps
+allpreps: allpreps-stamp.$(OS_TARGET)
+allpreps-stamp.$(OS_TARGET):
+	$(COPY) test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o test/cg
+	$(ECHO) $(DATE) > preps.timestamp
 .PHONY: alltbs alltbf allwebtbs allwebtbf alltest alltests
 alltbs : testcheck $(patsubst %.pp,%.log,$(wildcard tbs/t*.pp))
 alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp))
@@ -1099,7 +1107,7 @@ else
 endif
 	-rm -f *.tmp core
 	-rm -f $(LOG) $(LONGLOG) $(FAILLIST)
-	-rm -f ppas.sh ppas.bat gmon.out
+	-rm -f ppas.sh ppas.bat gmon.out allpreps-stamp.$(OS_TARGET)
 	$(MAKE) -C units clean
 distclean: clean
 	-rm -f dotest$(EXEEXT) dotest$(OEXT) redir$(PPUEXT) redir$(OEXT)

+ 15 - 2
tests/Makefile.fpc

@@ -55,7 +55,7 @@ DOTEST=./dotest$(EXEEXT)
 $(DOTEST) : units utils/dotest.pp utils/redir.pp
         $(FPC) -Fuunits -FE. utils/dotest
 
-testcheck: units $(DOTEST)
+testcheck: units allpreps $(DOTEST)
 
 #
 # Dotest options
@@ -85,6 +85,19 @@ DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/objects
 %.elg : %.pp
         $(DOTEST) $(DOTESTOPT) -e $<
 
+#
+# Preparations for tests:
+#
+# 1. Copy target dependent ctest.o to test/cg
+#
+
+.PHONY: allpreps
+
+allpreps: allpreps-stamp.$(OS_TARGET)
+allpreps-stamp.$(OS_TARGET):
+        $(COPY) test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o test/cg
+        $(ECHO) $(DATE) > preps.timestamp
+
 #
 # Compile tests
 #
@@ -137,7 +150,7 @@ else
 endif
         -rm -f *.tmp core
         -rm -f $(LOG) $(LONGLOG) $(FAILLIST)
-        -rm -f ppas.sh ppas.bat gmon.out
+        -rm -f ppas.sh ppas.bat gmon.out allpreps-stamp.$(OS_TARGET)
         $(MAKE) -C units clean
 
 distclean: clean