Browse Source

* use -n option

pierre 23 years ago
parent
commit
7c4378c3dd
4 changed files with 19 additions and 19 deletions
  1. 7 7
      tests/Makefile
  2. 7 7
      tests/Makefile.fpc
  3. 3 3
      tests/units/Makefile
  4. 2 2
      tests/units/Makefile.fpc

+ 7 - 7
tests/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/09/26]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/11/18]
 #
 #
 default: allexectests
 default: allexectests
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@@ -1071,10 +1071,10 @@ units/$(FPCMADE):
 	$(MAKE) -C units
 	$(MAKE) -C units
 DOTEST=./dotest$(EXEEXT)
 DOTEST=./dotest$(EXEEXT)
 $(DOTEST) : units utils/dotest.pp utils/redir.pp utils/teststr.pp
 $(DOTEST) : units utils/dotest.pp utils/redir.pp utils/teststr.pp
-	$(FPC) -Fuunits -FE. utils/dotest.pp
+	$(FPC) -n -Fuunits -FE. utils/dotest.pp
 DIGEST=./digest$(EXEEXT)
 DIGEST=./digest$(EXEEXT)
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
-	$(FPC) -Fuunits -FE. utils/digest.pp
+	$(FPC) -n -Fuunits -FE. utils/digest.pp
 testcheck: units allpreps $(DOTEST)
 testcheck: units allpreps $(DOTEST)
 ifneq ($(FPC),ppc386$(EXEEXT))
 ifneq ($(FPC),ppc386$(EXEEXT))
 override DOTESTOPT+=-c$(FPC)
 override DOTESTOPT+=-c$(FPC)
@@ -1133,7 +1133,7 @@ distclean: clean
 	-rm -f dotest$(EXEEXT) dotest$(OEXT) redir$(PPUEXT) redir$(OEXT)
 	-rm -f dotest$(EXEEXT) dotest$(OEXT) redir$(PPUEXT) redir$(OEXT)
 	-rm -f teststr$(PPUEXT) teststr$(OEXT) digest$(EXEEXT) digest$(OEXT)
 	-rm -f teststr$(PPUEXT) teststr$(OEXT) digest$(EXEEXT) digest$(OEXT)
 .PHONY: all full rundigest dailytest
 .PHONY: all full rundigest dailytest
-rundigest :
+rundigest : $(DIGEST)
 	-$(DIGEST)
 	-$(DIGEST)
 all : allexectests
 all : allexectests
 full : clean allexectests rundigest
 full : clean allexectests rundigest
@@ -1146,12 +1146,12 @@ info :
 	@echo   dailytest - run full and save results
 	@echo   dailytest - run full and save results
 	@echo               in files having the date as extension
 	@echo               in files having the date as extension
 	@echo
 	@echo
-override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d) 
+override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d)
 ifneq ($(wildcard log.$(DATESUFFIX)),)
 ifneq ($(wildcard log.$(DATESUFFIX)),)
-override DATESUFFIX=$(shell $(DATE) +%Y.%m.%d.%H.%M) 
+override DATESUFFIX=$(shell $(DATE) +%Y.%m.%d.%H.%M)
 endif
 endif
 ifneq ($(wildcard lastdate.txt),)
 ifneq ($(wildcard lastdate.txt),)
-LASTDATESUFFIX:=$(shell cat lastdate.txt) 
+LASTDATESUFFIX:=$(shell cat lastdate.txt)
 endif
 endif
 dailytest : full
 dailytest : full
 	$(COPY) faillist faillist.$(DATESUFFIX)
 	$(COPY) faillist faillist.$(DATESUFFIX)

+ 7 - 7
tests/Makefile.fpc

@@ -53,11 +53,11 @@ units/$(FPCMADE):
 
 
 DOTEST=./dotest$(EXEEXT)
 DOTEST=./dotest$(EXEEXT)
 $(DOTEST) : units utils/dotest.pp utils/redir.pp utils/teststr.pp
 $(DOTEST) : units utils/dotest.pp utils/redir.pp utils/teststr.pp
