diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 4 | ||||
| -rwxr-xr-x | validate | 9 |
3 files changed, 12 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 4527708734..660d38305a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 644de5afaf..7a4e4f1686 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -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 |