From e70f58278435479f6df3ca4f053e1b5f88489328 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Wed, 27 Apr 2016 17:16:13 +1000
Subject: [PATCH] build: fix the test runner for win32 targets

---
 Makefile.am | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index efe7b54c..24941fd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -395,8 +395,6 @@ TEST_BIN = 			\
     test/introspection		\
     test/ip 			\
     test/json_types		\
-    test/memory/buffer/circular \
-    test/memory/buffer/paged	\
     test/memory/deleter		\
     test/maths			\
     test/matrix			\
@@ -425,15 +423,27 @@ TEST_BIN = 			\
     test/version		\
     test/view
 
+if !PLATFORM_WIN32
+TEST_BIN += test/memory/buffer/paged test/memory/buffer/circular
+endif
+
+
+TEST_EXTENSIONS  = .exe #.py .sh .exe
 
 if PLATFORM_WIN32
 test_hton_LDFLAGS = -lws2_32
 endif
 
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
-TESTS = $(top_builddir)/test/json-parse $(top_builddir)/test/json-schema $(TEST_BIN)
+# ideally we'd use EXE_LOG_COMPILER, but automake doesn't easily use EXEEXT as
+# part of the log targets so it's just easier to run everything through the
+# wine filter.
+LOG_COMPILER = ${top_srcdir}/build-aux/wine-crlf.sh
+
+LOG_DRIVER = env RS='\r\n' AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
+
+TESTS = $(TEST_BIN) test/json-parse.sh test/json-schema.py
 check_PROGRAMS = $(TEST_BIN)
-EXTRA_DIST += test/json test/json-parse test/json-schema
+EXTRA_DIST += test/json test/json-parse.sh test/json-schema.py
 
 .PHONY: doc