Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12451 )
Change subject: systemc: Teach verify.py to ignore "In file: *" in test
output.
......................................................................
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 <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/tests/verify.py
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/tests/verify.py b/src/systemc/tests/verify.py
index dc00459..96527e9 100755
--- a/src/systemc/tests/verify.py
+++ b/src/systemc/tests/verify.py
@@ -210,6 +210,11 @@
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 @@
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):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12451
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I9fbd94c1b6d9d4e76397e84a4175d326f27b6e4d
Gerrit-Change-Number: 12451
Gerrit-PatchSet: 8
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
