summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDov Grobgeld <dov.grobgeld@gmail.com>2017-11-15 22:06:37 +0100
committerGitHub <noreply@github.com>2017-11-15 22:06:37 +0100
commitac8a1aad8b5c9db2591ac0a9bf31ca92c64f854c (patch)
tree3ac765a5e9585599895f5e0cdd846154face21b4
parent9105ec53a073700d15038833b5be685e1afed5bc (diff)
parentc38d7ad70f63084708e5bcb7d68c00ffdf9811e9 (diff)
downloadfribidi-ac8a1aad8b5c9db2591ac0a9bf31ca92c64f854c.tar.gz
Merge pull request #27 from khaledhosny/ci
Setup Travis CI builds
-rw-r--r--.travis.yml21
-rw-r--r--fribidi-vs-unicode/Makefile.am11
-rwxr-xr-xfribidi-vs-unicode/run.tests20
3 files changed, 49 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..fca5c57
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,21 @@
+language: c
+
+sudo: false
+
+matrix:
+ include:
+ - os: linux
+ compiler: gcc
+ - os: linux
+ compiler: clang
+ - os: osx
+ compiler: clang
+
+install:
+ - ./bootstrap
+
+script:
+ - ./configure
+ - make
+ - make check
+# - make distcheck # broken currently
diff --git a/fribidi-vs-unicode/Makefile.am b/fribidi-vs-unicode/Makefile.am
index e24cc53..129b681 100644
--- a/fribidi-vs-unicode/Makefile.am
+++ b/fribidi-vs-unicode/Makefile.am
@@ -2,10 +2,15 @@
TESTS_ENVIRONMENT = \
srcdir=${srcdir}; export srcdir; \
top_builddir=${top_builddir}; export top_builddir; \
+ builddir=${builddir}; export builddir; \
EXEEXT=${EXEEXT}; export EXEEXT;
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT)
+TEST_EXTENSIONS = .txt
+
+TXT_LOG_COMPILER = sh $(srcdir)/run.tests
+
AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
@@ -16,9 +21,9 @@ LDADD = $(top_builddir)/lib/libfribidi.la $(GLIB_LIBS)
if FRIBIDI_USE_GLIB
check_PROGRAMS = test test-character
bin_PROGRAMS = $(check_PROGRAMS)
-#TESTS = \
-# test \
-# test-character
+TESTS = \
+ BidiTest.txt \
+ BidiCharacterTest.txt
endif
test_SOURCES = test.c
diff --git a/fribidi-vs-unicode/run.tests b/fribidi-vs-unicode/run.tests
new file mode 100755
index 0000000..13dcfa3
--- /dev/null
+++ b/fribidi-vs-unicode/run.tests
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+test "x$srcdir" = x && srcdir=.
+test "x$builddir" = x && builddir=.
+test "x$top_builddir" = x && top_builddir=../..
+
+test_bidi="$builddir/test$EXEEXT"
+test_bidi_character="$builddir/test-character$EXEEXT"
+
+if test $# = 0; then
+ set /dev/stdin
+fi
+
+for f in "$@"; do
+ if test "x$(basename $f)" = "xBidiTest.txt"; then
+ $test_bidi $f || exit 1
+ else
+ $test_bidi_character $f || exit 1
+ fi
+done