nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Integrate backtrace test into the automake test suite.

Browse Source 
For this to work bt_test.py now returns an exit code indicating success or
failure. Additionally, check-local and its specific dependencies are now
obsolete so they are removed.
This commit is contained in:
cypherpunks 2015-03-05 11:05:17 +01:00 committed by Nick Mathewson
parent c535494238
commit 0e89abfa73
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -176,6 +176,7 @@ cscope.*
/src/test/test_workqueue.exe /src/test/test_workqueue.exe
/src/test/test_zero_length_keys.sh /src/test/test_zero_length_keys.sh
/src/test/test_ntor.sh /src/test/test_ntor.sh
/src/test/test_bt.sh
# /src/tools/ # /src/tools/
/src/tools/tor-checkkey /src/tools/tor-checkkey

1
configure.ac
View File

@ -1664,6 +1664,7 @@ AC_CONFIG_FILES([
scripts/maint/updateVersions.pl scripts/maint/updateVersions.pl
src/test/test_zero_length_keys.sh src/test/test_zero_length_keys.sh
src/test/test_ntor.sh src/test/test_ntor.sh
src/test/test_bt.sh
]) ])
if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then

4
src/test/bt_test.py
View File

@ -36,7 +36,7 @@ LINES = sys.stdin.readlines()
for I in range(len(LINES)): for I in range(len(LINES)):
if matches(LINES[I:], FUNCNAMES): if matches(LINES[I:], FUNCNAMES):
print("OK") print("OK")
break sys.exit(0)
else: else:
print("BAD") print("BAD")
sys.exit(1)

16
src/test/include.am
View File

@ -2,7 +2,7 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
src/test/test_zero_length_keys.sh src/test/test_zero_length_keys.sh
if USEPYTHON if USEPYTHON
TESTS += src/test/test_ntor.sh TESTS += src/test/test_ntor.sh src/test/test_bt.sh
endif endif
TEST_EXTENSIONS = .sh TEST_EXTENSIONS = .sh
@ -154,13 +154,6 @@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
src_test_test_ntor_cl_AM_CPPFLAGS = \ src_test_test_ntor_cl_AM_CPPFLAGS = \
-I"$(top_srcdir)/src/or" -I"$(top_srcdir)/src/or"
NTOR_TEST_DEPS=src/test/test-ntor-cl
if COVERAGE_ENABLED
CMDLINE_TEST_TOR = $(top_builddir)/src/or/tor-cov
else
CMDLINE_TEST_TOR = $(top_builddir)/src/or/tor
endif
noinst_PROGRAMS += src/test/test-bt-cl noinst_PROGRAMS += src/test/test-bt-cl
src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c
@ -170,13 +163,6 @@ src_test_test_bt_cl_LDADD = src/common/libor-testing.a \
src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR)
if USEPYTHON
$(top_builddir)/src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
$(top_builddir)/src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
endif
EXTRA_DIST += \ EXTRA_DIST += \
src/test/bt_test.py \ src/test/bt_test.py \
src/test/ntor_ref.py \ src/test/ntor_ref.py \

9
src/test/test_bt.sh.in Normal file
View File

@ -0,0 +1,9 @@
#!/bin/sh
# Test backtrace functionality.
exitcode=0
@builddir@/src/test/test-bt-cl assert | @PYTHON@ @abs_top_srcdir@/src/test/bt_test.py || exitcode=1
@builddir@/src/test/test-bt-cl crash | @PYTHON@ @abs_top_srcdir@/src/test/bt_test.py || exitcode=1
exit ${exitcode}