diff options
| -rw-r--r-- | .github/workflows/cygwin.yml | 4 | ||||
| -rw-r--r-- | unittests/baseplatformtests.py | 12 | ||||
| -rw-r--r-- | unittests/linuxliketests.py | 6 |
3 files changed, 4 insertions, 18 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 441637c15..d641b1850 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -41,6 +41,10 @@ jobs: MESON_CI_JOBNAME: cygwin-${{ matrix.NAME }} steps: + # remove inheritable permissions since they break assumptions testsuite + # makes about file modes + - run: icacls . /inheritance:r /T /C + - uses: actions/cache/restore@v4 id: restore-cache with: diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py index 73682e03a..5fff212f1 100644 --- a/unittests/baseplatformtests.py +++ b/unittests/baseplatformtests.py @@ -125,18 +125,6 @@ class BasePlatformTests(TestCase): newdir = os.path.realpath(newdir) self.change_builddir(newdir) - def new_builddir_in_tempdir(self): - # Can't keep the builddir inside the source tree for the umask tests: - # https://github.com/mesonbuild/meson/pull/5546#issuecomment-509666523 - # And we can't do this for all tests because it causes the path to be - # a short-path which breaks other tests: - # https://github.com/mesonbuild/meson/pull/9497 - 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(newdir) - self.change_builddir(newdir) - def _open_meson_log(self) -> io.TextIOWrapper: log = os.path.join(self.logdir, 'meson-log.txt') return open(log, encoding='utf-8') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 01862b61e..03b57b9f8 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -590,8 +590,6 @@ class LinuxlikeTests(BasePlatformTests): Test that files installed by these tests have the correct permissions. Can't be an ordinary test because our installed_files.txt is very basic. ''' - if is_cygwin(): - self.new_builddir_in_tempdir() # Test file modes testdir = os.path.join(self.common_test_dir, '12 data') self.init(testdir) @@ -644,8 +642,6 @@ class LinuxlikeTests(BasePlatformTests): ''' Test that files are installed with correct permissions using install_mode. ''' - if is_cygwin(): - self.new_builddir_in_tempdir() testdir = os.path.join(self.common_test_dir, '190 install_mode') self.init(testdir) self.build() @@ -684,8 +680,6 @@ class LinuxlikeTests(BasePlatformTests): install umask of 022, regardless of the umask at time the worktree was checked out or the build was executed. ''' - if is_cygwin(): - self.new_builddir_in_tempdir() # Copy source tree to a temporary directory and change permissions # there to simulate a checkout with umask 002. orig_testdir = os.path.join(self.unit_test_dir, '26 install umask') |