Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49558 )
20 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
Change subject: configs,test: Move components-lib scripts to tests
......................................................................
configs,test: Move components-lib scripts to tests
Previously these scripts were in `configs/example/components-library`
though they are now used purely for testing purposes and have therefore
been moved to `tests/gem5/configs/example/components-library`.
There should be example scripts for usage of the components library, but
these scripts are no longer suitable since being made more flexible for
the purposes of testing.
Change-Id: I7c4d5bb86fe94898f006220dd962841344b1868e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49558
Tested-by: kokoro <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
---
R tests/gem5/configs/components-library/boot_exit_disk_run.py
R tests/gem5/configs/components-library/parsec_disk_run.py
R tests/gem5/configs/components-library/simple_binary_run.py
R tests/gem5/configs/components-library/simple_traffic_run.py
M tests/gem5/hello_se/test_hello_se.py
M tests/gem5/insttest_se/test.py
M tests/gem5/m5_util/test_exit.py
M tests/gem5/parsec-benchmarks/test_parsec.py
M tests/gem5/stats/test_hdf5.py
M tests/gem5/x86-boot-tests/test_linux_boot.py
10 files changed, 16 insertions(+), 6 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/example/components-library/boot_exit_disk_run.py
b/tests/gem5/configs/components-library/boot_exit_disk_run.py
similarity index 99%
rename from configs/example/components-library/boot_exit_disk_run.py
rename to tests/gem5/configs/components-library/boot_exit_disk_run.py
index 91fa7c1..48b4d93 100644
--- a/configs/example/components-library/boot_exit_disk_run.py
+++ b/tests/gem5/configs/components-library/boot_exit_disk_run.py
@@ -42,6 +42,7 @@
os.pardir,
os.pardir,
os.pardir,
+ os.pardir,
)
)
diff --git a/configs/example/components-library/parsec_disk_run.py
b/tests/gem5/configs/components-library/parsec_disk_run.py
similarity index 99%
rename from configs/example/components-library/parsec_disk_run.py
rename to tests/gem5/configs/components-library/parsec_disk_run.py
index f773fb0..8868652 100644
--- a/configs/example/components-library/parsec_disk_run.py
+++ b/tests/gem5/configs/components-library/parsec_disk_run.py
@@ -50,6 +50,7 @@
os.pardir,
os.pardir,
os.pardir,
+ os.pardir,
)
)
diff --git a/configs/example/components-library/simple_binary_run.py
b/tests/gem5/configs/components-library/simple_binary_run.py
similarity index 99%
rename from configs/example/components-library/simple_binary_run.py
rename to tests/gem5/configs/components-library/simple_binary_run.py
index e886cb7..6c7e590 100644
--- a/configs/example/components-library/simple_binary_run.py
+++ b/tests/gem5/configs/components-library/simple_binary_run.py
@@ -44,6 +44,7 @@
os.pardir,
os.pardir,
os.pardir,
+ os.pardir,
)
)
diff --git a/configs/example/components-library/simple_traffic_run.py
b/tests/gem5/configs/components-library/simple_traffic_run.py
similarity index 99%
rename from configs/example/components-library/simple_traffic_run.py
rename to tests/gem5/configs/components-library/simple_traffic_run.py
index d469a42..9f2ceef 100644
--- a/configs/example/components-library/simple_traffic_run.py
+++ b/tests/gem5/configs/components-library/simple_traffic_run.py
@@ -46,6 +46,7 @@
os.pardir,
os.pardir,
os.pardir,
+ os.pardir,
)
)
diff --git a/tests/gem5/hello_se/test_hello_se.py
b/tests/gem5/hello_se/test_hello_se.py
index 979a48a..4893c3e 100644
--- a/tests/gem5/hello_se/test_hello_se.py
+++ b/tests/gem5/hello_se/test_hello_se.py
@@ -101,8 +101,9 @@
verifiers=(stdout_verifier,),
config=joinpath(
config.base_dir,
+ "tests",
+ "gem5",
"configs",
- "example",
"components-library",
"simple_binary_run.py",
),
diff --git a/tests/gem5/insttest_se/test.py b/tests/gem5/insttest_se/test.py
index 3dd9a33..f0337da 100644
--- a/tests/gem5/insttest_se/test.py
+++ b/tests/gem5/insttest_se/test.py
@@ -52,8 +52,9 @@
verifiers=verifiers,
config=joinpath(
config.base_dir,
+ "tests",
+ "gem5",
"configs",
- "example",
"components-library",
"simple_binary_run.py",
),
diff --git a/tests/gem5/m5_util/test_exit.py
b/tests/gem5/m5_util/test_exit.py
index 413b6ea..a70caec 100644
--- a/tests/gem5/m5_util/test_exit.py
+++ b/tests/gem5/m5_util/test_exit.py
@@ -58,8 +58,9 @@
fixtures=(),
config=joinpath(
config.base_dir,
+ "tests",
+ "gem5",
"configs",
- "example",
"components-library",
"simple_binary_run.py",
),
diff --git a/tests/gem5/parsec-benchmarks/test_parsec.py
b/tests/gem5/parsec-benchmarks/test_parsec.py
index 1156da6..8662605 100644
--- a/tests/gem5/parsec-benchmarks/test_parsec.py
+++ b/tests/gem5/parsec-benchmarks/test_parsec.py
@@ -70,8 +70,9 @@
fixtures=(),
config=joinpath(
config.base_dir,
+ "tests",
+ "gem5",
"configs",
- "example",
"components-library",
"parsec_disk_run.py",
),
diff --git a/tests/gem5/stats/test_hdf5.py b/tests/gem5/stats/test_hdf5.py
index 8e2761f..6537e5c 100644
--- a/tests/gem5/stats/test_hdf5.py
+++ b/tests/gem5/stats/test_hdf5.py
@@ -77,8 +77,9 @@
fixtures=(),
config=joinpath(
config.base_dir,
+ "tests",
+ "gem5",
"configs",
- "example",
"components-library",
"simple_binary_run.py",
),
diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py
b/tests/gem5/x86-boot-tests/test_linux_boot.py
index 1e16107..b3e3064 100644
--- a/tests/gem5/x86-boot-tests/test_linux_boot.py
+++ b/tests/gem5/x86-boot-tests/test_linux_boot.py
@@ -74,8 +74,9 @@
fixtures=(),
config=joinpath(
config.base_dir,
+ "tests",
+ "gem5",
"configs",
- "example",
"components-library",
"boot_exit_disk_run.py",
),
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49558
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I7c4d5bb86fe94898f006220dd962841344b1868e
Gerrit-Change-Number: 49558
Gerrit-PatchSet: 28
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
