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
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24548
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/tests/gem5/cpu_tests/test.py b/tests/gem5/cpu_tests/test.py
index 58925de259ad86505c3925d37c1d4ecc211015e8..1a61a73316310d0a40c51344265f78c7a6df02cc 100644 (file)
--- a/tests/gem5/cpu_tests/test.py
+++ b/tests/gem5/cpu_tests/test.py
@@ -43,7 +43,7 @@ valid_isas = {
 
 
 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 4ed58ae25981cc2d0b14df7c4329d6e1f0bb87b9..15a1c6fbcf4abe59e198dbe349404ff93f74e85c 100644 (file)
--- a/tests/gem5/fs/linux/arm/test.py
+++ b/tests/gem5/fs/linux/arm/test.py
@@ -84,7 +84,7 @@ arm_fs_long_tests = [
 ]
 
 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/m5_util/test_exit.py b/tests/gem5/m5_util/test_exit.py
index 3c995125428d5bfc3487af410931f43b64e57f4f..22680740b71d8f2f47ea232d48e4706f549bf661 100644 (file)
--- a/tests/gem5/m5_util/test_exit.py
+++ b/tests/gem5/m5_util/test_exit.py
@@ -40,7 +40,8 @@ r'Exiting @ tick \d* because m5_exit instruction encountered'
 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 2aad6f555367927c43b7fb888e42edc198ae64bc..1f022469dd5d1aedb4b58922fee1d5522f1e05bc 100644 (file)
--- 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 3eff29145d1e11bcc20c3b523034ade837220420..3df2d23c13101caf09e81d007b355de39c89544b 100644 (file)
--- 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 eba7342ab75bbc4eb89c3de2427c9939b461601a..2c94a54c9a7ea35c3148cc6f9af38680bb5f66e8 100644 (file)
--- 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)