diff options
| author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-12-04 23:58:08 +0000 |
|---|---|---|
| committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-12-04 23:58:08 +0000 |
| commit | f6378513eb968ecf11e04838823dc63553ee3b38 (patch) | |
| tree | bf3855be6fcb49ec43a1da3783094d7427083901 /tests | |
| parent | 39dde6924c6a020031f4edfae53a862ceea082a6 (diff) | |
| download | fpc-f6378513eb968ecf11e04838823dc63553ee3b38.tar.gz | |
* fixed testsuite after r32548 for certain GNU Make versions, where "-s" is not
enough to suppress the "entering directory" and "leaving directory" messages
(GNU Make 4.0 under Fedora 23 happens to be one that needed that fix)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@32585 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rw-r--r-- | tests/Makefile.fpc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 8792efd09c..20c256fde0 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2401,7 +2401,7 @@ MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc $(GPARMAKE): $(COMPILER_UNITTARGETDIR) utils/gparmake.pp $(FPC) $(FPCOPT) -FE. utils/gparmake.pp $(OPT) $(MAKEINC): $(GPARMAKE) $(TEST_OUTPUTDIR) - $(MAKE) -s -f createlst.mak "TESTDIRS=$(TESTDIRS)" > testfilelist.lst + $(MAKE) -s --no-print-directory -f createlst.mak "TESTDIRS=$(TESTDIRS)" > testfilelist.lst $(Q)$(GPARMAKE) $(MAKEINC) test 1 $(CHUNKSIZE) @testfilelist.lst $(Q)$(GPARMAKE) -a $(MAKEINC) tbs 10000 $(CHUNKSIZE) $(sort $(wildcard tbs/t*.pp)) $(Q)$(GPARMAKE) -a $(MAKEINC) tbf 15000 $(CHUNKSIZE) $(sort $(wildcard tbf/t*.pp)) diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc index ac34f9ff9f..6fcd34ad21 100644 --- a/tests/Makefile.fpc +++ b/tests/Makefile.fpc @@ -515,7 +515,7 @@ $(MAKEINC): $(GPARMAKE) $(TEST_OUTPUTDIR) # used subdirectory. Note also that the index must be increasing for each # new call with a gap insuring that all the previous files have lower index # even if CHUNKSIZE is equal to 1. - $(MAKE) -s -f createlst.mak "TESTDIRS=$(TESTDIRS)" > testfilelist.lst + $(MAKE) -s --no-print-directory -f createlst.mak "TESTDIRS=$(TESTDIRS)" > testfilelist.lst $(Q)$(GPARMAKE) $(MAKEINC) test 1 $(CHUNKSIZE) @testfilelist.lst $(Q)$(GPARMAKE) -a $(MAKEINC) tbs 10000 $(CHUNKSIZE) $(sort $(wildcard tbs/t*.pp)) $(Q)$(GPARMAKE) -a $(MAKEINC) tbf 15000 $(CHUNKSIZE) $(sort $(wildcard tbf/t*.pp)) |