Browse Source

Revert commit #45737, as it introduces problelms for other test cases

git-svn-id: trunk@45825 -
pierre 5 years ago
parent
commit
219db914e3
2 changed files with 4 additions and 4 deletions
  1. 2 2
      tests/Makefile
  2. 2 2
      tests/Makefile.fpc

+ 2 - 2
tests/Makefile

@@ -2633,10 +2633,10 @@ else
 MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
 MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
 $(GPARMAKE): utils/gparmake.pp $(CREATELST)
 $(GPARMAKE): utils/gparmake.pp $(CREATELST)
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
-	$(FPC) -FE. utils/gparmake.pp $(FPCOPT)
+	$(FPC) -FE. utils/gparmake.pp $(OPT)
 $(CREATELST): utils/createlst.pp
 $(CREATELST): utils/createlst.pp
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
-	$(FPC) -FE. utils/createlst.pp $(FPCOPT)
+	$(FPC) -FE. utils/createlst.pp $(OPT)
 $(MAKEINC): $(GPARMAKE) $(CREATELST)
 $(MAKEINC): $(GPARMAKE) $(CREATELST)
 	$(Q)$(MAKE) $(TEST_OUTPUTDIR)
 	$(Q)$(MAKE) $(TEST_OUTPUTDIR)
 	$(Q)$(CREATELST) filelisttest.lst $(TESTDIRS)
 	$(Q)$(CREATELST) filelisttest.lst $(TESTDIRS)

+ 2 - 2
tests/Makefile.fpc

@@ -514,11 +514,11 @@ MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
 
 
 $(GPARMAKE): utils/gparmake.pp $(CREATELST)
 $(GPARMAKE): utils/gparmake.pp $(CREATELST)
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
-	$(FPC) -FE. utils/gparmake.pp $(FPCOPT)
+	$(FPC) -FE. utils/gparmake.pp $(OPT)
 
 
 $(CREATELST): utils/createlst.pp
 $(CREATELST): utils/createlst.pp
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
 	$(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
 # Can't have testprep as prerequisite, because that is a phony target and
 # phony targets are always remade. Since the makefile will be reparsed
 # phony targets are always remade. Since the makefile will be reparsed