Browse Source

* correct error in previous patch

pierre 23 years ago
parent
commit
5b0e8ff44f
2 changed files with 19 additions and 18 deletions
  1. 10 9
      tests/Makefile
  2. 9 9
      tests/Makefile.fpc

+ 10 - 9
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
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@@ -1083,7 +1083,7 @@ $(DIGEST) : units utils/digest.pp utils/teststr.pp
 	$(FPC) -n -Fuunits -FE. utils/digest.pp
 testcheck: units allpreps $(DOTEST)
 ifneq ($(FPC),ppc386$(EXEEXT))
-ifeq ($finstring -c$(FPC),$(DOTESTOPT),)
+ifeq ($(findstring -c$(FPC),$(DOTESTOPT)),)
 override DOTESTOPT+=-c$(FPC)
 endif
 endif
@@ -1159,13 +1159,14 @@ info :
 	@echo This Makefile allows to test the compiler
 	@echo
 	@echo Targets:
-	@echo   all   - continue all tests
-	@echo   full  - clean and run all tests
-	@echo   dailytest - run full and save results
-	@echo               in files having the date as extension
-	@echo   onlyknown - run only known bugs
-	@echo   onlygraph - run only graph tests
-	@echo   onlyinteractive - run only interactive tests
+	@echo "  all   - continue all tests"
+	@echo "  full  - clean and run all tests"
+	@echo "  dailytest - run full and save results"
+	@echo "              in files having the date as extension"
+	@echo "  onlyknown - run only known bugs"
+	@echo "  onlygraph - run only graph tests"
+	@echo "  onlyinteractive - run only interactive tests"
+	@echo Done using FPC=$(FPC)
 override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d)
 ifneq ($(wildcard log.$(DATESUFFIX)),)
 override DATESUFFIX=$(shell $(DATE) +%Y.%m.%d.%H.%M)

+ 9 - 9
tests/Makefile.fpc

@@ -73,7 +73,7 @@ testcheck: units allpreps $(DOTEST)
 #
 
 ifneq ($(FPC),ppc386$(EXEEXT))
-ifeq ($finstring -c$(FPC),$(DOTESTOPT),)
+ifeq ($(findstring -c$(FPC),$(DOTESTOPT)),)
 override DOTESTOPT+=-c$(FPC)
 endif
 endif
@@ -205,14 +205,14 @@ info :
         @echo This Makefile allows to test the compiler
         @echo
         @echo Targets:
-        @echo   all   - continue all tests
-        @echo   full  - clean and run all tests
-	@echo   dailytest - run full and save results
-	@echo               in files having the date as extension
-        @echo   onlyknown - run only known bugs
-        @echo   onlygraph - run only graph tests
-        @echo   onlyinteractive - run only interactive tests
-
+        @echo "  all   - continue all tests"
+        @echo "  full  - clean and run all tests"
+	@echo "  dailytest - run full and save results"
+	@echo "              in files having the date as extension"
+        @echo "  onlyknown - run only known bugs"
+        @echo "  onlygraph - run only graph tests"
+        @echo "  onlyinteractive - run only interactive tests"
+	@echo Done using FPC=$(FPC)
 
 override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d)