paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 17:47:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 45825

Browse Source 
------------------------------------------------------------------------
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 -
This commit is contained in:
pierre 2020-07-25 12:48:03 +00:00
parent 27960785a6
commit 8ff9f4f743
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Makefile
View File

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

4
tests/Makefile.fpc
View File

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