Merge zizzer:/z/m5/Bitkeeper/m5

into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : b75a46439477b3f21333a3cc9f1721923839d14c

1 files changed, 3 insertions, 2 deletions

diff --git a/test/genini.py b/test/genini.py
index 9c28ef361..f4d1575db 100755
--- a/test/genini.py
+++ b/test/genini.py
@@ -34,7 +34,6 @@ sys.path.append(joinpath(mypath, '../util/pbs'))
 sys.path.append(joinpath(mypath, '../sim/pyconfig'))
 
 from importer import AddToPath, LoadMpyFile
-from m5config import *
 
 AddToPath('.')
 
@@ -49,12 +48,14 @@ try:
             else:
                 name = arg[:offset]
                 value = arg[offset+1:]
-            env[name] = value
+            os.environ[name] = value
         if opt == '-I':
             AddToPath(arg)
 except getopt.GetoptError:
     sys.exit('Improper Usage')
 
+from m5config import *
+
 for arg in args:
     LoadMpyFile(arg)