summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Clerc <xavier.clerc@inria.fr>2010-05-05 10:03:17 +0000
committerXavier Clerc <xavier.clerc@inria.fr>2010-05-05 10:03:17 +0000
commit55e57e57d196ef0f15ba1cfcfa5dc47d83330c1d (patch)
tree9e580c084577ccae90fd8ab8b172f3c3e7cd89c1
parent458d066ec12c41a918d440263627acc7484c09f9 (diff)
downloadocaml-55e57e57d196ef0f15ba1cfcfa5dc47d83330c1d.tar.gz
Directory changes are now silent under GNU make.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10373 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--testsuite/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/Makefile b/testsuite/Makefile
index a9e4b6c66f..10425ca5f4 100644
--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -1,6 +1,7 @@
# $Id$
BASEDIR=${PWD}
+NO_PRINT=`($(MAKE) empty --no-print-directory > /dev/null 2>&1) && echo '--no-print-directory' || echo ''`
default:
@echo "Available targets:"
@@ -13,7 +14,7 @@ default:
all:
@for dir in tests/*; do \
- $(MAKE) one DIR=$$dir; \
+ $(MAKE) $(NO_PRINT) one DIR=$$dir; \
done 2>&1 | tee _log
@$(MAKE) report
@@ -21,7 +22,7 @@ list:
@if [ -z $(FILE) ]; then echo "No value set for variable 'FILE'."; exit 1; fi
@if [ ! -f $(FILE) ]; then echo "File '$(FILE)' does not exist."; exit 1; fi
@while read LINE; do \
- $(MAKE) one DIR=$$LINE; \
+ $(MAKE) $(NO_PRINT) one DIR=$$LINE; \
done < $(FILE) 2>&1 | tee _log
@$(MAKE) report
@@ -56,4 +57,6 @@ report: FORCE
@echo ' ' `grep '^Error' _log | wc -l` 'compilation error(s)'
@echo ' ' `grep '^Warning' _log | wc -l` 'compilation warning(s)'
+empty: FORCE
+
FORCE: