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

Avoid use of IPv6 in tests if not supported (e.g. on Travis). #1224

Merged
merged 1 commit into from
Oct 7, 2018
Merged

Avoid use of IPv6 in tests if not supported (e.g. on Travis). #1224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion auto_tests/network_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ START_TEST(test_addr_resolv_localhost)
#endif

const char localhost[] = "localhost";
int localhost_split = 0;

IP ip;
ip_init(&ip, 0); // ipv6enabled = 0
Expand All @@ -46,6 +45,10 @@ START_TEST(test_addr_resolv_localhost)
ip_init(&ip, 1); // ipv6enabled = 1
res = addr_resolve(localhost, &ip, nullptr);

#if USE_IPV6

int localhost_split = 0;

if (!(res & TOX_ADDR_RESOLVE_INET6)) {
res = addr_resolve("ip6-localhost", &ip, nullptr);
localhost_split = 1;
Expand All @@ -67,6 +70,8 @@ START_TEST(test_addr_resolv_localhost)
return;
}

#endif

ip_init(&ip, 1); // ipv6enabled = 1
ip.family = net_family_unspec;
IP extra;
Expand Down