From d579d751dc03c4a2f8dd31b6928a88bdc10d49a0 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 24 Apr 2015 08:41:53 -0400
Subject: [PATCH] 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 3c9eed886f..c693544bd3 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 d2498751cb..ca8be965d4 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 5fea8ce31a..be35384ddf 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 47467baa44..d1492d5e20 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