diff options
| -rw-r--r-- | testsuite/README.md | 4 | ||||
| -rw-r--r-- | testsuite/driver/runtests.py | 4 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/testsuite/README.md b/testsuite/README.md index 31193d61ce..5ab6dafb34 100644 --- a/testsuite/README.md +++ b/testsuite/README.md @@ -18,7 +18,9 @@ Commands to run testsuite: * Skip performance tests: `make SKIP_PERF_TESTS=YES` * Set verbosity: `make VERBOSE=n` where n=0: No per-test ouput, n=1: Only failures, - n=2: Progress output, n=3: Include commands called (default) + n=2: Progress output, n=3: Include commands called (default), + n=4: Include perf test results unconditionally, + n=5: Echo commands in subsidiary make invocations * Pass in extra GHC options: `make EXTRA_HC_OPTS=-fvectorize` You can also change directory to a specific test folder to run that diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index df85fa1d40..7e4f375a2c 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -111,8 +111,8 @@ for opt,arg in opts: config.skip_perf_tests = True if opt == '--verbose': - if arg not in ["0","1","2","3","4"]: - sys.stderr.write("ERROR: requested verbosity %s not supported, use 0,1,2,3 or 4" % arg) + if arg not in ["0","1","2","3","4","5"]: + sys.stderr.write("ERROR: requested verbosity %s not supported, use 0,1,2,3,4 or 5" % arg) sys.exit(1) config.verbose = int(arg) diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 44d1ccb118..7dedb33948 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -872,7 +872,7 @@ def do_test(name, way, func, args, files): # if found and instead have the testsuite decide on what to do # with the output. def override_options(pre_cmd): - if config.verbose >= 4 and bool(re.match('\$make', pre_cmd, re.I)): + if config.verbose >= 5 and bool(re.match('\$make', pre_cmd, re.I)): return pre_cmd.replace('-s' , '') \ .replace('--silent', '') \ .replace('--quiet' , '') |