Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/24548 )
Change subject: tests: Updated tests to download from http://dist.gem5.org
......................................................................
tests: Updated tests to download from http://dist.gem5.org
Previously some tests, and test resources, downloaded content from
http://gem5.org . This is being migrated to http://dist.gem5.org.
http://dist.gem5.org should be used to store and retrieve resources
going forward.
Change-Id: I7162c76b9b8dc07657a6ba50d643fc93c9824fdf
---
M tests/gem5/cpu_tests/test.py
M tests/gem5/fs/linux/arm/test.py
M tests/gem5/hello_se/test_hello_se.py
M tests/gem5/m5_util/test_exit.py
M tests/test-progs/hello/src/Makefile.arm
M tests/test-progs/hello/src/Makefile.x86
M tests/test-progs/m5-exit/src/Makefile.x86
7 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/gem5/cpu_tests/test.py b/tests/gem5/cpu_tests/test.py
index 58925de..1a61a73 100644
--- a/tests/gem5/cpu_tests/test.py
+++ b/tests/gem5/cpu_tests/test.py
@@ -43,7 +43,7 @@
base_path = joinpath(absdirpath(__file__), 'benchmarks', 'bin')
-base_url = 'http://gem5.org/dist/current/gem5/cpu_tests/benchmarks/bin/'
+base_url
= 'http://dist.gem5.org/dist/current/gem5/cpu_tests/benchmarks/bin/'
for isa in valid_isas:
path = joinpath(base_path, isa)
for workload in workloads:
diff --git a/tests/gem5/fs/linux/arm/test.py
b/tests/gem5/fs/linux/arm/test.py
index 4ed58ae..15a1c6f 100644
--- a/tests/gem5/fs/linux/arm/test.py
+++ b/tests/gem5/fs/linux/arm/test.py
@@ -84,7 +84,7 @@
]
tarball = 'aarch-system-201901106.tar.bz2'
-url = "http://gem5.org/dist/current/arm/"; + tarball
+url = "http://dist.gem5.org/dist/current/arm/"; + tarball
path = os.path.dirname(os.path.abspath(__file__))
arm_fs_binaries = DownloadedArchive(url, path, tarball)
diff --git a/tests/gem5/hello_se/test_hello_se.py
b/tests/gem5/hello_se/test_hello_se.py
index cc62efb..ff3ef5e 100644
--- a/tests/gem5/hello_se/test_hello_se.py
+++ b/tests/gem5/hello_se/test_hello_se.py
@@ -36,7 +36,7 @@
'arm': ('hello64-static', 'hello32-static'),
}
-urlbase = 'http://gem5.org/dist/current/test-progs/hello/bin/'
+urlbase = 'http://org.gem5.org/dist/current/test-progs/hello/bin/'
for isa in test_progs:
for binary in test_progs[isa]:
import os
diff --git a/tests/gem5/m5_util/test_exit.py
b/tests/gem5/m5_util/test_exit.py
index 3c99512..2268074 100644
--- a/tests/gem5/m5_util/test_exit.py
+++ b/tests/gem5/m5_util/test_exit.py
@@ -40,7 +40,8 @@
path = joinpath(absdirpath(__file__), '..',
'test-progs', 'hello', 'bin', 'x86', 'linux')
filename = 'm5_exit'
-url
= 'http://gem5.org/dist/current/test-progs/m5-exit/bin/x86/linux/m5_exit'
+url = 'http://dist.gem5.org/dist/current/test-progs/' +
+ 'm5-exit/bin/x86/linux/m5_exit'
test_program = DownloadedProgram(url, path, filename)
a = verifier.MatchRegex(m5_exit_regex)
diff --git a/tests/test-progs/hello/src/Makefile.arm
b/tests/test-progs/hello/src/Makefile.arm
index 2aad6f5..1f02246 100644
--- a/tests/test-progs/hello/src/Makefile.arm
+++ b/tests/test-progs/hello/src/Makefile.arm
@@ -1,6 +1,6 @@
SERVER_USER=
SERVER_PATH=/z/www/htdocs/dist/current/test-progs/hello/bin/arm/linux
-FETCH_PATH=http://gem5.org/dist/current/test-progs/hello/bin/arm/linux
+FETCH_PATH=http://dist.gem5.org/dist/current/test-progs/hello/bin/arm/linux
UPLOAD_LOCATION=$(SERVER_USER)daystrom.gem5.org:$(SERVER_PATH)
all: hello64-static hello32-static
diff --git a/tests/test-progs/hello/src/Makefile.x86
b/tests/test-progs/hello/src/Makefile.x86
index 3eff291..3df2d23 100644
--- a/tests/test-progs/hello/src/Makefile.x86
+++ b/tests/test-progs/hello/src/Makefile.x86
@@ -1,6 +1,6 @@
SERVER_USER=
SERVER_PATH=/z/www/htdocs/dist/current/test-progs/hello/bin/x86/linux
-FETCH_PATH=http://gem5.org/dist/current/test-progs/hello/bin/x86/linux
+FETCH_PATH=http://dist.gem5.org/dist/current/test-progs/hello/bin/x86/linux
UPLOAD_LOCATION=$(SERVER_USER)daystrom.gem5.org:$(SERVER_PATH)
diff --git a/tests/test-progs/m5-exit/src/Makefile.x86
b/tests/test-progs/m5-exit/src/Makefile.x86
index eba7342..2c94a54 100644
--- a/tests/test-progs/m5-exit/src/Makefile.x86
+++ b/tests/test-progs/m5-exit/src/Makefile.x86
@@ -1,6 +1,6 @@
SERVER_USER=
SERVER_PATH=/z/www/htdocs/dist/current/test-progs/m5-exit/bin/x86/linux
-FETCH_PATH=http://gem5.org/dist/current/test-progs/m5-exit/bin/x86/linux
+FETCH_PATH=http://dist.gem5.org/dist/current/test-progs/m5-exit/bin/x86/linux
UPLOAD_LOCATION=$(SERVER_USER)daystrom.gem5.org:$(SERVER_PATH)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/24548
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: I7162c76b9b8dc07657a6ba50d643fc93c9824fdf
Gerrit-Change-Number: 24548
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
