diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2015-06-14 11:19:51 +0100 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2015-06-21 21:32:08 +0200 |
| commit | e7afa126c0c8154e05f335ef82b39d9b74520de5 (patch) | |
| tree | 2d58fc9276d3c7e05b85c2b389e953be8e93f6ee | |
| parent | 7f8835d9040ab4823b0423dc1c8df4bd6cc39ce0 (diff) | |
| download | gupnp-dlna-e7afa126c0c8154e05f335ef82b39d9b74520de5.tar.gz | |
build: Fix unit tests to use new automake parallel test harness
Otherwise you get errors like the following with automake 1.14:
/bin/bash: /bin/bash: cannot execute binary file
Makefile:853: recipe for target 'sets.log' failed
https://bugzilla.gnome.org/show_bug.cgi?id=750929
| -rw-r--r-- | tests/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6c9c030..367a414 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,10 @@ -TESTS_ENVIRONMENT = \ - G_SLICE=debug-blocks \ +AM_TESTS_ENVIRONMENT = \ + export G_SLICE=debug-blocks \ LD_LIBRARY_PATH=$(top_builddir)/libgupnp-dlna/.libs:$(LD_LIBRARY_PATH) \ - MEDIA_DIR="$(srcdir)/media" FILE_LIST="$(srcdir)/media/media-list.txt" ${SHELL} + MEDIA_DIR="$(srcdir)/media" FILE_LIST="$(srcdir)/media/media-list.txt"; TESTS = $(check_PROGRAMS) test-discoverer.sh +check_SCRIPTS = test-discoverer.sh check_PROGRAMS = sets sets_SOURCES = \ |