Merge pull request #483 from dbabokin/win_rm_files

Fix for removing temp files on Windows
This commit is contained in:
jbrodman
2013-04-30 11:03:48 -07:00

View File

@@ -339,8 +339,9 @@ def run_test(testname):
if not run_error: if not run_error:
os.unlink(exe_name) os.unlink(exe_name)
if is_windows: if is_windows:
os.unlink("%s.pdb" % filename) basename = os.path.basename(filename)
os.unlink("%s.ilk" % filename) os.unlink("%s.pdb" % basename)
os.unlink("%s.ilk" % basename)
os.unlink(obj_name) os.unlink(obj_name)
except: except:
None None
@@ -367,8 +368,12 @@ def run_tasks_from_queue(queue, queue_ret, total_tests_arg, max_test_length_arg,
if is_windows: if is_windows:
try: try:
os.remove("test_static.obj") os.remove("test_static.obj")
os.remove("/vc100.pdb") # vc*.pdb trick is in anticipaton of new versions of VS.
vcpdb = glob.glob("vc*.pdb")[0]
os.remove(vcpdb)
os.chdir("..") os.chdir("..")
# This will fail if there were failing tests or
# Windows is in bad mood.
os.rmdir(tmpdir) os.rmdir(tmpdir)
except: except:
None None