paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 23:21:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pierre Muller 2024-10-28 11:00:27 +01:00
parent ba7a76bf37
commit 34b6d4f572
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Makefile
View File

@ -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

12
tests/Makefile.fpc
View File

@ -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