1 files changed, 8 insertions, 3 deletions
diff --git a/test/genini.py b/test/genini.py
index d04f049ea..ac789e5d6 100755
--- a/test/genini.py
+++ b/test/genini.py
@@ -55,14 +55,19 @@ try:
 except getopt.GetoptError:
     sys.exit('Improper Usage')
 
+import __main__
+__main__.m5_build_env = m5_build_env
+
 from m5 import *
 
 for path in pathlist:
     AddToPath(path)
 
 for arg in args:
-    LoadMpyFile(arg)
+    AddToPath(os.path.dirname(arg))
+    execfile(arg)
 
-if globals().has_key('root') and isinstance(root, type) \
-       and issubclass(root, Root):
+if globals().has_key('root') and isinstance(root, Root):
     instantiate(root)
+else:
+    print "Instantiation skipped: no root object found."