* allow digest programs on commandline

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/04]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/06]
 #
 default: allexectests
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -1412,29 +1412,33 @@ units/$(FPCMADE):
 ifeq ($(OS_TARGET),win32)
 	$(FPC) -n -Fuunits -FEunits utils/win32err.pp
 endif
+ifndef DOTEST
 DOTEST=./dotest$(EXEEXT)
+DOTESTDEP+=$(DOTEST)
 $(DOTEST) : units utils/dotest.pp utils/redir.pp utils/teststr.pp
 	$(FPC) -n -Fuunits -FE. utils/dotest.pp
 	$(FPC) -n -Fuunits -FE. utils/fail.pp
 	$(FPC) -n -Fuunits -FE. utils/testfail.pp
+endif
 ifneq ($(wildcard ./testfail$(SRCEXEEXT)),)
 TESTCOMSPECRES:=$(shell ./testfail$(SRCEXEEXT))
 endif
 ifneq ($(TESTCOMSPECRES),)
 NOCOMSPEC=1
 endif
-ifeq ($(USESQL),YES)
-DIGESTEXE=./dbdigest$(EXEEXT)
-DIGEST=$(DIGESTEXE) -v $(FPCVERSION)
-else
-DIGESTEXE=./digest$(EXEXEXT)
-DIGEST=$(DIGESTEXE)
+ifndef DBDIGEST
+DBDIGEST=./dbdigest$(EXEEXT)
+DIGESTDEP+=$(DBDIGEST)
+$(DBDIGEST) : units utils/dbdigest.pp utils/teststr.pp utils/testu.pp utils/dbtests.pp
+	$(FPC) -n -Fuunits -Fu../packages/base/mysql -FE. utils/dbdigest.pp
 endif
-./digest$(EXEEXT) : units utils/digest.pp utils/teststr.pp utils/testu.pp
+ifndef DIGEST
+DIGEST=./digest$(EXEEXT)
+DIGESTDEP+=$(DIGEST)
+$(DIGEST) : units utils/digest.pp utils/teststr.pp utils/testu.pp
 	$(FPC) -n -Fuunits -FE. utils/digest.pp
-./dbdigest$(EXEEXT) : units utils/dbdigest.pp utils/teststr.pp utils/testu.pp utils/dbtests.pp
-	$(FPC) -n -Fuunits -Fu../packages/base/mysql -FE. utils/dbdigest.pp
-testcheck: units allpreps $(DOTEST)
+endif
+testcheck: units allpreps $(DOTESTDEP)
 ifneq ($(FPC),ppc386$(EXEEXT))
 ifeq ($(findstring -c$(FPC),$(DOTESTOPT)),)
 override DOTESTOPT+=-c$(FPC)
@@ -1453,9 +1457,9 @@ ifdef NOCOMSPEC
 override DOTESTOPT+=-x
 endif
 DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/dos test/units/objects
-%.log : %.pp $(DOTEST)
+%.log : %.pp $(DOTESTDEP)
 	$(DOTEST) $(DOTESTOPT) $<
-%.elg : %.pp $(DOTEST)
+%.elg : %.pp $(DOTESTDEP)
 	$(DOTEST) $(DOTESTOPT) -e $<
 .PHONY: allpreps
 ifdef CCOMPILER
@@ -1502,8 +1506,11 @@ endif
 distclean: clean
 	-rm -f dotest$(EXEEXT) digest$(EXEEXT) dbdigest$(EXEEXT)
 .PHONY: all full rundigest dailytest onlyknown onlygraph onlyinteractive
-rundigest : $(DIGESTEXE)
+rundigest : $(DIGESTDEP)
 	-$(DIGEST)
+ifeq ($(USESQL),YES)
+	-$(DBDIGEST) -v $(FPC_VERSION)
+endif
 all : allexectests
 full : clean allexectests rundigest
 onlyknown :

tests/Makefile.fpc

@@ -64,11 +64,14 @@ ifeq ($(OS_TARGET),win32)
         $(FPC) -n -Fuunits -FEunits utils/win32err.pp
 endif
 
+ifndef DOTEST
 DOTEST=./dotest$(EXEEXT)
