diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 29 | ||||
| -rw-r--r-- | build-aux/.gitignore | 15 | ||||
| -rwxr-xr-x | build-aux/travis-build.sh | 17 |
4 files changed, 47 insertions, 15 deletions
@@ -12,7 +12,6 @@ Makefile Makefile.in /aclocal.m4 /autom4te.cache -/build-aux /compile /configure /config.* diff --git a/.travis.yml b/.travis.yml index e125715..47ce66d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ +os: linux language: cpp - dist: bionic addons: @@ -17,27 +17,28 @@ addons: - libunittest++-dev - hunspell-fr - libnuspell-dev + homebrew: + # Note: aspell should work on macOS, but has been removed because one of + # the tests fails; see https://github.com/Homebrew/homebrew-core/issues/4097 + packages: + - glib + - dbus-glib + - hspell + - hunspell + - libvoikko + - unittest-cpp + update: true env: global: - VERBOSE=1 # Get test logs in Travis logs -matrix: +jobs: include: - os: linux env: - - CONFIGURE_ARGS=("CFLAGS=\"-g3 -fsanitize=address -fsanitize=undefined\"" "LDFLAGS=\"-fsanitize=address -fsanitize=undefined\"") + - ASAN=yes - os: osx -before_install: - # Note: aspell should work on macOS, but has been removed from the next - # line because one of the tests fails; see - # https://github.com/Homebrew/homebrew-core/issues/40976 - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install dbus-glib hspell hunspell libvoikko unittest-cpp ; fi - script: - - ./bootstrap - - ./configure --enable-relocatable --with-zemberek=check "${CONFIGURE_ARGS[@]}" - - make - - make distcheck - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo locale-gen fr_FR.UTF-8; env LANG=fr_FR.UTF-8 make check ; fi + - ./build-aux/travis-build.sh diff --git a/build-aux/.gitignore b/build-aux/.gitignore new file mode 100644 index 0000000..9d4ab69 --- /dev/null +++ b/build-aux/.gitignore @@ -0,0 +1,15 @@ +/bootstrap.in +/compile +/config.guess +/config.sub +/depcomp +/extract-trace +/funclib.sh +/inline-source +/install-sh +/ltmain.sh +/mdate-sh +/missing +/options-parser +/test-driver +/texinfo.tex diff --git a/build-aux/travis-build.sh b/build-aux/travis-build.sh new file mode 100755 index 0000000..371326b --- /dev/null +++ b/build-aux/travis-build.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# Build on Travis +# Written by Reuben Thomas 2020. +# This file is in the public domain. + +set -e + +./bootstrap +CONFIGURE_ARGS=(--enable-relocatable --with-zemberek=check) +if [[ "$ASAN" == "yes" ]]; then + CONFIGURE_ARGS+=(CFLAGS="-g3 -fsanitize=address -fsanitize=undefined" LDFLAGS="-fsanitize=address -fsanitize=undefined") +fi +./configure --enable-silent-rules "${CONFIGURE_ARGS[@]}" +make +make distcheck + +if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo locale-gen fr_FR.UTF-8; env LANG=fr_FR.UTF-8 make check ; fi |