sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.7' into release-0.2.7

This commit is contained in:
Nick Mathewson 2015-12-14 13:30:30 -05:00
parent e03312688e ff843ed39f
commit eaa69a2289
4 changed files with 16 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
changes/bug17818 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Isolate environment variables meant for tests from the rest of the
build system. Fixes bug 17818; bugfix on tor-0.2.7.3-rc.

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