diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-14 09:14:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-14 09:14:07 -0400 |
| commit | 9615ad338f4d40934deee92ee5e5bad7dac52148 (patch) | |
| tree | 76f879fc72ce66dcaeb877c307b90f0d356e9127 | |
| parent | d2ab58c48dc351f7dc0828f3dc4159627218c75e (diff) | |
| download | tor-9615ad338f4d40934deee92ee5e5bad7dac52148.tar.gz tor-9615ad338f4d40934deee92ee5e5bad7dac52148.zip | |
Make the FreeBSD ersatz_socketpair test even more skippable.
(This is safe, since only windows actually -uses- erstaz_socketpair.)
| -rw-r--r-- | src/test/test_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 6bcd0b5109..a548b2a100 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5128,7 +5128,7 @@ test_util_socket(void *arg) tor_close_socket__real(fd4); } -#ifdef __FreeBSD__ +#if 0 static int is_there_a_localhost(int family) { @@ -5180,7 +5180,7 @@ test_util_socketpair(void *arg) * Otherwise, we risk exposing a socketpair on a routable IP address. (Some * BSD jails use a routable address for localhost. Fortunately, they have * the real AF_UNIX socketpair.) */ - if (ersatz && socketpair_result < 0 && !is_there_a_localhost(AF_INET)) { + if (ersatz && socketpair_result < 0) { /* In my testing, an IPv6-only FreeBSD jail without ::1 returned EINVAL. * Assume we're on a machine without 127.0.0.1 or ::1 and give up now. */ tt_skip(); |