aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-14 13:21:16 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-14 13:21:16 -0500
commit39b2f2d35e1c6638332846ed9df75f77ea114df5 (patch)
treeec6af99dd7e4d16f6ae29fd6249466304abc5fb8 /src/test
parentf3ed5ec0cac4719e249e629760756314d7cfecba (diff)
parentff843ed39f78ac9762c80261ade580d31fb3a9a9 (diff)
downloadtor-39b2f2d35e1c6638332846ed9df75f77ea114df5.tar.gz
tor-39b2f2d35e1c6638332846ed9df75f77ea114df5.zip
Merge branch 'maint-0.2.7'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/include.am11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/test/include.am b/src/test/include.am
index d0a819fb7f..2df124fb65 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -1,8 +1,9 @@
-
-export PYTHON=@PYTHON@
-export SHELL=@SHELL@
-export abs_top_srcdir=@abs_top_srcdir@
-export builddir=@builddir@
+AM_TESTS_ENVIRONMENT = \
+ export PYTHON="$(PYTHON)"; \
+ export SHELL="$(SHELL)"; \
+ export abs_top_srcdir="$(abs_top_srcdir)"; \
+ export builddir="$(builddir)"; \
+ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)";
TESTSCRIPTS = src/test/test_zero_length_keys.sh