[tor-commits] [tor/master] Only setup environment variables for tests

[nickm at torproject.org]

commit 670affa792e7613f6e6b5d960805418359ac0ec7
Author: cypherpunks <cypherpunks at torproject.org>
Date:   Fri Sep 25 16:39:11 2015 +0200

    Only setup environment variables for tests
    
    Using the AM_TESTS_ENVIRONMENT variable ensures the environment
    variables are only set during test execution and not during the
    compilation phase.
---
 Makefile.am         |    7 +++++++
 src/or/include.am   |    3 ---
 src/test/include.am |   11 ++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c226113..beea69d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,13 @@ bin_SCRIPTS=
 AM_CPPFLAGS=
 AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@
 SHELL = @SHELL@
+
+if COVERAGE_ENABLED
+TESTING_TOR_BINARY="$(top_builddir)/src/or/tor-cov"
+else
+TESTING_TOR_BINARY="$(top_builddir)/src/or/tor"
+endif
+
 include src/include.am
 include doc/include.am
 include contrib/include.am
diff --git a/src/or/include.am b/src/or/include.am
index d0e955f..a3ac49c 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -123,9 +123,6 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
 	src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
 	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@
-export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov
-else
-export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor
 endif
 
 ORHEADERS = \
diff --git a/src/test/include.am b/src/test/include.am
index a37fe23..a24c5bb 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