diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-12 20:16:37 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-17 12:33:49 +0300 |
commit | f1996f7291f9735f80b94b3893832829273c906c (patch) | |
tree | c9072d6b998f464f1a8645299e5a693a9b652728 | |
parent | 1441cb981259dfbfd13797157eee25ce9f94169f (diff) | |
download | meson-f1996f7291f9735f80b94b3893832829273c906c.zip meson-f1996f7291f9735f80b94b3893832829273c906c.tar.gz meson-f1996f7291f9735f80b94b3893832829273c906c.tar.bz2 |
Use the Windows proof dir deleter consistently.
-rwxr-xr-x | run_unittests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py index a405b01..2cdd13a 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -30,7 +30,7 @@ import mesonbuild.mlog import mesonbuild.compilers import mesonbuild.environment import mesonbuild.mesonlib -from mesonbuild.mesonlib import is_windows, is_osx, is_cygwin +from mesonbuild.mesonlib import is_windows, is_osx, is_cygwin, windows_proof_rmtree from mesonbuild.environment import Environment from mesonbuild.dependencies import DependencyException from mesonbuild.dependencies import PkgConfigDependency, ExternalProgram @@ -445,7 +445,7 @@ class BasePlatformTests(unittest.TestCase): print(f.read()) def tearDown(self): - shutil.rmtree(self.builddir) + windows_proof_rmtree(self.builddir) os.environ = self.orig_env super().tearDown() @@ -534,7 +534,7 @@ class BasePlatformTests(unittest.TestCase): self._run(self.mconf_command + [arg, self.builddir]) def wipe(self): - shutil.rmtree(self.builddir) + windows_proof_rmtree(self.builddir) def utime(self, f): ensure_backend_detects_changes(self.backend) @@ -1239,7 +1239,7 @@ class FailureTests(BasePlatformTests): def tearDown(self): super().tearDown() - shutil.rmtree(self.srcdir) + windows_proof_rmtree(self.srcdir) def assertMesonRaises(self, contents, match, extra_args=None, langs=None): ''' @@ -1807,7 +1807,7 @@ class RewriterTests(unittest.TestCase): self.test_dir = os.path.join(src_root, 'test cases/rewrite') def tearDown(self): - shutil.rmtree(self.tmpdir) + windows_proof_rmtree(self.tmpdir) def read_contents(self, fname): with open(os.path.join(self.workdir, fname)) as f: |