summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2019-02-20 16:41:45 -0800
committerGabe Black <gabeblack@google.com>2019-02-25 23:09:56 +0000
commit118e16bdfaea4d59d708fdec04dd095b9628ed0c (patch)
treed46881b5b68cf5645fa08f6d4f935d67d250be0b
parent9bc9b2408395f93297a38aa1f54df562291f7752 (diff)
downloadgem5-118e16bdfaea4d59d708fdec04dd095b9628ed0c.tar.xz
systemc: Start using the m5.systemc module in the test config.py.
Start using sc_main and sc_main_result from the systemc module, and stop using the versions of those functions which are attached to the SystemC_Kernel SimObject. Change-Id: I802898038c80ed36e6a9176211cffb7e0fde2d7e Reviewed-on: https://gem5-review.googlesource.com/c/16564 Maintainer: Gabe Black <gabeblack@google.com> Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
-rwxr-xr-xsrc/systemc/tests/config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/systemc/tests/config.py b/src/systemc/tests/config.py
index ebdd5cd47..cd7c29e53 100755
--- a/src/systemc/tests/config.py
+++ b/src/systemc/tests/config.py
@@ -47,13 +47,13 @@ args = parser.parse_args()
if args.working_dir:
os.chdir(args.working_dir)
-kernel.sc_main('gem5_systemc_test');
+m5.systemc.sc_main('gem5_systemc_test');
m5.instantiate(None)
cause = m5.simulate(m5.MaxTick).getCause()
-result = kernel.sc_main_result()
+result = m5.systemc.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