tests: fs/linux/arm passing M5_PATH via commandline

This will make it configurable from the testing framework

Change-Id: If82d5e44927c67a1eaecf41505d1d55a6469a4cf
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24524
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>

diff --git a/tests/gem5/fs/linux/arm/run.py b/tests/gem5/fs/linux/arm/run.py
index f4d7f46a38dcd5a6d2f4dac8bac7cde1d34148a6..2183b5d09e95d437f264b8a261d695d483a5acec 100644 (file)
--- a/tests/gem5/fs/linux/arm/run.py
+++ b/tests/gem5/fs/linux/arm/run.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2019 ARM Limited
+# Copyright (c) 2012, 2019-2020 ARM Limited
 # All rights reserved
 #
 # The license below extends only to copyright in the software and shall
@@ -59,7 +59,7 @@ def run_test(root):
     print('Exiting @ tick', m5.curTick(), 'because', exit_event.getCause())
 
 config = sys.argv[1]
-os.environ['M5_PATH'] = os.path.dirname(__file__)
+os.environ['M5_PATH'] = sys.argv[2]
 
 # path setup
 gem5_root = joinpath(os.path.dirname(__file__), '..', '..', '..', '..', '..')

diff --git a/tests/gem5/fs/linux/arm/test.py b/tests/gem5/fs/linux/arm/test.py
index 15a1c6fbcf4abe59e198dbe349404ff93f74e85c..fd1e05e053c4d8a684d89406518c2a1f3ec6a029 100644 (file)
--- a/tests/gem5/fs/linux/arm/test.py
+++ b/tests/gem5/fs/linux/arm/test.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 ARM Limited
+# Copyright (c) 2019-2020 ARM Limited
 # All rights reserved
 #
 # The license below extends only to copyright in the software and shall
@@ -89,7 +89,10 @@ path = os.path.dirname(os.path.abspath(__file__))
 arm_fs_binaries = DownloadedArchive(url, path, tarball)
 
 for name in arm_fs_quick_tests:
-    args = [ joinpath(config.base_dir, 'tests', 'configs', name + '.py') ]
+    args = [
+        joinpath(config.base_dir, 'tests', 'configs', name + '.py'),
+        path
+    ]
     gem5_verify_config(
         name=name,
         verifiers=(), # Add basic stat verifiers
@@ -101,7 +104,10 @@ for name in arm_fs_quick_tests:
     )
 
 for name in arm_fs_long_tests:
-    args = [ joinpath(config.base_dir, 'tests', 'configs', name + '.py') ]
+    args = [
+        joinpath(config.base_dir, 'tests', 'configs', name + '.py'),
+        path
+    ]
     gem5_verify_config(
         name=name,
         verifiers=(), # TODO: Add basic stat verifiers