Commit e367e272 authored by thomie's avatar thomie

Travis: prevent 10' no output, by setting VERBOSE=2

parent 744ff885
......@@ -48,4 +48,9 @@ script:
- echo 'DYNAMIC_GHC_PROGRAMS = NO' >> mk/validate.mk
- echo 'GhcLibWays = v' >> mk/validate.mk
- if [ "$DEBUG_STAGE2" = "YES" ]; then echo 'GhcStage2HcOpts += -DDEBUG' >> mk/validate.mk; fi
- THREADS=3 SKIP_PERF_TESTS=YES ./validate --fast --quiet
# * Use --quiet, otherwise the build log might exceed the limit of 4
# megabytes, causing Travis to kill our job.
# * But use VERBOSE=2 (the default, but not when using --quiet) otherwise
# the testsuite might not print output for over 10 minutes (more likely so
# when DEBUG_STAGE2=NO), causing Travis to again kill our job.
- THREADS=3 SKIP_PERF_TESTS=YES VERBOSE=2 ./validate --fast --quiet
......@@ -255,10 +255,6 @@ else
setaccept =
endif
TESTS =
TEST =
WAY =
.PHONY: all boot test verbose accept fast list_broken
all: test
......
......@@ -33,6 +33,11 @@ Flags:
THREADS=1 ./validate
You can also use environment variables to pass extra options to the
testsuite. For example:
TEST='read001 read002' ./validate --testsuite-only --fast
EOF
}
......@@ -260,10 +265,8 @@ FAST)
;;
esac
if [ $be_quiet -eq 1 ]; then
if [ $be_quiet -eq 1 ] && [ -z $VERBOSE ]; then
TEST_VERBOSITY="VERBOSE=1 NO_PRINT_SUMMARY=YES"
else
TEST_VERBOSITY="VERBOSE=2"
fi
$make $MAKE_TEST_TARGET stage=2 $BINDIST $TEST_VERBOSITY THREADS=$threads 2>&1 | tee testlog
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment