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

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

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