From: Gabe Black <gabeblack@google.com>
Date: Thu, 23 Aug 2018 03:33:26 +0000 (-0700)
Subject: systemc: Make the test config retrieve sc_main results.
X-Git-Tag: v19.0.0.0~1737
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=432dcf7b6207007ccf31a47d85b002fef35a7c7b;p=gem5.git

systemc: Make the test config retrieve sc_main results.

Accellera's implementation prints any sc_report which is thrown and
escapes sc_main, so we need to do the same to make some tests pass.
Arguably gem5 should fail if sc_main reports an error, but verify.py
would interpret that as the test failing too, and some tests
purposefully generate errors.

This change also stops using the logging module. It wasn't really
providing any benefit, and added extra decoration to log messages
which confused verify.py.

Change-Id: I6850d0ada5e477b67527d99d421478586cda93b3
Reviewed-on: https://gem5-review.googlesource.com/12254
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/systemc/tests/config.py b/src/systemc/tests/config.py
index 7e2dd558c..4b143d109 100755
--- a/src/systemc/tests/config.py
+++ b/src/systemc/tests/config.py
@@ -27,9 +27,8 @@
 
 from __future__ import print_function
 
-import logging
-
 import m5
+import re
 
 from m5.objects import SystemC_Kernel, Root
 
@@ -43,4 +42,14 @@ kernel.sc_main("Hello", "World");
 m5.instantiate(None)
 
 cause = m5.simulate(m5.MaxTick).getCause()
-logging.info('Exiting @ tick %i because %s', m5.curTick(), cause)
+
+result = kernel.sc_main_result()
+if result.code != 0:
+    # Arguably this should make gem5 fail, but some tests purposefully
+    # generate errors, and as long as their output matches that's still
+    # considered correct. A "real" systemc config should expect sc_main
+    # (if present) not to fail.
+    scrubbed = re.sub(r'In file: .*$',
+            'In file: <removed by verify.pl>',
+            result.message)
+    print('\n' + scrubbed)