Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

configs/test/test.py:
    Hand merge.

--HG--
extra : convert_revision : e3fce9cf50a65a9400cd3ec887b13e4765274ec2

diff --cc configs/test/fs.py
index d191f70558c738fe427eaf6f9bcc07c7d78f5339,61fb97c6475998bd7b598e799802386710283c6b..55fed7234a3cdcf06abf8794d0191d7cf1b5a923
--- 1/configs/test/fs.py
--- 2/configs/test/fs.py
+++ b/configs/test/fs.py
@@@ -1,14 -1,19 +1,19 @@@
 +import optparse, os, sys
 +
  import m5
  from m5.objects import *
 -import os,optparse,sys
  from SysPaths import *
+ from FullO3Config import *
  
 -parser = optparse.OptionParser(option_list=m5.standardOptions)
 +parser = optparse.OptionParser()
  
+ parser.add_option("-d", "--detailed", action="store_true")
  parser.add_option("-t", "--timing", action="store_true")
+ parser.add_option("-m", "--maxtick", type="int")
+ parser.add_option("--dual", help="Run full system using dual systems",
+                   action="store_true")
  
  (options, args) = parser.parse_args()
 -m5.setStandardOptions(options)
  
  if args:
      print "Error: script doesn't take any positional arguments"