diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-31 11:01:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-31 11:01:41 -0400 |
| commit | e160fc57f10da547982475b2d7dcabd594252e48 (patch) | |
| tree | 417d7895e3de9cc828e79a73307dd4939d691612 | |
| parent | 9d9b8a5a06dd25a91f41c49398b18fc9f5064656 (diff) | |
| parent | 158db532eb6423a87434599ff0a0c5fb46208e69 (diff) | |
| download | tor-e160fc57f10da547982475b2d7dcabd594252e48.tar.gz tor-e160fc57f10da547982475b2d7dcabd594252e48.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | changes/bug27948 | 6 | ||||
| -rwxr-xr-x | src/test/bt_test.py | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/changes/bug27948 b/changes/bug27948 new file mode 100644 index 0000000000..fea16f3d0f --- /dev/null +++ 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 index 4cb3326042..20d5c93346 100755 --- 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) |