Merge zizzer.eecs.umich.edu:/bk/newmem/

into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : 0ab912df014cf1511e960e4058bee3eea047f9f6

tests/run.py

@@ -47,7 +47,8 @@ execfile(os.path.join(tests_root, 'configs', config + '.py'))
 
 # set default maxtick... script can override
 # -1 means run forever
-maxtick = -1
+from m5 import MaxTick
+maxtick = MaxTick
 
 # tweak configuration for specific test