+DOTESTDEP+=$(DOTEST)
 $(DOTEST) : units utils/dotest.pp utils/redir.pp utils/teststr.pp
         $(FPC) -n -Fuunits -FE. utils/dotest.pp
         $(FPC) -n -Fuunits -FE. utils/fail.pp
         $(FPC) -n -Fuunits -FE. utils/testfail.pp
+endif
 
 ifneq ($(wildcard ./testfail$(SRCEXEEXT)),)
 TESTCOMSPECRES:=$(shell ./testfail$(SRCEXEEXT))
@@ -81,21 +84,24 @@ endif
 #
 # Digest program
 #
-ifeq ($(USESQL),YES)
-DIGESTEXE=./dbdigest$(EXEEXT)
-DIGEST=$(DIGESTEXE) -v $(FPCVERSION)
-else
-DIGESTEXE=./digest$(EXEXEXT)
-DIGEST=$(DIGESTEXE)
+ifndef DBDIGEST
+DBDIGEST=./dbdigest$(EXEEXT)
+DIGESTDEP+=$(DBDIGEST)
+
+$(DBDIGEST) : units utils/dbdigest.pp utils/teststr.pp utils/testu.pp utils/dbtests.pp
+        $(FPC) -n -Fuunits -Fu../packages/base/mysql -FE. utils/dbdigest.pp
 endif
 
-./digest$(EXEEXT) : units utils/digest.pp utils/teststr.pp utils/testu.pp
+ifndef DIGEST
+DIGEST=./digest$(EXEEXT)
+DIGESTDEP+=$(DIGEST)
+
+$(DIGEST) : units utils/digest.pp utils/teststr.pp utils/testu.pp
         $(FPC) -n -Fuunits -FE. utils/digest.pp
+endif
 
-./dbdigest$(EXEEXT) : units utils/dbdigest.pp utils/teststr.pp utils/testu.pp utils/dbtests.pp
-        $(FPC) -n -Fuunits -Fu../packages/base/mysql -FE. utils/dbdigest.pp
 
-testcheck: units allpreps $(DOTEST)
+testcheck: units allpreps $(DOTESTDEP)
 
 #
 # Dotest options
@@ -130,10 +136,10 @@ endif
 
 DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/dos test/units/objects
 
-%.log : %.pp $(DOTEST)
+%.log : %.pp $(DOTESTDEP)
         $(DOTEST) $(DOTESTOPT) $<
 
-%.elg : %.pp $(DOTEST)
+%.elg : %.pp $(DOTESTDEP)
         $(DOTEST) $(DOTESTOPT) -e $<
 
 #
@@ -221,8 +227,11 @@ distclean: clean
 
 .PHONY: all full rundigest dailytest onlyknown onlygraph onlyinteractive
 
-rundigest : $(DIGESTEXE)
+rundigest : $(DIGESTDEP)
         -$(DIGEST)
+ifeq ($(USESQL),YES)
+        -$(DBDIGEST) -v $(FPC_VERSION)
+endif
 
 all : allexectests
 

tests/utils/dbdigest.pp

@@ -146,7 +146,6 @@ Var
   Found : Boolean;
 
 begin
-  TS:=FirstStatus;
   Result:=False;
   For TS:=FirstStatus to LastStatus do
     begin
@@ -158,7 +157,6 @@ begin
       ExtractTestFileName(Line);
       Break;
       end;
-    TS:=succ(TS);
     end;
 end;
 
@@ -409,6 +407,7 @@ end;
 
 
 begin
+  Doverbose:=True;
   ProcessConfigFile('dbdigest.cfg');
   ProcessCommandLine;
   If LogFileName<>'' then
@@ -423,7 +422,10 @@ end.
 
 {
   $Log$
-  Revision 1.6  2003-10-04 21:30:21  florian
+  Revision 1.7  2003-10-06 16:53:04  fpc
+    * allow digest programs on commandline
+
+  Revision 1.6  2003/10/04 21:30:21  florian
     + added time to timestamp so multiple runs per day can be done
 
   Revision 1.5  2003/10/03 22:51:02  michael