tor

commit 59043665f8b69b2caa8978269426d544b484fc98
parent 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 31 Oct 2018 11:01:41 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

Diffstat:
A
changes/bug27948
 | 
6
++++++
M
src/test/bt_test.py
 | 
10
++++++----

2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/changes/bug27948 b/changes/bug27948
@@ -0,0 +1,6 @@
+  o Minor bugfixes (tests):
+    - Treat backtrace test failures as expected on BSD-derived systems
+      (NetBSD, OpenBSD, and macOS/Darwin) until we solve bug 17808.
+      (FreeBSD failures have been treated as expected since 18204 in 0.2.8.)
+      Fixes bug 27948; bugfix on 0.2.5.2-alpha.
+
diff --git a/src/test/bt_test.py b/src/test/bt_test.py
@@ -44,10 +44,12 @@ print("BAD")
 for l in LINES:
     print("{}".format(l), end="")
 
-if sys.platform.startswith('freebsd'):
-    # See bug #17808 if you know how to fix this.
-    print("Test failed; but FreeBSD is known to have backtrace problems.\n"
-          "Treating as 'SKIP'.")
+if (sys.platform.startswith('freebsd') or sys.platform.startswith('netbsd') or
+    sys.platform.startswith('openbsd') or sys.platform.startswith('darwin')):
+    # See bug #17808 if you know how to fix backtraces on BSD-derived systems
+    print("Test failed; but {} is known to have backtrace problems."
+          .format(sys.platform))
+    print("Treating as 'SKIP'.")
     sys.exit(77)
 
 sys.exit(1)