Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : ba556bbc93275fcd920a0529383fd480bb7218de

1 files changed, 4 insertions, 4 deletions

diff --git a/test/genini.py b/test/genini.py
index 73e7012f6..9c28ef361 100644..100755
--- a/test/genini.py
+++ b/test/genini.py
@@ -30,13 +30,14 @@ from os.path import join as joinpath, realpath
 
 mypath = sys.path[0]
 sys.path.append(joinpath(mypath, '..'))
-sys.path.append(joinpath(mypath, '../configs/kernel'))
 sys.path.append(joinpath(mypath, '../util/pbs'))
 sys.path.append(joinpath(mypath, '../sim/pyconfig'))
 
-from importer import mpy_exec, mpy_execfile, AddToPath
+from importer import AddToPath, LoadMpyFile
 from m5config import *
 
+AddToPath('.')
+
 try:
     opts, args = getopt.getopt(sys.argv[1:], '-E:I:')
     for opt,arg in opts:
@@ -55,8 +56,7 @@ except getopt.GetoptError:
     sys.exit('Improper Usage')
 
 for arg in args:
-    AddToPath(os.path.dirname(arg))
-    mpy_execfile(arg)
+    LoadMpyFile(arg)
 
 if globals().has_key('root') and isinstance(root, type) \
        and issubclass(root, Root):