change to os.path.join like nate wanted.
authorLisa Hsu <hsul@eecs.umich.edu>
Wed, 8 Nov 2006 19:01:23 +0000 (14:01 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Wed, 8 Nov 2006 19:01:23 +0000 (14:01 -0500)
--HG--
extra : convert_revision : 6e8a0153adf04f0cc07904434e4cb6a83fe900eb

configs/common/Simulation.py

index d88373d5450ac74e539167954ad515a6525439bb..afa147537da5c62f0ea1242cef4edb2d5c1173bf 100644 (file)
@@ -27,6 +27,7 @@
 # Authors: Lisa Hsu
 
 from os import getcwd
+from os.path import join as joinpath
 import m5
 from m5.objects import *
 m5.AddToPath('../common')
@@ -149,7 +150,7 @@ def run(options, root, testsys, cpu_class):
             m5.panic('Checkpoint %d not found' % cpt_num)
 
         m5.restoreCheckpoint(root,
-                             "/".join([cptdir, "cpt.%s" % cpts[cpt_num - 1]]))
+                             joinpath(cptdir, "cpt.%s" % cpts[cpt_num - 1]))
 
     if options.standard_switch or cpu_class:
         exit_event = m5.simulate(10000)
@@ -184,7 +185,7 @@ def run(options, root, testsys, cpu_class):
             exit_event = m5.simulate(when - m5.curTick())
 
         if exit_event.getCause() == "simulate() limit reached":
-            m5.checkpoint(root, "/".join([cptdir,"cpt.%d"]))
+            m5.checkpoint(root, joinpath(cptdir, "cpt.%d"))
             num_checkpoints += 1
 
         sim_ticks = when
@@ -200,14 +201,14 @@ def run(options, root, testsys, cpu_class):
                 while exit_event.getCause() == "checkpoint":
                     exit_event = m5.simulate(sim_ticks - m5.curTick())
                 if exit_event.getCause() == "simulate() limit reached":
-                    m5.checkpoint(root, "/".join([cptdir,"cpt.%d"]))
+                    m5.checkpoint(root, joinpath(cptdir, "cpt.%d"))
                     num_checkpoints += 1
 
     else: #no checkpoints being taken via this script
         exit_event = m5.simulate(maxtick)
 
         while exit_event.getCause() == "checkpoint":
-            m5.checkpoint(root, "/".join([cptdir,"cpt.%d"]))
+            m5.checkpoint(root, joinpath(cptdir, "cpt.%d"))
             num_checkpoints += 1
             if num_checkpoints == max_checkpoints:
                 exit_cause =  "maximum %d checkpoints dropped" % max_checkpoints