diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-01-19 16:24:24 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2021-01-19 18:24:10 +0000 |
| commit | 13e5fd1ef6e8995cf4e8ee59392193d7d3f29926 (patch) | |
| tree | f5a6fa483f207f9709d29b7289ab34af57d492a1 | |
| parent | b1cafb82872784c224d297c748f9c78f47a39fd2 (diff) | |
| download | haskell-wip/test-verbosity.tar.gz | |
Reduce default test verbositywip/test-verbosity
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 9 | ||||
| -rw-r--r-- | testsuite/driver/runtests.py | 2 | ||||
| -rw-r--r-- | testsuite/driver/testglobals.py | 2 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 757e7963d9..8fcc0aaee2 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -180,8 +180,15 @@ getTestArgs = do Just filepath -> Just $ "--metrics-file=" ++ filepath Nothing -> Nothing configArgs = concat [["-e", configArg] | configArg <- testConfigs args] + globalTestVerbosity = case globalVerbosity of + Silent -> "0" + Error -> "1" + Warn -> "1" + Info -> "2" + Verbose -> "4" + Diagnostic -> "5" verbosityArg = case testVerbosity args of - Nothing -> Just $ "--verbose=" ++ show (fromEnum globalVerbosity) + Nothing -> Just $ "--verbose=" ++ globalTestVerbosity Just verbosity -> Just $ "--verbose=" ++ verbosity wayArgs = map ("--way=" ++) (testWays args) compilerArg = ["--config", "compiler=" ++ show (compiler)] diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index b9d6fff859..c0482d0f9d 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -402,7 +402,7 @@ def tabulate_metrics(metrics: List[PerfMetric]) -> None: # First collect all the tests to be run t_files_ok = True for file in t_files: - if_verbose(2, '====> Scanning %s' % file) + if_verbose(3, '====> Scanning %s' % file) newTestDir(tempdir, os.path.dirname(file)) try: with io.open(file, encoding='utf8') as f: diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index ed34ce9ff0..5826a976e1 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -83,7 +83,7 @@ class TestConfig: self.wordsize = '' # Verbosity level - self.verbose = 3 + self.verbose = 2 # See Note [validate and testsuite speed] in toplevel Makefile. self.speed = 1 diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 87a0bbb23d..4c393f9863 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -1084,7 +1084,8 @@ def do_test(name: TestName, [len(t.unexpected_passes), len(t.unexpected_failures), len(t.framework_failures)]] - if_verbose(2, "=====> {0} {1} of {2} {3}".format(*progress_args)) + if t.total_tests % 100 == 0: if_verbose(2, "=====> {1} of {2} {3}".format(*progress_args)) + if_verbose(3, "=====> {0} {1} of {2} {3}".format(*progress_args)) # Update terminal title # useful progress indicator even when make test VERBOSE=1 |