Merge zizzer:/bk/newmem

into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 39c99c8acadd43f3ec42ae7550289a5075d910e4

1 files changed, 5 insertions, 1 deletions

diff --git a/configs/test/test.py b/configs/test/test.py
index 48d43cee9..2047d65af 100644
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -12,6 +12,8 @@ from FullO3Config import *
 parser = optparse.OptionParser(option_list=m5.standardOptions)
 
 parser.add_option("-c", "--cmd", default="hello")
+parser.add_option("-o", "--options", default="")
+parser.add_option("-i", "--input", default="")
 parser.add_option("-t", "--timing", action="store_true")
 parser.add_option("-d", "--detailed", action="store_true")
 parser.add_option("-m", "--maxtick", type="int")
@@ -28,7 +30,9 @@ this_dir = os.path.dirname(__file__)
 
 process = LiveProcess()
 process.executable = os.path.join(this_dir, options.cmd)
-process.cmd = options.cmd
+process.cmd = options.cmd + " " + options.options
+if options.input != "":
+    process.input = options.input
 
 magicbus = Bus()
 mem = PhysicalMemory()