[tor-commits] [tor/release-0.2.7] Try to fix address tests on FreeBSD

[nickm@xxxxxxxxxxxxxx]

commit 7d1fe7c9e7e6113bbbaec8c340da3ad7aa60429b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Feb 1 09:38:31 2016 -0500

    Try to fix address tests on FreeBSD
    
    In jails, there is not always a localhost.
    
    Bugfix not on any released Tor.
---
 src/test/test_address.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/test_address.c b/src/test/test_address.c
index 3e73c3e..4cf3a5a 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -269,8 +269,10 @@ test_address_get_if_addrs_ifaddrs(void *arg)
   results = get_interface_addresses_ifaddrs(LOG_ERR);
 
   tt_int_op(smartlist_len(results),>=,1);
+#ifndef __FreeBSD__
+  /* FreeBSD doesn't have a localhost in jails sometimes. */
   tt_assert(smartlist_contains_localhost_tor_addr(results));
-
+#endif
   done:
   SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t));
   smartlist_free(results);
@@ -484,8 +486,10 @@ test_address_get_if_addrs_ioctl(void *arg)
   tt_assert(result);
   tt_int_op(smartlist_len(result),>=,1);
 
+#ifndef __FreeBSD__
+  /* FreeBSD doesn't have a localhost in jails sometimes. */
   tt_assert(smartlist_contains_localhost_tor_addr(result));
-
+#endif
   done:
   if (result) {
     SMARTLIST_FOREACH(result, tor_addr_t *, t, tor_free(t));



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits