summaryrefslogtreecommitdiff
path: root/test/genini.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/genini.py')
-rw-r--r--test/genini.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/genini.py b/test/genini.py
index e96d7069c..0dac0d409 100644
--- a/test/genini.py
+++ b/test/genini.py
@@ -26,12 +26,14 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import getopt, os, os.path, sys
+from os.path import join as joinpath, realpath
-sys.path.append('..')
-sys.path.append('../configs/kernel')
-sys.path.append('../sim/pyconfig')
+mypath = sys.path[0]
+sys.path.append(joinpath(mypath, '..'))
+sys.path.append(joinpath(mypath, '../configs/kernel'))
+sys.path.append(joinpath(mypath, '../sim/pyconfig'))
-from importer import mpy_exec, AddToPath
+from importer import mpy_exec, mpy_execfile, AddToPath
from m5config import *
try:
@@ -51,7 +53,7 @@ except getopt.GetoptError:
for arg in args:
AddToPath(os.path.dirname(arg))
- mpy_exec(file(arg, 'r'), globals())
+ mpy_execfile(arg)
if globals().has_key('root') and isinstance(root, type) \
and issubclass(root, Root):