torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.7'

Browse Source
This commit is contained in:
Nick Mathewson
2015-09-29 10:12:05 +02:00
parent 551dba3290 216a9f7aec
commit 3d8a045bd6
6 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/include.am
+2 -2
View File
@@ -123,9 +123,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@
export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov
export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov
else
export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor
export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor
endif
ORHEADERS = \
src/test/test_bt.sh
+1
View File
@@ -3,6 +3,7 @@
exitcode=0
"${builddir:-.}/src/test/test-bt-cl" backtraces || exit 77
"${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1
"${builddir:-.}/src/test/test-bt-cl" crash | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1
src/test/test_bt_cl.c
+10 -1
View File
@@ -84,15 +84,24 @@ main(int argc, char **argv)
if (argc < 2) {
puts("I take an argument. It should be \"assert\" or \"crash\" or "
"\"none\"");
"\"backtraces\" or \"none\"");
return 1;
}
#if !(defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION))
puts("Backtrace reporting is not supported on this platform");
return 77;
#endif
if (!strcmp(argv[1], "assert")) {
crashtype = 1;
} else if (!strcmp(argv[1], "crash")) {
crashtype = 0;
} else if (!strcmp(argv[1], "none")) {
crashtype = -1;
} else if (!strcmp(argv[1], "backtraces")) {
return 0;
} else {
puts("Argument should be \"assert\" or \"crash\" or \"none\"");
return 1;