misc,tests: Updated and generalized the resource url for tests

[gem5.git] / tests / gem5 / fs / linux / arm / test.py

diff --git a/tests/gem5/fs/linux/arm/test.py b/tests/gem5/fs/linux/arm/test.py
index fd1e05e053c4d8a684d89406518c2a1f3ec6a029..39cb011359be117b462b12cd7550f6e618e54e90 100644 (file)
--- a/tests/gem5/fs/linux/arm/test.py
+++ b/tests/gem5/fs/linux/arm/test.py
@@ -32,8 +32,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Nikos Nikoleris
 
 '''
 Arm FS simulation tests
@@ -44,17 +42,16 @@ from os.path import join as joinpath
 from testlib import *
 
 arm_fs_quick_tests = [
+    'realview64-simple-atomic',
     'realview64-simple-atomic-dual',
     'realview64-simple-atomic-checkpoint',
+    'realview64-simple-timing',
     'realview64-simple-timing-dual',
     'realview64-switcheroo-atomic',
     'realview64-switcheroo-timing',
-
 ]
 
 arm_fs_long_tests = [
-    'realview64-simple-atomic', # TODO: Move this to quick regressions
-    'realview64-simple-timing', # TODO: Move this to quick regressions
     'realview-simple-atomic',
     'realview-simple-atomic-dual',
     'realview-simple-atomic-checkpoint',
@@ -84,8 +81,9 @@ arm_fs_long_tests = [
 ]
 
 tarball = 'aarch-system-201901106.tar.bz2'
-url = "http://dist.gem5.org/dist/current/arm/" + tarball
-path = os.path.dirname(os.path.abspath(__file__))
+url = config.resource_url + "/arm/" + tarball
+filepath = os.path.dirname(os.path.abspath(__file__))
+path = config.bin_path if config.bin_path else filepath
 arm_fs_binaries = DownloadedArchive(url, path, tarball)
 
 for name in arm_fs_quick_tests:
@@ -96,7 +94,7 @@ for name in arm_fs_quick_tests:
     gem5_verify_config(
         name=name,
         verifiers=(), # Add basic stat verifiers
-        config=joinpath(path, 'run.py'),
+        config=joinpath(filepath, 'run.py'),
         config_args=args,
         valid_isas=(constants.arm_tag,),
         length=constants.quick_tag,
@@ -111,7 +109,7 @@ for name in arm_fs_long_tests:
     gem5_verify_config(
         name=name,
         verifiers=(), # TODO: Add basic stat verifiers
-        config=joinpath(path, 'run.py'),
+        config=joinpath(filepath, 'run.py'),
         config_args=args,
         valid_isas=(constants.arm_tag,),
         length=constants.long_tag,