summaryrefslogtreecommitdiff
path: root/testsuite/mk/test.mk
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-05-29 13:35:13 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-06-04 23:58:29 +0200
commitd0063e8975672714a6ae33f7e8175421c6b5d5c5 (patch)
tree8a8c4fcb85a34eb49ec8e00912efef7ab35521d1 /testsuite/mk/test.mk
parent5dd02864a844bcf6fe0018755ff261affdef3fea (diff)
downloadhaskell-d0063e8975672714a6ae33f7e8175421c6b5d5c5.tar.gz
Make validate more quiet
* By default use V=0, and call the testsuite with VERBOSE=2, which we did before only with validate --quiet. This disables printing the test commands it runs. * When --quiet is used, call the testsuite with VERBOSE=1. This disables printing the '====> Scanning' lines, and doesn't print which test is being run. So it only prints something when a test accidentally prints to stdout or when it fails. Don't set this option on Travis, as Travis will cancel a build if it doesn't see any output for more than 10 minutes. * When --quiet is used, set the new test option NO_PRINT_SUMMARY, which skips printing the test summary. Only the list of unexpected failures is printed, if there are any. Note that the full summary can still be found in testsuite_summary.txt * When --quiet is used, don't pass the `-v` flag to `ghc-pkg check` * When --quiet is used, don't print the Oops! header. It shoud be clear from the list of failing tests that something is wrong. This is all done to get the most out of 30 lines of logfile. These changes can be disabled later by simply not passing the --quiet flag to validate. Differential Revision: https://phabricator.haskell.org/D942
Diffstat (limited to 'testsuite/mk/test.mk')
-rw-r--r--testsuite/mk/test.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index 7e5b038e1a..5b482059f1 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -223,9 +223,13 @@ RUNTEST_OPTS += \
--config 'gs=$(call quote_path,$(GS))' \
--config 'timeout_prog=$(call quote_path,$(TIMEOUT_PROGRAM))'
-ifneq "$(OUTPUT_SUMMARY)" ""
+ifneq "$(SUMMARY_FILE)" ""
RUNTEST_OPTS += \
- --output-summary "$(OUTPUT_SUMMARY)"
+ --summary-file "$(SUMMARY_FILE)"
+endif
+ifeq "$(NO_PRINT_SUMMARY)" "YES"
+RUNTEST_OPTS += \
+ --no-print-summary 1
endif
RUNTEST_OPTS += \