summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDov Grobgeld <dov.grobgeld@gmail.com>2017-11-20 21:37:32 +0100
committerGitHub <noreply@github.com>2017-11-20 21:37:32 +0100
commite2369f1c55f729dc5e527f430ec27e225f9d317f (patch)
treeb7d1339090959441d56593efa2470155d5b7230b
parentac8a1aad8b5c9db2591ac0a9bf31ca92c64f854c (diff)
parent20d5f9838a2aa74abfad6a814e74249800e93ab6 (diff)
downloadfribidi-e2369f1c55f729dc5e527f430ec27e225f9d317f.tar.gz
Merge pull request #31 from khaledhosny/dist-check
Fix make distcheck
-rw-r--r--.travis.yml4
-rw-r--r--fribidi-vs-unicode/Makefile.am12
2 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index fca5c57..3a3da2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,5 +17,5 @@ install:
script:
- ./configure
- make
- - make check
-# - make distcheck # broken currently
+ - make check || cat */test-suite.log && false
+ - make distcheck || cat */test-suite.log && false
diff --git a/fribidi-vs-unicode/Makefile.am b/fribidi-vs-unicode/Makefile.am
index 129b681..2c9304c 100644
--- a/fribidi-vs-unicode/Makefile.am
+++ b/fribidi-vs-unicode/Makefile.am
@@ -8,6 +8,9 @@ TESTS_ENVIRONMENT = \
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT)
TEST_EXTENSIONS = .txt
+TEST_DATAS = \
+ BidiTest.txt \
+ BidiCharacterTest.txt
TXT_LOG_COMPILER = sh $(srcdir)/run.tests
@@ -20,13 +23,14 @@ LDADD = $(top_builddir)/lib/libfribidi.la $(GLIB_LIBS)
if FRIBIDI_USE_GLIB
check_PROGRAMS = test test-character
-bin_PROGRAMS = $(check_PROGRAMS)
-TESTS = \
- BidiTest.txt \
- BidiCharacterTest.txt
+TESTS = $(TEST_DATAS)
endif
test_SOURCES = test.c
test_character_SOURCES = test-character.c
+EXTRA_DIST = \
+ run.tests \
+ $(TEST_DATAS)
+
-include $(top_srcdir)/git.mk