|
@@ -2,7 +2,7 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
|
|
|
src/test/test_zero_length_keys.sh
|
|
|
|
|
|
if USEPYTHON
|
|
|
-TESTS += src/test/test_ntor.sh
|
|
|
+TESTS += src/test/test_ntor.sh src/test/test_bt.sh
|
|
|
endif
|
|
|
|
|
|
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@
|
|
|
src_test_test_ntor_cl_AM_CPPFLAGS = \
|
|
|
-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
|
|
|
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_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 += \
|
|
|
src/test/bt_test.py \
|
|
|
src/test/ntor_ref.py \
|