diff options
| author | Gabe Black <gabeblack@google.com> | 2018-08-30 14:55:55 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-10-03 00:24:32 +0000 |
| commit | ef73520db53ca400b96f83a9f3cdcfbbf5577004 (patch) | |
| tree | 0e487ab4b9fa59b8ccdc2172799dd95b3c8172a2 | |
| parent | fc01f3743ffb130e300842ecdd85659cb57ecafb (diff) | |
| download | gem5-ef73520db53ca400b96f83a9f3cdcfbbf5577004.tar.xz | |
systemc: Teach verify.py to ignore "In file: *" in test output.
Those lines are sensitive to the paths to the test files and are even
redacted in the golden reference output, presumably for that reason.
Change-Id: I9fbd94c1b6d9d4e76397e84a4175d326f27b6e4d
Reviewed-on: https://gem5-review.googlesource.com/c/12451
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
| -rwxr-xr-x | src/systemc/tests/verify.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/systemc/tests/verify.py b/src/systemc/tests/verify.py index dc0045970..96527e9e0 100755 --- a/src/systemc/tests/verify.py +++ b/src/systemc/tests/verify.py @@ -210,6 +210,11 @@ class LogChecker(Checker): filts = '|'.join(filts) return re.compile(filts, flags=re.MULTILINE) + # The reporting mechanism will print the actual filename when running in + # gem5, and the "golden" output will say "<removed by verify.py>". We want + # to strip out both versions to make comparing the output sensible. + in_file_filt = r'^In file: ((<removed by verify\.pl>)|([a-zA-Z0-9.:_/]*))$' + ref_filt = merge_filts( r'^\nInfo: /OSCI/SystemC: Simulation stopped by user.\n', r'^SystemC Simulation\n', @@ -224,10 +229,12 @@ class LogChecker(Checker): 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', info_filt(804), + in_file_filt, ) def __init__(self, ref, test, tag, out_dir): |