Skip to content

Commit

Permalink
unit tests: Don't keep builddirs inside source tree on Cygwin
Browse files Browse the repository at this point in the history
Seems to cause the umask tests to fail:
#5546 (comment)
  • Loading branch information
nirbheek authored and jpakkane committed Jul 12, 2019
1 parent d5cb1c2 commit 264533c
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion run_unittests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 264533c

Please sign in to comment.