diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-08-04 16:16:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-04 16:16:27 +0300 |
| commit | b875c752385f19b9d042b29907d8b45e113c53b2 (patch) | |
| tree | a05803783514a3956fcea33a99ede707f8ad50fb | |
| parent | 3587786a3cf5dd06aa4cab2b6abb36bfd7c7eca0 (diff) | |
| parent | 2f49804cc2d817dc164f32f331449de4689ac185 (diff) | |
| download | meson-b875c752385f19b9d042b29907d8b45e113c53b2.tar.gz | |
Merge pull request #13506 from jon-turney/cygwin-lto-fix
Fix LTO-related testcases on Cygwin
| -rw-r--r-- | .github/workflows/cygwin.yml | 3 | ||||
| -rw-r--r-- | test cases/common/230 external project/test.json | 3 | ||||
| -rw-r--r-- | unittests/allplatformstests.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index d4c0ba53b..d819f802f 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -13,12 +13,14 @@ on: paths: - "mesonbuild/**" - "test cases/**" + - "unittests/**" - ".github/workflows/cygwin.yml" - "run*tests.py" pull_request: paths: - "mesonbuild/**" - "test cases/**" + - "unittests/**" - ".github/workflows/cygwin.yml" - "run*tests.py" @@ -67,6 +69,7 @@ jobs: libgtk3-devel libxml2-devel libxslt-devel + make ninja python2-devel python3-devel diff --git a/test cases/common/230 external project/test.json b/test cases/common/230 external project/test.json index 4888e8752..4df7d4ac5 100644 --- a/test cases/common/230 external project/test.json +++ b/test cases/common/230 external project/test.json @@ -1,6 +1,7 @@ { "installed": [ - { "type": "shared_lib", "file": "usr/lib/foo" }, + { "type": "shared_lib", "file": "usr/lib/foo", "platform": "!cygwin" }, + { "type": "file", "file": "usr/lib/libfoo.dll", "platform": "cygwin" }, { "type": "file", "file": "usr/include/libfoo.h" }, { "type": "file", "file": "usr/lib/pkgconfig/somelib.pc" } ] diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index 400859837..726252611 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -1337,7 +1337,6 @@ class AllPlatformTests(BasePlatformTests): self.utime(os.path.join(testdir, 'srcgen.py')) self.assertRebuiltTarget('basic') - @skipIf(is_ci() and is_cygwin(), 'A GCC update on 2024-07-21 has broken LTO and is being investigated') def test_static_library_lto(self): ''' Test that static libraries can be built with LTO and linked to @@ -1354,7 +1353,6 @@ class AllPlatformTests(BasePlatformTests): self.build() self.run_tests() - @skipIf(is_ci() and is_cygwin(), 'A GCC update on 2024-07-21 has broken LTO and is being investigated') @skip_if_not_base_option('b_lto_threads') def test_lto_threads(self): testdir = os.path.join(self.common_test_dir, '6 linkshared') |