Merge with head.

[gem5.git] / tests / long / 70.twolf / test.py

diff --git a/tests/long/70.twolf/test.py b/tests/long/70.twolf/test.py
index 310c0cfc3f6b25a990057d0598dee40c71c285ed..85b106eb4e505084cff269ad70482484429bbbed 100644 (file)
--- a/tests/long/70.twolf/test.py
+++ b/tests/long/70.twolf/test.py
@@ -30,12 +30,18 @@ m5.AddToPath('../configs/common')
 from cpu2000 import twolf
 import os
 
-workload = twolf('alpha', 'tru64', 'smred')
+workload = twolf(isa, opsys, 'smred')
 root.system.cpu.workload = workload.makeLiveProcess()
-cwd = root.system.cpu.workload.cwd
+cwd = root.system.cpu.workload[0].cwd
 
 #Remove two files who's presence or absence affects execution
 sav_file = os.path.join(cwd, workload.input_set + '.sav')
 sv2_file = os.path.join(cwd, workload.input_set + '.sv2')
-os.unlink(sav_file)
-os.unlink(sv2_file)
+try:
+    os.unlink(sav_file)
+except:
+    print "Couldn't unlink ", sav_file
+try:
+    os.unlink(sv2_file)
+except:
+    print "Couldn't unlink ", sv2_file