From: Gabe Black <gabeblack@google.com>
Date: Tue, 28 Aug 2018 03:34:07 +0000 (-0700)
Subject: systemc: Make verify.py run the tests from the directory they expect.
X-Git-Tag: v19.0.0.0~1719
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1baba25cb9e197b638b5a495e21f4aef628afad6;p=gem5.git

systemc: Make verify.py run the tests from the directory they expect.

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

diff --git a/src/systemc/tests/verify.py b/src/systemc/tests/verify.py
index 9c98d47ad..f56c50a79 100755
--- a/src/systemc/tests/verify.py
+++ b/src/systemc/tests/verify.py
@@ -142,16 +142,19 @@ class RunPhase(TestPhaseBase):
             '--kill-after', str(args.timeout * 2),
             str(args.timeout)
         ]
+        curdir = os.getcwd()
         def run_test(test):
             cmd = []
             if args.timeout:
                 cmd.extend(timeout_cmd)
             cmd.extend([
                 test.full_path(),
-                '-red', test.m5out_dir(),
+                '-red', os.path.abspath(test.m5out_dir()),
                 '--listener-mode=off',
                 '--quiet',
-                config_path
+                config_path,
+                '--working-dir',
+                os.path.dirname(test.src_dir())
             ])
             # Ensure the output directory exists.
             if not os.path.exists(test.m5out_dir()):
@@ -162,6 +165,7 @@ class RunPhase(TestPhaseBase):
                 returncode = error.returncode
             else:
                 returncode = 0
+            os.chdir(curdir)
             with open(test.returncode_file(), 'w') as rc:
                 rc.write('%d\n' % returncode)