Skip to content
Snippets Groups Projects
Commit 670affa7 authored by cypherpunks's avatar cypherpunks Committed by Nick Mathewson
Browse files

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.
parent aa40f289
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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 = \
......
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment