mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 20:23:03 +02:00
Code

Only setup environment variables for tests

Browse Source 
Using the AM_TESTS_ENVIRONMENT variable ensures the environment
variables are only set during test execution and not during the
compilation phase.
This commit is contained in:
cypherpunks 2015-09-25 16:39:11 +02:00 committed by Nick Mathewson
parent aa40f28962
commit 670affa792
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -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

3
src/or/include.am
View File

@ -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 = \

11
src/test/include.am
View File

@ -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