diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-14 13:21:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-14 13:21:16 -0500 |
| commit | 39b2f2d35e1c6638332846ed9df75f77ea114df5 (patch) | |
| tree | ec6af99dd7e4d16f6ae29fd6249466304abc5fb8 /src | |
| parent | f3ed5ec0cac4719e249e629760756314d7cfecba (diff) | |
| parent | ff843ed39f78ac9762c80261ade580d31fb3a9a9 (diff) | |
| download | tor-39b2f2d35e1c6638332846ed9df75f77ea114df5.tar.gz tor-39b2f2d35e1c6638332846ed9df75f77ea114df5.zip | |
Merge branch 'maint-0.2.7'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/include.am | 3 | ||||
| -rw-r--r-- | src/test/include.am | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/or/include.am b/src/or/include.am index 264c4ae802..1180239c89 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -124,9 +124,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 d0a819fb7f..2df124fb65 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 |