From 51e3c33ed41da2204c952792993b408917c6e522 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 6 Sep 2018 16:49:24 -0700 Subject: [PATCH] systemc: Merge stderr and stdout when running tests. The golden output for tests doesn't distinguish between stderr and stdout, and by only comparing against stdout we have to throw away errors which would be good to verify we get right. Also the tests sometimes send output to stderr for no apparent reason, requiring manually patching the tests. This change adds filters for two messages which used to go to stderr in gem5 but now show up in the diffs, one that just says the simulation is starting, and the other for warns of unimplemented functionality. The second warning should be turned on at some point so we make sure everything the tests touch works and they don't just work by coincidence, but for now it introduces a lot of noise among otherwise passing tests. Change-Id: I3b14f7807af561a79d6e0ca87aff1ab6051be596 Reviewed-on: https://gem5-review.googlesource.com/c/12600 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/tests/verify.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/systemc/tests/verify.py b/src/systemc/tests/verify.py index 19cca0560..128332223 100755 --- a/src/systemc/tests/verify.py +++ b/src/systemc/tests/verify.py @@ -152,7 +152,7 @@ class RunPhase(TestPhaseBase): cmd.extend(timeout_cmd) cmd.extend([ test.full_path(), - '-red', os.path.abspath(test.m5out_dir()), + '-rd', os.path.abspath(test.m5out_dir()), '--listener-mode=off', '--quiet', config_path, @@ -225,17 +225,13 @@ class LogChecker(Checker): warning_filt(540), warning_filt(569), warning_filt(571), - error_filt(514), - error_filt(515), - error_filt(525), - error_filt(541), - error_filt(542), - error_filt(543), info_filt(804), in_file_filt, ) test_filt = merge_filts( r'^Global frequency set at \d* ticks per second\n', + r'^info: Entering event queue @ \d*\. Starting simulation\.\.\.\n', + r'warn: [^(]+\([^)]*\)( \[with [^]]*\])? not implemented\.\n', info_filt(804), in_file_filt, ) -- 2.30.2