From 8ff9f4f74341afec631e7d35ddc079591de6978c Mon Sep 17 00:00:00 2001 From: pierre Date: Sat, 25 Jul 2020 12:48:03 +0000 Subject: [PATCH] Merge commit 45825 ------------------------------------------------------------------------ r45825 | pierre | 2020-07-22 09:36:13 +0000 (Wed, 22 Jul 2020) | 1 line Revert commit #45737, as it introduces problelms for other test cases ------------------------------------------------------------------------ --- Merging r45825 into '.': U tests/Makefile U tests/Makefile.fpc --- Recording mergeinfo for merge of r45825 into '.': U . git-svn-id: branches/fixes_3_2@45852 - --- tests/Makefile | 4 ++-- tests/Makefile.fpc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 46904da2f3..4ca9e0c7d5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2482,10 +2482,10 @@ else MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc $(GPARMAKE): utils/gparmake.pp $(CREATELST) $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) - $(FPC) -FE. utils/gparmake.pp $(FPCOPT) + $(FPC) -FE. utils/gparmake.pp $(OPT) $(CREATELST): utils/createlst.pp $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) - $(FPC) -FE. utils/createlst.pp $(FPCOPT) + $(FPC) -FE. utils/createlst.pp $(OPT) $(MAKEINC): $(GPARMAKE) $(CREATELST) $(Q)$(MAKE) $(TEST_OUTPUTDIR) $(Q)$(CREATELST) filelisttest.lst $(TESTDIRS) diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc index f65f0bd40d..7bf5b7c332 100644 --- a/tests/Makefile.fpc +++ b/tests/Makefile.fpc @@ -506,11 +506,11 @@ MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc $(GPARMAKE): utils/gparmake.pp $(CREATELST) $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) - $(FPC) -FE. utils/gparmake.pp $(FPCOPT) + $(FPC) -FE. utils/gparmake.pp $(OPT) $(CREATELST): utils/createlst.pp $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) - $(FPC) -FE. utils/createlst.pp $(FPCOPT) + $(FPC) -FE. utils/createlst.pp $(OPT) # Can't have testprep as prerequisite, because that is a phony target and # phony targets are always remade. Since the makefile will be reparsed