[tor-commits] [tor/master] Make the FreeBSD ersatz_socketpair test even more skippable.

[nickm at torproject.org]

commit 9615ad338f4d40934deee92ee5e5bad7dac52148
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 14 09:14:07 2016 -0400

    Make the FreeBSD ersatz_socketpair test even more skippable.
    
    (This is safe, since only windows actually -uses- erstaz_socketpair.)
---
 src/test/test_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 6bcd0b5..a548b2a 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();