Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/24524 )
Change subject: tests: fs/linux/arm passing M5_PATH via commandline
..
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
Reviewed-by: Ciro Santilli
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24524
Maintainer: Jason Lowe-Power
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
---
M tests/gem5/fs/linux/arm/run.py
M tests/gem5/fs/linux/arm/test.py
2 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/gem5/fs/linux/arm/run.py b/tests/gem5/fs/linux/arm/run.py
index f4d7f46..2183b5d 100644
--- 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 @@
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 15a1c6f..fd1e05e 100644
--- 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 @@
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_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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/24524
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: If82d5e44927c67a1eaecf41505d1d55a6469a4cf
Gerrit-Change-Number: 24524
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
