diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-08-14 16:12:11 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-08-14 16:12:11 -0700 |
| commit | 4bce50340f8fc1e1e0361cef1971dd127125d5a5 (patch) | |
| tree | 4611996186989b23181a5a01a2b52b1df575dcb7 /tests/run.py | |
| parent | ca84d953b90172e2a642c0d777339c5328345801 (diff) | |
| parent | 0cb32aadb1e516a6427c660f2d7d06062b04ff8f (diff) | |
| download | gem5-4bce50340f8fc1e1e0361cef1971dd127125d5a5.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : e02b606752bf1305d3609051b42a9adba009b7df
Diffstat (limited to 'tests/run.py')
| -rw-r--r-- | tests/run.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/run.py b/tests/run.py index df34faca8..9b77ff9d2 100644 --- a/tests/run.py +++ b/tests/run.py @@ -1,4 +1,4 @@ -# Copyright (c) 2006 The Regents of The University of Michigan +# Copyright (c) 2006-2007 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,7 +33,10 @@ import os, sys # find path to directory containing this file tests_root = os.path.dirname(__file__) -test_progs = os.path.join(tests_root, 'test-progs') +if os.path.isdir('/dist/m5/regression/test-progs'): + test_progs = '/dist/m5/regression/test-progs' +else: + test_progs = os.path.join(tests_root, 'test-progs') # generate path to binary file def binpath(app, file=None): |