tor

commit 96fade0a7d258a37dab0ced996a180a2722244c7
parent 7b3efc386f472b12b1dba8329ee49eaf3c0782af
Author: George Kadianakis <desnacked@riseup.net>
Date:   Wed, 12 Jun 2019 13:01:53 +0300

Merge branch 'tor-github/pr/1088'

Diffstat:
A
changes/bug30804
 | 
4
++++
M
src/test/test_util.c
 | 
5
+++++

2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changes/bug30804 b/changes/bug30804
@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+    - Teach the util/socketpair_ersatz test to work correctly when we
+      have no network stack configured. Fixes bug 30804; bugfix on
+      0.2.5.1-alpha.
diff --git a/src/test/test_util.c b/src/test/test_util.c
@@ -5399,6 +5399,11 @@ test_util_socketpair(void *arg)
     tt_skip();
   }
 #endif /* defined(__FreeBSD__) */
+  if (ersatz && socketpair_result == -ENETUNREACH) {
+    /* We can also fail with -ENETUNREACH if we have no network stack at
+     * all. */
+    tt_skip();
+  }
   tt_int_op(0, OP_EQ, socketpair_result);
 
   tt_assert(SOCKET_OK(fds[0]));