diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-24 15:07:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-24 15:07:39 -0400 |
| commit | eb2188168e2eca96692ec5f60f298f7bc287e990 (patch) | |
| tree | 7c5bc481e124d80d6a08d7342642013726e8aa49 /src/test/include.am | |
| parent | 3f52a33739944c53ecb2fd516a7cdab9fc14b1ba (diff) | |
| download | tor-eb2188168e2eca96692ec5f60f298f7bc287e990.tar.gz tor-eb2188168e2eca96692ec5f60f298f7bc287e990.zip | |
Stop trying to generate test scripts via autoconf substitution.
Use environment variables instead. This repairs 'make distcheck',
which was running into trouble when it tried to chmod the generated
scripts.
Fixes 17148.
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/include.am b/src/test/include.am index f7c0204832..0b64299f42 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,4 +1,9 @@ +export PYTHON=@PYTHON@ +export SHELL=@SHELL@ +export abs_top_srcdir +export builddir + TESTSCRIPTS = src/test/test_zero_length_keys.sh if USEPYTHON @@ -16,18 +21,11 @@ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min TEST_CHUTNEY_FLAVORS_MIXED = mixed ### This is a lovely feature, but it requires automake >= 1.12, and Tor -### doesn't require that yet. Below is a kludge to work around. +### doesn't require that yet. ### # TEST_EXTENSIONS = .sh # SH_LOG_COMPILER = $(SHELL) -check-am: set-test-permissions - -.PHONY: set-test-permissions -set-test-permissions: $(TESTSCRIPTS) - $(AM_V_at)chmod u+x $(TESTSCRIPTS) - - noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED noinst_PROGRAMS+= \ @@ -194,4 +192,6 @@ EXTRA_DIST += \ src/test/ntor_ref.py \ src/test/slownacl_curve25519.py \ src/test/zero_length_keys.sh \ - src/test/test_keygen.sh + src/test/test_keygen.sh \ + src/test/test_zero_length_keys.sh \ + src/test/test_ntor.sh src/test/test_bt.sh |