From 264533cb67261bcf424f8f84e3a32b43d1704a02 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 12 Jul 2019 13:10:30 +0530 Subject: [PATCH] unit tests: Don't keep builddirs inside source tree on Cygwin Seems to cause the umask tests to fail: https://github.com/mesonbuild/meson/pull/5546#issuecomment-509666523 --- run_unittests.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/run_unittests.py b/run_unittests.py index d4e6735a1385..306c2212a29e 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1199,9 +1199,17 @@ def change_builddir(self, newdir): self.builddirs.append(self.builddir) def new_builddir(self): + if not is_cygwin(): + # Keep builddirs inside the source tree so that virus scanners + # don't complain + newdir = tempfile.mkdtemp(dir=os.getcwd()) + else: + # But not on Cygwin because that breaks the umask tests. See: + # https://github.com/mesonbuild/meson/pull/5546#issuecomment-509666523 + newdir = tempfile.mkdtemp() # In case the directory is inside a symlinked directory, find the real # path otherwise we might not find the srcdir from inside the builddir. - newdir = os.path.realpath(tempfile.mkdtemp(dir=os.getcwd())) + newdir = os.path.realpath(newdir) self.change_builddir(newdir) def _print_meson_log(self):