Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix LTO-related testcases on Cygwin #13506

Merged
merged 3 commits into from
Aug 4, 2024
Merged

Fix LTO-related testcases on Cygwin #13506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdf8605
CI: Adjust path filters to run tests on Cygwin when unittests change
jon-turney Jul 29, 2024
97fc2a1
CI: Install make on Cygwin
jon-turney Jul 29, 2024
2f49804
Revert "CI: skip LTO tests on cygwin"
jon-turney Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/cygwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -67,6 +69,7 @@ jobs:
libgtk3-devel
libxml2-devel
libxslt-devel
make
ninja
python2-devel
python3-devel
Expand Down
3 changes: 2 additions & 1 deletion test cases/common/230 external project/test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" }
]
Expand Down
2 changes: 0 additions & 2 deletions unittests/allplatformstests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')
Expand Down
Loading