From c44344391f5e75e57b41a601b39bcdf196ed2154 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Wed, 19 Aug 2020 01:26:31 -0700 Subject: [PATCH] tests: Removed `tests/halt.sh` `tests/halt.sh` is a duplicate of `configs/tests/halt.sh`. The one instance of using `halt.sh`, `tests/gem5/fs/linux/arm/run.py`, has been updated to use `configs/tests/halt.sh` and `tests/halt.sh` has been removed. Change-Id: I42f77a22b5985959a579c75541e4a0fdc135aa0c Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33135 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Travaglini Maintainer: Jason Lowe-Power Tested-by: kokoro --- tests/gem5/fs/linux/arm/run.py | 2 +- tests/halt.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 tests/halt.sh diff --git a/tests/gem5/fs/linux/arm/run.py b/tests/gem5/fs/linux/arm/run.py index 427fae86d..1783439f1 100644 --- a/tests/gem5/fs/linux/arm/run.py +++ b/tests/gem5/fs/linux/arm/run.py @@ -67,7 +67,7 @@ sys.path.append(joinpath(tests_root, 'configs')) exec(compile(open(config).read(), config, 'exec')) system = root.system -system.readfile = os.path.join(tests_root, 'halt.sh') +system.readfile = os.path.join(gem5_root, 'configs', 'boot', 'halt.sh') # The CPU can either be a list of CPUs or a single object. if isinstance(system.cpu, list): diff --git a/tests/halt.sh b/tests/halt.sh deleted file mode 100644 index b1332ebab..000000000 --- a/tests/halt.sh +++ /dev/null @@ -1 +0,0 @@ -m5 exit -- 2.30.2