summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/test/include.am b/src/test/include.am
index a2be1ff2f1..5a5f63a341 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -1,4 +1,9 @@
+export PYTHON=@PYTHON@
+export SHELL=@SHELL@
+export abs_top_srcdir=@abs_top_srcdir@
+export builddir=@builddir@
+
TESTSCRIPTS = src/test/test_zero_length_keys.sh
if USEPYTHON
@@ -16,18 +21,11 @@ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min
TEST_CHUTNEY_FLAVORS_MIXED = mixed
### This is a lovely feature, but it requires automake >= 1.12, and Tor
-### doesn't require that yet. Below is a kludge to work around.
+### doesn't require that yet.
###
# TEST_EXTENSIONS = .sh
# SH_LOG_COMPILER = $(SHELL)
-check-am: set-test-permissions
-
-.PHONY: set-test-permissions
-set-test-permissions: $(TESTSCRIPTS)
- $(AM_V_at)chmod u+x $(TESTSCRIPTS)
-
-
noinst_PROGRAMS+= src/test/bench
if UNITTESTS_ENABLED
noinst_PROGRAMS+= \
@@ -64,6 +62,7 @@ src_test_test_SOURCES = \
src/test/test_checkdir.c \
src/test/test_circuitlist.c \
src/test/test_circuitmux.c \
+ src/test/test_compat_libevent.c \
src/test/test_config.c \
src/test/test_containers.c \
src/test/test_controller.c \
@@ -98,6 +97,7 @@ src_test_test_SOURCES = \
src/test/test_threads.c \
src/test/test_tortls.c \
src/test/test_util.c \
+ src/test/test_util_format.c \
src/test/test_helpers.c \
src/test/test_dns.c \
src/test/testing_common.c \
@@ -165,6 +165,7 @@ src_test_test_workqueue_LDADD = src/or/libtor-testing.a \
noinst_HEADERS+= \
src/test/fakechans.h \
+ src/test/log_test_helpers.h \
src/test/test.h \
src/test/test_helpers.h \
src/test/test_descriptors.inc \
@@ -196,4 +197,7 @@ EXTRA_DIST += \
src/test/ntor_ref.py \
src/test/slownacl_curve25519.py \
src/test/zero_length_keys.sh \
- src/test/test_keygen.sh
+ src/test/test_keygen.sh \
+ src/test/test_zero_length_keys.sh \
+ src/test/test_ntor.sh src/test/test_bt.sh \
+ src/test/test-network.sh