Browse Source

+ added check if COMSPEC returns error code

pierre 22 years ago
parent
commit
e1d40d471a
2 changed files with 37 additions and 6 deletions
  1. 17 3
      tests/Makefile
  2. 20 3
      tests/Makefile.fpc

+ 17 - 3
tests/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/12/15]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/12/17]
 #
 #
 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
@@ -1078,6 +1078,14 @@ 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) -n -Fuunits -FE. utils/dotest.pp
 	$(FPC) -n -Fuunits -FE. utils/dotest.pp
+	$(FPC) -n -Fuunits -FE. utils/fail.pp
+	$(FPC) -n -Fuunits -FE. utils/testfail.pp
+ifneq ($(wildcard ./testfail$(SRCEXEEXT)),)
+TESTCOMSPECRES:=$(shell ./testfail$(SRCEXEEXT))
+endif
+ifneq ($(TESTCOMSPECRES),)
+NOCOMSPEC=1
+endif
 DIGEST=./digest$(EXEEXT)
 DIGEST=./digest$(EXEEXT)
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
 	$(FPC) -n -Fuunits -FE. utils/digest.pp
 	$(FPC) -n -Fuunits -FE. utils/digest.pp
@@ -1094,7 +1102,10 @@ ifdef INTERACTIVE
 override DOTESTOPT+=-i
 override DOTESTOPT+=-i
 endif
 endif
 ifdef DOALL
 ifdef DOALL
-override DOTESTOPT=-a
+override DOTESTOPT+=-a
+endif
+ifdef NOCOMSPEC
+override DOTESTOPT+=-x
 endif
 endif
 DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/dos test/units/objects
 DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/dos test/units/objects
 %.log : %.pp $(DOTEST)
 %.log : %.pp $(DOTEST)
@@ -1144,7 +1155,7 @@ endif
 	-rm -f ptest.* ppas.sh ppas.bat gmon.out allpreps-stamp.$(OS_TARGET)
 	-rm -f ptest.* ppas.sh ppas.bat gmon.out allpreps-stamp.$(OS_TARGET)
 	$(MAKE) -C units clean
 	$(MAKE) -C units clean
 distclean: clean
 distclean: clean
-	-rm -f dotest$(EXEEXT) digest$(EXEEXT) 
+	-rm -f dotest$(EXEEXT) digest$(EXEEXT)
 .PHONY: all full rundigest dailytest onlyknown onlygraph onlyinteractive
 .PHONY: all full rundigest dailytest onlyknown onlygraph onlyinteractive
 rundigest : $(DIGEST)
 rundigest : $(DIGEST)
 	-$(DIGEST)
 	-$(DIGEST)
@@ -1168,6 +1179,9 @@ info :
 	@echo "  onlygraph - run only graph tests"
 	@echo "  onlygraph - run only graph tests"
 	@echo "  onlyinteractive - run only interactive tests"
 	@echo "  onlyinteractive - run only interactive tests"
 	@echo Done using FPC=$(FPC)
 	@echo Done using FPC=$(FPC)
+ifdef COMSPEC
+	@echo And using COMSPEC=$(COMSPEC)
+endif
 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)

+ 20 - 3
tests/Makefile.fpc

@@ -61,6 +61,16 @@ 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) -n -Fuunits -FE. utils/dotest.pp
         $(FPC) -n -Fuunits -FE. utils/dotest.pp
+        $(FPC) -n -Fuunits -FE. utils/fail.pp
+        $(FPC) -n -Fuunits -FE. utils/testfail.pp
+
+ifneq ($(wildcard ./testfail$(SRCEXEEXT)),)
+TESTCOMSPECRES:=$(shell ./testfail$(SRCEXEEXT))
+endif
+
+ifneq ($(TESTCOMSPECRES),)
+NOCOMSPEC=1
+endif
 
 
 DIGEST=./digest$(EXEEXT)
 DIGEST=./digest$(EXEEXT)
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
 $(DIGEST) : units utils/digest.pp utils/teststr.pp
@@ -87,7 +97,11 @@ override DOTESTOPT+=-i
 endif
 endif
 
 
 ifdef DOALL
 ifdef DOALL
-override DOTESTOPT=-a
+override DOTESTOPT+=-a
+endif
+
+ifdef NOCOMSPEC
+override DOTESTOPT+=-x
 endif
 endif
 
 
 
 
@@ -180,7 +194,7 @@ endif
         $(MAKE) -C units clean
         $(MAKE) -C units clean
 
 
 distclean: clean
 distclean: clean
-        -rm -f dotest$(EXEEXT) digest$(EXEEXT) 
+        -rm -f dotest$(EXEEXT) digest$(EXEEXT)
 
 
 #
 #
 # Main rules
 # Main rules
@@ -215,7 +229,10 @@ info :
         @echo "  onlyknown - run only known bugs"
         @echo "  onlyknown - run only known bugs"
         @echo "  onlygraph - run only graph tests"
         @echo "  onlygraph - run only graph tests"
         @echo "  onlyinteractive - run only interactive tests"
         @echo "  onlyinteractive - run only interactive tests"
-        @echo Done using FPC=$(FPC)
+	@echo Done using FPC=$(FPC)
+ifdef COMSPEC
+	@echo And using COMSPEC=$(COMSPEC)
+endif
 
 
 override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d)
 override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d)