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.

diff --git a/Makefile.am b/Makefile.am
index c226113cc8725035215bfd018fea42c3a742d7b6..beea69d95e6b7c6c66a0ce02660a55dc294e173a 100644 (file)
--- 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 d0e955f495fb24cf9ecf166f51c7a12065424ac4..a3ac49c5d6a986d734ec782497436d61e168a5d9 100644 (file)
--- 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 a37fe23db887aac43e78fd9c362c43b4dfbc225d..a24c5bb1b47b2d5b9a3165980e33a62469358785 100644 (file)
--- 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