diff options
| -rw-r--r-- | tests/gem5/fixture.py | 4 | ||||
| -rw-r--r-- | tests/gem5/hello_se/test_hello_se.py | 2 | ||||
| -rw-r--r-- | tests/gem5/m5_util/test_exit.py | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/tests/gem5/fixture.py b/tests/gem5/fixture.py index a50d73cff..df834ef75 100644 --- a/tests/gem5/fixture.py +++ b/tests/gem5/fixture.py @@ -220,11 +220,9 @@ class DownloadedProgram(Fixture): super(DownloadedProgram, self).__init__("download-" + program, build_once=True, **kwargs) - self.program_dir = joinpath('test-progs', path) + self.program_dir = path self.path = joinpath(self.program_dir, program) - self.url = self.urlbase + self.path - def _download(self): import urllib log.test_log.debug("Downloading " + self.url + " to " + self.path) diff --git a/tests/gem5/hello_se/test_hello_se.py b/tests/gem5/hello_se/test_hello_se.py index 03100643a..501796207 100644 --- a/tests/gem5/hello_se/test_hello_se.py +++ b/tests/gem5/hello_se/test_hello_se.py @@ -39,7 +39,7 @@ test_progs = { for isa in test_progs: for binary in test_progs[isa]: import os - path = os.path.join('hello', 'bin', isa, 'linux') + path = os.path.join('test-progs', 'hello', 'bin', isa, 'linux') hello_program = DownloadedProgram(path, binary) ref_path = joinpath(getcwd(), 'ref') diff --git a/tests/gem5/m5_util/test_exit.py b/tests/gem5/m5_util/test_exit.py index f5292b139..a766db420 100644 --- a/tests/gem5/m5_util/test_exit.py +++ b/tests/gem5/m5_util/test_exit.py @@ -37,7 +37,8 @@ m5_exit_regex = re.compile( r'Exiting @ tick \d* because m5_exit instruction encountered' ) -test_program = DownloadedProgram('m5-exit/bin/x86/linux/', 'm5_exit') +test_program = DownloadedProgram('test-progs/m5-exit/bin/x86/linux/',\ + 'm5_exit') a = verifier.MatchRegex(m5_exit_regex) gem5_verify_config( |