From dc4f422d32e17d4769620f7c3223ab4a0493f042 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Tue, 1 Sep 2020 14:06:49 -0700 Subject: [PATCH] tests,arch-arm: Pass gem5_root as an arg in run.py Previously `tests/gem5/fs/linux/arm/run.py` contained an ugly, hard-coded `gem5_root` variable. In this commit we pass `gem5_root` as an argument from `tests/gem5/fs/linux/arm/test.py`, utilizing `config.base_dir`. Change-Id: I2b1e3369b1078cce9375fadb7c39fa4292648658 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33955 Reviewed-by: Jason Lowe-Power Tested-by: kokoro Maintainer: Jason Lowe-Power --- tests/gem5/fs/linux/arm/run.py | 2 +- tests/gem5/fs/linux/arm/test.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/gem5/fs/linux/arm/run.py b/tests/gem5/fs/linux/arm/run.py index f0ba9bd68..a0d782bcd 100644 --- a/tests/gem5/fs/linux/arm/run.py +++ b/tests/gem5/fs/linux/arm/run.py @@ -57,9 +57,9 @@ def run_test(root): config = sys.argv[1] os.environ['M5_PATH'] = sys.argv[2] +gem5_root = sys.argv[3] # path setup -gem5_root = joinpath(os.path.dirname(__file__), '..', '..', '..', '..', '..') sys.path.append(joinpath(gem5_root, 'configs')) tests_root = joinpath(gem5_root, 'tests') sys.path.append(joinpath(tests_root, 'gem5', 'configs')) diff --git a/tests/gem5/fs/linux/arm/test.py b/tests/gem5/fs/linux/arm/test.py index 80a2af69e..33ca33e4d 100644 --- a/tests/gem5/fs/linux/arm/test.py +++ b/tests/gem5/fs/linux/arm/test.py @@ -97,7 +97,8 @@ arm_fs_binaries = DownloadedArchive(url, path, tarball) for name in arm_fs_quick_tests: args = [ joinpath(config.base_dir, 'tests', 'gem5', 'configs', name + '.py'), - path + path, + config.base_dir ] gem5_verify_config( name=name, @@ -112,7 +113,8 @@ for name in arm_fs_quick_tests: for name in arm_fs_long_tests: args = [ joinpath(config.base_dir, 'tests', 'gem5', 'configs', name + '.py'), - path + path, + config.base_dir ] gem5_verify_config( name=name, -- 2.30.2