summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-14 15:45:54 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-14 15:45:54 -0500
commit9a179ff75159476ef475a28bae2615cd7e2e4df7 (patch)
tree84215bc8e4d8e57edfff45dd7395a9a7bae25ea8 /src/test/include.am
parent39b2f2d35e1c6638332846ed9df75f77ea114df5 (diff)
parent254d63dabe0b89f83c4df0edb1daf719cc5d4ab7 (diff)
downloadtor-9a179ff75159476ef475a28bae2615cd7e2e4df7.tar.gz
tor-9a179ff75159476ef475a28bae2615cd7e2e4df7.zip
Merge branch 'maint-0.2.7'
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 2df124fb65..051f0e77d6 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -1,4 +1,7 @@
-AM_TESTS_ENVIRONMENT = \
+# When the day comes that Tor requires Automake >= 1.12 change
+# TESTS_ENVIRONMENT to AM_TESTS_ENVIRONMENT because the former is reserved for
+# users while the later is reserved for developers.
+TESTS_ENVIRONMENT = \
export PYTHON="$(PYTHON)"; \
export SHELL="$(SHELL)"; \
export abs_top_srcdir="$(abs_top_srcdir)"; \