commit d579d751dc03c4a2f8dd31b6928a88bdc10d49a0 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 24 08:41:53 2015 -0400 Kludge include.am to work with automake <1.12 The SH_LOG_COMPILER feature doesn't work with older automakes, and those are still in use in many environments we want to support development on, like Debian Stable. Instead, use autoconf substitution to fill out the shebang lines on the shell scripts, and an intermediate make target to make them executable. This is a bugfix on the patches for #15344. Bug not in any released tor. --- src/test/include.am | 22 +++++++++++++++++----- src/test/test_bt.sh.in | 2 +- src/test/test_ntor.sh.in | 2 +- src/test/test_zero_length_keys.sh.in | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index 3c9eed8..c693544 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,12 +1,24 @@ -TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ - src/test/test_zero_length_keys.sh + +TESTSCRIPTS = src/test/test_zero_length_keys.sh if USEPYTHON -TESTS += src/test/test_ntor.sh src/test/test_bt.sh +TESTSCRIPTS += src/test/test_ntor.sh src/test/test_bt.sh endif -TEST_EXTENSIONS = .sh -SH_LOG_COMPILER = $(SHELL) +TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ + $(TESTSCRIPTS) + +### 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. +### +# TEST_EXTENSIONS = .sh +# SH_LOG_COMPILER = $(SHELL) + +check-am: set-test-permissions + +set-test-permissions: + chmod 755 $(TESTSCRIPTS) + noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED diff --git a/src/test/test_bt.sh.in b/src/test/test_bt.sh.in index d249875..ca8be96 100755 --- a/src/test/test_bt.sh.in +++ b/src/test/test_bt.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@SHELL@ # Test backtrace functionality. exitcode=0 diff --git a/src/test/test_ntor.sh.in b/src/test/test_ntor.sh.in index 5fea8ce..be35384 100755 --- a/src/test/test_ntor.sh.in +++ b/src/test/test_ntor.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@SHELL@ # Validate Tor's ntor implementation. exitcode=0 diff --git a/src/test/test_zero_length_keys.sh.in b/src/test/test_zero_length_keys.sh.in index 47467ba..d1492d5 100755 --- a/src/test/test_zero_length_keys.sh.in +++ b/src/test/test_zero_length_keys.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@SHELL@ # Check that tor regenerates keys when key files are zero-length exitcode=0