From fdf8605b840892156ed7021a259761d32900fabc Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 29 Jul 2024 14:20:33 +0100 Subject: [PATCH 1/3] CI: Adjust path filters to run tests on Cygwin when unittests change --- .github/workflows/cygwin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index d4c0ba53b20f..ecbe7e21e3ba 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" From 97fc2a160c545d061db64bc9d80366e1da7cf713 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 29 Jul 2024 16:36:40 +0100 Subject: [PATCH 2/3] CI: Install make on Cygwin Test '230 external project' uses make, but is too dumb to use the platform conventions for shared library names in installed files expected by shared_lib, so special case that. --- .github/workflows/cygwin.yml | 1 + test cases/common/230 external project/test.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index ecbe7e21e3ba..d819f802f1fe 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -69,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 4888e8752327..4df7d4ac57ff 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" } ] From 2f49804cc2d817dc164f32f331449de4689ac185 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 28 Jul 2024 22:27:49 +0100 Subject: [PATCH 3/3] Revert "CI: skip LTO tests on cygwin" This reverts commit 0c93149f09bbeedd03c70abc7b6d652b8e9ee9fa. --- unittests/allplatformstests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index 40085983710a..726252611fb7 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -1337,7 +1337,6 @@ def test_source_generator_program_cause_rebuild(self): 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 @@ def test_static_library_lto(self): 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')