nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

build: fix the test runner for win32 targets

Browse Source
This commit is contained in:
Danny Robson 2016-04-27 17:16:13 +10:00
parent b814c83e21
commit e70f582784
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.am
View File

@ -395,8 +395,6 @@ TEST_BIN = \
test/introspection \ test/introspection \
test/ip \ test/ip \
test/json_types \ test/json_types \
test/memory/buffer/circular \
test/memory/buffer/paged \
test/memory/deleter \ test/memory/deleter \
test/maths \ test/maths \
test/matrix \ test/matrix \
@ -425,15 +423,27 @@ TEST_BIN = \
test/version \ test/version \
test/view 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 if PLATFORM_WIN32
test_hton_LDFLAGS = -lws2_32 test_hton_LDFLAGS = -lws2_32
endif endif
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh # ideally we'd use EXE_LOG_COMPILER, but automake doesn't easily use EXEEXT as
TESTS = $(top_builddir)/test/json-parse $(top_builddir)/test/json-schema $(TEST_BIN) # 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) 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 .PHONY: doc