diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-15 12:15:11 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-16 16:37:02 +0200 |
commit | 3ac3e125e4f3f74d95bdb20094ff4378dc10c872 (patch) | |
tree | 24f8551ad4a01e575b60040611a908c883256c71 /run_unittests.py | |
parent | 5cd7f5f8c5e374348e55b791caf01604c238f3e5 (diff) | |
download | meson-3ac3e125e4f3f74d95bdb20094ff4378dc10c872.zip meson-3ac3e125e4f3f74d95bdb20094ff4378dc10c872.tar.gz meson-3ac3e125e4f3f74d95bdb20094ff4378dc10c872.tar.bz2 |
Delete leftover files from some tests.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py index 72b497a..8134261 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -56,8 +56,8 @@ from mesonbuild.ast import AstInterpreter from mesonbuild.mesonlib import ( BuildDirLock, LibType, MachineChoice, PerMachine, Version, is_windows, is_osx, is_cygwin, is_dragonflybsd, is_openbsd, is_haiku, is_sunos, - windows_proof_rmtree, python_command, version_compare, split_args, - quote_arg, relpath, is_linux, git + windows_proof_rmtree, windows_proof_rm, python_command, + version_compare, split_args, quote_arg, relpath, is_linux, git ) from mesonbuild.environment import detect_ninja from mesonbuild.mesonlib import MesonException, EnvironmentException, OptionKey @@ -5805,12 +5805,16 @@ class FailureTests(BasePlatformTests): contain required keys. ''' tdir = os.path.join(self.unit_test_dir, '20 subproj dep variables') + stray_file = os.path.join(tdir, 'subprojects/subsubproject.wrap') + if os.path.exists(stray_file): + windows_proof_rm(stray_file) out = self.init(tdir, inprocess=True) self.assertRegex(out, r"Neither a subproject directory nor a .*nosubproj.wrap.* file was found") self.assertRegex(out, r'Function does not take positional arguments.') self.assertRegex(out, r'Dependency .*somenotfounddep.* from subproject .*subprojects/somesubproj.* found: .*NO.*') self.assertRegex(out, r'Dependency .*zlibproxy.* from subproject .*subprojects.*somesubproj.* found: .*YES.*') self.assertRegex(out, r'Missing key .*source_filename.* in subsubproject.wrap') + windows_proof_rm(stray_file) def test_exception_exit_status(self): ''' |