Pass -ll option to prepup utility to include longlog file into tar.gz testsuite results

tests/Makefile

@@ -2928,7 +2928,11 @@ endif
 ifndef inWinDOS
 $(TEST_OUTPUTDIR)/tar.lst:
 ifdef inOS2
+ifeq ($(TEST_USE_LONGLOG),)
 	cd $(subst /,\,$(TEST_OUTPUTDIR)) && gnufind . -name "*.log" -o -name "*.elg" > tar.lst
+else
+	$(ECHOREDIR) longlog > $(TEST_OUTPUTDIR)/tar.lst
+endif
 	$(ECHOREDIR) log>> $(TEST_OUTPUTDIR)/tar.lst
 	$(ECHOREDIR) dbdigest.cfg>> $(TEST_OUTPUTDIR)/tar.lst
 else
@@ -2955,15 +2959,15 @@ $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
 ifdef inDOS
 	$(ECHOREDIR) @echo off > dotgz$(SRCBATCHEXT)
 	$(ECHOREDIR) cd $(subst /,\,$(TEST_OUTPUTDIR)) >> dotgz$(SRCBATCHEXT)
-	$(ECHOREDIR) $(subst /,\,../../$(PREPUP)) $(DB_TARGZ) >> dotgz$(SRCBATCHEXT)
+	$(ECHOREDIR) $(subst /,\,../../$(PREPUP)) $PREPUP_OPT $(DB_TARGZ) >> dotgz$(SRCBATCHEXT)
 	$(ECHOREDIR) if errorlevel 1 $(DEL) $(DB_TARGZ) >> dotgz$(SRCBATCHEXT)
 	$(ECHOREDIR) cd $(subst /,\,../../) >> dotgz$(SRCBATCHEXT)
 	$(RUNBATCH) dotgz$(SRCBATCHEXT)
 else
 ifdef inOS2
-	cd "$(subst /,\,$(TEST_OUTPUTDIR))" && "..\..\$(PREPUP)" $(DB_TARGZ)
+	cd "$(subst /,\,$(TEST_OUTPUTDIR))" && "$(subst /,\,../../$(PREPUP))" $PREPUP_OPT $(DB_TARGZ)
 else
-	cd "$(TEST_OUTPUTDIR)" && "../../$(PREPUP)" $(DB_TARGZ)
+	cd "$(TEST_OUTPUTDIR)" && "../../$(PREPUP)" $PREPUP_OPT $(DB_TARGZ)
 endif
 endif
 endif

tests/Makefile.fpc

@@ -700,7 +700,7 @@ else
 TARFROM=--files-from=tar.lst
 endif
 
-# Pass option -ll to perpup if we use longlog file
+# Pass option -ll to prepup if we use longlog file
 # instead of add all *.log and *.elg files to DB_TARGZ
 ifneq ($(TEST_USE_LONGLOG),)
 PREPUP_OPT=-ll
@@ -711,7 +711,11 @@ endif
 ifndef inWinDOS
 $(TEST_OUTPUTDIR)/tar.lst:
 ifdef inOS2
+ifeq ($(TEST_USE_LONGLOG),)
         cd $(subst /,\,$(TEST_OUTPUTDIR)) && gnufind . -name "*.log" -o -name "*.elg" > tar.lst
+else
+        $(ECHOREDIR) longlog > $(TEST_OUTPUTDIR)/tar.lst
+endif
         $(ECHOREDIR) log>> $(TEST_OUTPUTDIR)/tar.lst
         $(ECHOREDIR) dbdigest.cfg>> $(TEST_OUTPUTDIR)/tar.lst
 else
@@ -740,15 +744,15 @@ $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
 ifdef inDOS
         $(ECHOREDIR) @echo off > dotgz$(SRCBATCHEXT)
         $(ECHOREDIR) cd $(subst /,\,$(TEST_OUTPUTDIR)) >> dotgz$(SRCBATCHEXT)
-        $(ECHOREDIR) $(subst /,\,../../$(PREPUP)) $(DB_TARGZ) >> dotgz$(SRCBATCHEXT)
+        $(ECHOREDIR) $(subst /,\,../../$(PREPUP)) $PREPUP_OPT $(DB_TARGZ) >> dotgz$(SRCBATCHEXT)
         $(ECHOREDIR) if errorlevel 1 $(DEL) $(DB_TARGZ) >> dotgz$(SRCBATCHEXT)
         $(ECHOREDIR) cd $(subst /,\,../../) >> dotgz$(SRCBATCHEXT)
         $(RUNBATCH) dotgz$(SRCBATCHEXT)
 else
 ifdef inOS2
-        cd "$(subst /,\,$(TEST_OUTPUTDIR))" && "..\..\$(PREPUP)" $(DB_TARGZ)
+        cd "$(subst /,\,$(TEST_OUTPUTDIR))" && "$(subst /,\,../../$(PREPUP))" $PREPUP_OPT $(DB_TARGZ)
 else
-        cd "$(TEST_OUTPUTDIR)" && "../../$(PREPUP)" $(DB_TARGZ)
+        cd "$(TEST_OUTPUTDIR)" && "../../$(PREPUP)" $PREPUP_OPT $(DB_TARGZ)
 endif
 endif
 endif