From 226500cb83a3362451330219453ba54ab6f05b6b Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Fri, 1 Aug 2014 21:37:04 +1000
Subject: [PATCH] test: hack to make json.test executable

---
 Makefile.am                                | 1 +
 configure.ac                               | 4 +---
 test/.gitignore                            | 1 +
 test/Makefile.am                           | 2 +-
 test/json.test                             | 8 ++++++++
 test/{json.test.in => json.test.actual.in} | 0
 6 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100755 test/json.test
 rename test/{json.test.in => json.test.actual.in} (100%)

diff --git a/Makefile.am b/Makefile.am
index 037a6623..bc534c5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ UTIL_FILES   =		\
     image.hpp		\
     io.cpp		\
     io.hpp		\
+    io.ipp		\
     ip.cpp		\
     ip.hpp		\
     iterator.hpp	\
diff --git a/configure.ac b/configure.ac
index 65a34218..ad597030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,8 +258,6 @@ AC_CONFIG_FILES([
     Doxyfile
     Makefile
     test/Makefile
-    test/json.test
-], [
-    chmod a+x test/json.test
+    test/json.test.actual
 ])
 AC_OUTPUT
diff --git a/test/.gitignore b/test/.gitignore
index 0ad45e8d..3c5be1ae 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -5,6 +5,7 @@
 /float
 /hton
 /ip
+/json.test.actual
 /json/types
 /*.log
 /maths
diff --git a/test/Makefile.am b/test/Makefile.am
index 02cf2ad7..fb262922 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -37,4 +37,4 @@ endif
 TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
 TESTS = static.test json.test
 check_PROGRAMS = $(TEST_BIN)
-EXTRA_DIST = static.test json.test
+EXTRA_DIST = static.test json.test.actual json.test
diff --git a/test/json.test b/test/json.test
new file mode 100755
index 00000000..ef759f57
--- /dev/null
+++ b/test/json.test
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+## This is just an ugly hack to pass execution from a known exectuable
+## application to the test application. config.status won't preserve
+## executable bits on the new file, so we can't just use the generated test
+## application directly.
+
+/bin/sh `dirname $0`/json.test.actual "$@"
diff --git a/test/json.test.in b/test/json.test.actual.in
similarity index 100%
rename from test/json.test.in
rename to test/json.test.actual.in