summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2018-07-28 00:14:41 -0700
committerGabe Black <gabeblack@google.com>2018-09-11 21:54:51 +0000
commit2eded4b610fcb2e561e5c482b4c5a91680fd443b (patch)
treef2c926b46ca214928475a54202ae1c842a55158b
parent267b788783f0edd9359ea489aec592910472154d (diff)
downloadgem5-2eded4b610fcb2e561e5c482b4c5a91680fd443b.tar.xz
systemc: Make verify.py ignore another warning.
Also make warning filters more general and easier to add by writing a function to generate them. Change-Id: I8d813ded9ad8a9ccac4e48e5ea80a3c9c23959da Reviewed-on: https://gem5-review.googlesource.com/12061 Reviewed-by: Gabe Black <gabeblack@google.com> Maintainer: Gabe Black <gabeblack@google.com>
-rwxr-xr-xsrc/systemc/tests/verify.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/systemc/tests/verify.py b/src/systemc/tests/verify.py
index 062651d5d..0b903dea8 100755
--- a/src/systemc/tests/verify.py
+++ b/src/systemc/tests/verify.py
@@ -190,10 +190,15 @@ class LogChecker(Checker):
filts = '|'.join(filts)
return re.compile(filts, flags=re.MULTILINE)
+ def warning_filt(num):
+ return (r'^\nWarning: \(W{}\) .*\n(In file: .*\n)?'
+ r'(In process: [\w.]* @ .*\n)?').format(num)
+
ref_filt = merge_filts(
r'^\nInfo: /OSCI/SystemC: Simulation stopped by user.\n',
r'^SystemC Simulation\n',
- r'^\nWarning: .*\nIn file: .*\n'
+ warning_filt(571),
+ warning_filt(540)
)
test_filt = merge_filts(
r'^Global frequency set at \d* ticks per second\n'