diff --git a/.gitignore b/.gitignore index dea2819..90c3ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,6 @@ stamp-* *-stamp doc/toilet.1 src/toilet +test/*.log +test/*.trs tools/caca2tlf diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..774b24d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +sudo: false +language: c +env: VERBOSE=1 + +addons: + apt: + packages: + - build-essential + - pkg-config + - libcaca-dev + - zlib1g-dev + +before_install: + - .travis/before_install.sh + - ./bootstrap + +os: + - linux + - osx + +compiler: + - gcc + - clang + diff --git a/.travis/before_install.sh b/.travis/before_install.sh new file mode 100755 index 0000000..bf29023 --- /dev/null +++ b/.travis/before_install.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if brew --version 2>/dev/null 2>&1; then + brew install libcaca +fi + diff --git a/Makefile.am b/Makefile.am index 60de2e8..2f1d5d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,9 @@ update-changelog: FORCE && test -d .git \ && git log --stat | awk 'function flush() { if (m != "") { print "Commit: " v "\nAuthor: " a m } m=""; v="UNSUBMITTED" } { if ($$1 == "commit") flush(); else if ($$1 == "Author:") { a = $$2 } else if ($$1 == "git-svn-id:") { split($$2,tmp,"@"); v=tmp[2] } else if ($$_ != " ") { m=m "\n" $$_ } } END { flush() }' > ChangeLog +# Travis CI uses “make test” instead of “make check” +test: check + echo-dirs: ; echo src tools FORCE: