From af02aa6a0dc89f22dd0d3b37c3fcc63c61d91417 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Fri, 17 Jan 2020 17:32:44 -0800 Subject: [PATCH] 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 Maintainer: Jason Lowe-Power Tested-by: kokoro --- tests/gem5/cpu_tests/test.py | 2 +- tests/gem5/fs/linux/arm/test.py | 2 +- tests/gem5/m5_util/test_exit.py | 3 ++- tests/test-progs/hello/src/Makefile.arm | 2 +- tests/test-progs/hello/src/Makefile.x86 | 2 +- tests/test-progs/m5-exit/src/Makefile.x86 | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/gem5/cpu_tests/test.py b/tests/gem5/cpu_tests/test.py index 58925de25..1a61a7331 100644 --- 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 4ed58ae25..15a1c6fbc 100644 --- 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 3c9951254..22680740b 100644 --- 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 2aad6f555..1f022469d 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 3eff29145..3df2d23c1 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 eba7342ab..2c94a54c9 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) -- 2.30.2