From: Jason Lowe-Power <jason@lowepower.com>
Date: Fri, 15 Mar 2019 16:23:51 +0000 (-0700)
Subject: tests: Use full path for DownloadedProgram
X-Git-Tag: v19.0.0.0~1026
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=19eb23f12ef6f8d951c880b7b5b1a212703b0ccd;p=gem5.git

tests: Use full path for DownloadedProgram

Change-Id: I1dceca80a425293d64f81b06ddff499363f18bc0
Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17454
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
---

diff --git a/tests/gem5/fixture.py b/tests/gem5/fixture.py
index c4fd12f52..97aab46f5 100644
--- a/tests/gem5/fixture.py
+++ b/tests/gem5/fixture.py
@@ -221,12 +221,23 @@ class DownloadedProgram(Fixture):
     urlbase = "http://gem5.org/dist/current/"
 
     def __init__(self, path, program, **kwargs):
+        """
+        path: string
+            The path to the directory containing the binary relative to
+            $GEM5_BASE/tests
+        program: string
+            The name of the binary file
+        """
         super(DownloadedProgram, self).__init__("download-" + program,
                                                 build_once=True, **kwargs)
 
         self.program_dir = path
-        self.path = joinpath(self.program_dir, program)
-        self.url = self.urlbase + self.path
+        relative_path = joinpath(self.program_dir, program)
+        self.url = self.urlbase + relative_path
+        self.path = os.path.realpath(
+                        joinpath(absdirpath(__file__), '../', relative_path)
+                    )
+
     def _download(self):
         import urllib
         import errno