-        $(FPC) -Fuunits -FE. utils/dotest.pp
+        $(FPC) -n -Fuunits -FE. utils/dotest.pp
 
 
 DIGEST=./digest$(EXEEXT)
 DIGEST=./digest$(EXEEXT)
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
-	$(FPC) -Fuunits -FE. utils/digest.pp
+	$(FPC) -n -Fuunits -FE. utils/digest.pp
 	
 	
 testcheck: units allpreps $(DOTEST)
 testcheck: units allpreps $(DOTEST)
 
 
@@ -170,7 +170,7 @@ distclean: clean
 
 
 .PHONY: all full rundigest dailytest
 .PHONY: all full rundigest dailytest
 
 
-rundigest :
+rundigest : $(DIGEST)
 	-$(DIGEST)
 	-$(DIGEST)
 
 
 all : allexectests
 all : allexectests
@@ -187,14 +187,14 @@ info :
 	@echo               in files having the date as extension
 	@echo               in files having the date as extension
         @echo
         @echo
 
 
-override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d) 
+override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d)
 
 
 ifneq ($(wildcard log.$(DATESUFFIX)),)
 ifneq ($(wildcard log.$(DATESUFFIX)),)
-override DATESUFFIX=$(shell $(DATE) +%Y.%m.%d.%H.%M) 
+override DATESUFFIX=$(shell $(DATE) +%Y.%m.%d.%H.%M)
 endif
 endif
 
 
 ifneq ($(wildcard lastdate.txt),)
 ifneq ($(wildcard lastdate.txt),)
-LASTDATESUFFIX:=$(shell cat lastdate.txt) 
+LASTDATESUFFIX:=$(shell cat lastdate.txt)
 endif
 endif
 
 
 dailytest : full
 dailytest : full
@@ -208,4 +208,4 @@ ifdef LASTDATESUFFIX
 	-diff -u faillist.$(LASTDATESUFFIX) faillist.$(DATESUFFIX) > difflist.$(DATESUFFIX)
 	-diff -u faillist.$(LASTDATESUFFIX) faillist.$(DATESUFFIX) > difflist.$(DATESUFFIX)
 endif
 endif
 	@echo $(DATESUFFIX) > lastdate.txt
 	@echo $(DATESUFFIX) > lastdate.txt
-			
+			

+ 3 - 3
tests/units/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/09/26]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/11/18]
 #
 #
 default: all
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@@ -1226,10 +1226,10 @@ endif
 INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
 INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
 ifndef USEUNITDIR
 ifndef USEUNITDIR
 rtl:
 rtl:
-	$(MAKE) -C ../../rtl all
+	$(MAKE) -C ../../rtl all "OPT=$(OPT) -n"
 	$(MAKE) -C ../../rtl install $(INSTALLOPT)
 	$(MAKE) -C ../../rtl install $(INSTALLOPT)
 fcl:
 fcl:
-	$(MAKE) -C ../../fcl all
+	$(MAKE) -C ../../fcl all "OPT=$(OPT) -n"
 	$(MAKE) -C ../../fcl install $(INSTALLOPT)
 	$(MAKE) -C ../../fcl install $(INSTALLOPT)
 clean : cleanall
 clean : cleanall
 	$(MAKE) -C ../../rtl clean
 	$(MAKE) -C ../../rtl clean

+ 2 - 2
tests/units/Makefile.fpc

@@ -21,11 +21,11 @@ INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
 ifndef USEUNITDIR
 ifndef USEUNITDIR
 
 
 rtl:
 rtl:
-        $(MAKE) -C ../../rtl all
+        $(MAKE) -C ../../rtl all "OPT=$(OPT) -n"
         $(MAKE) -C ../../rtl install $(INSTALLOPT)
         $(MAKE) -C ../../rtl install $(INSTALLOPT)
 
 
 fcl:
 fcl:
-        $(MAKE) -C ../../fcl all
+        $(MAKE) -C ../../fcl all "OPT=$(OPT) -n"
         $(MAKE) -C ../../fcl install $(INSTALLOPT)
         $(MAKE) -C ../../fcl install $(INSTALLOPT)
 
 
 clean : cleanall
 clean : cleanall