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

Disable IPv6 for C# Ice/adapterDeactivation #3050

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Disable IPv6 for C# Ice/adapterDeactivation #3050

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92c6856
Disable IPv6 for C# Ice/adapterDeactivation
pepone Nov 4, 2024
515f4f8
Enable test
pepone Nov 4, 2024
93ad157
Review fixes
pepone Nov 5, 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
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
# Release builds
- os: macos-15
config: "release"
# https://github.com/zeroc-ice/ice/issues/2061
test_flags: "--rfilter=csharp/Ice/adapterDeactivation"
- os: ubuntu-24.04
config: "release"
- os: windows-2022
Expand All @@ -43,7 +41,7 @@ jobs:
config: "debug"
build_flags: "OPTIMIZE=no"
# https://github.com/zeroc-ice/ice/issues/2061
test_flags: "--swift-config=debug --rfilter=csharp/Ice/adapterDeactivation"
test_flags: "--swift-config=debug"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove comment above.

- os: ubuntu-24.04
config: "debug"
build_flags: "OPTIMIZE=no"
Expand Down
7 changes: 5 additions & 2 deletions scripts/tests/Ice/adapterDeactivation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
# Copyright (c) ZeroC, Inc. All rights reserved.
#

from Util import TestSuite
from Util import CSharpMapping, Darwin, TestSuite, platform, Mapping

# Disable IPv6 for macOS until https://github.com/dotnet/runtime/pull/108334 is merged in .NET 8
# See https://github.com/zeroc-ice/ice/issues/2061
ipv6 = not (isinstance(Mapping.getByPath(__name__), CSharpMapping) and isinstance(platform, Darwin))

TestSuite(__name__, multihost=False)
TestSuite(__name__, multihost=False, options={"ipv6": [ipv6]})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we set ipv6 to true, what happens? Do we still run the test with ipv4?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here IPv6 means the tests supports ipv6, this affects the combinations that are run when you use --all. With this the macOS run with --all would not include --ipv6 in the generated combinations.

Loading