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

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

--HG--
extra : convert_revision : 11832134b169aa827a1d03c96ef89edddf4b3dab

1 files changed, 15 insertions, 10 deletions

diff --git a/test/genini.py b/test/genini.py
index db1a7a5b0..73e7012f6 100644
--- a/test/genini.py
+++ b/test/genini.py
@@ -26,26 +26,31 @@
 # 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, '../util/pbs'))
+sys.path.append(joinpath(mypath, '../sim/pyconfig'))
 
 from importer import mpy_exec, mpy_execfile, AddToPath
 from m5config import *
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], '-E:')
-    for o,a in opts:
-        if o == '-E':
-            offset = a.find('=')
+    opts, args = getopt.getopt(sys.argv[1:], '-E:I:')
+    for opt,arg in opts:
+        if opt == '-E':
+            offset = arg.find('=')
             if offset == -1:
-                name = a
+                name = arg
                 value = True
             else:
-                name = a[:offset]
-                value = a[offset+1:]
+                name = arg[:offset]
+                value = arg[offset+1:]
             env[name] = value
+        if opt == '-I':
+            AddToPath(arg)
 except getopt.GetoptError:
     sys.exit('Improper Usage')