Documented some return values in the case of errors.

[platform/upstream/libexif.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index deb1d1d..9f1cd6d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,11 @@ sudo: false
 language: c
 
 git:
-  depth: 1
+  # Set to 10 instead of 1 to avoid problems when the most recent commits have [skip ci]
+  depth: 10
 
 # Install autopoint on Ubuntu (needed for gettext)
+# This is ignored on bionic for some reason (see below).
 addons:
   apt:
     packages:
@@ -19,6 +21,7 @@ env:
     - CONFIG=normal
     - CONFIG=c90
     - CONFIG=stackprotect
+    - CONFIG=disable-nls
   global:
     - MAKEFLAGS='-j 2'
 
@@ -32,6 +35,22 @@ os:
 
 matrix:
   include:
+  - env: CONFIG=normal DIST=bionic
+    os: linux
+    dist: bionic
+    compiler: gcc
+  - env: CONFIG=normal DIST=bionic
+    os: linux
+    dist: bionic
+    compiler: clang
+  - env: CONFIG=normal DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: gcc
+  - env: CONFIG=normal DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: clang
   - env: CONFIG=clang6
     os: linux
     compiler: clang
@@ -43,17 +62,17 @@ matrix:
         packages:
           - autopoint
           - clang-6.0
-  - env: CONFIG=clang7
+  - env: CONFIG=clang8
     os: linux
     compiler: clang
     addons:
       apt:
         sources:
-          - llvm-toolchain-trusty-7
+          - llvm-toolchain-trusty-8
           - ubuntu-toolchain-r-test
         packages:
           - autopoint
-          - clang-7
+          - clang-8
   - env: CONFIG=gcc8
     os: linux
     compiler: gcc
@@ -87,11 +106,11 @@ matrix:
     addons:
       apt:
         sources:
-          - llvm-toolchain-trusty-7
+          - llvm-toolchain-trusty-8
           - ubuntu-toolchain-r-test
         packages:
           - autopoint
-          - clang-7
+          - clang-8
           - libtool
     # Required for -fsanitize=undefined
     # see https://github.com/travis-ci/travis-ci/issues/9033
@@ -109,6 +128,10 @@ matrix:
       directories:
         - $HOME/failmalloc
 
+before_install:
+  # The apt addons section is ignored on bionic for some reason
+  - if [ "$DIST" = "bionic" ] ; then sudo apt-get install -y autopoint; fi
+
 install:
   - |
     if [ "$CONFIG" = "coverage" ] ; then
@@ -141,14 +164,15 @@ script:
   - if [ "$CONFIG" = "normal" ] ; then CFLAGS='-Wall -Wextra -O3'; fi
   - if [ "$CONFIG" = "c90" ] ; then CFLAGS='-std=iso9899:1990 -D_XOPEN_SOURCE=500 -Wall -Wextra -O3'; fi
   - if [ "$CONFIG" = "stackprotect" ] ; then CFLAGS='-g -O0 -fstack-protector-all'; fi
+  - if [ "$CONFIG" = "disable-nls" ] ; then CFLAGS='-Wall -Wextra -O3'; CONFIGURE_OPTS='--disable-nls'; fi
   - if [ "$CONFIG" = "clang6" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=clang-6.0; fi
-  - if [ "$CONFIG" = "clang7" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=clang-7; fi
+  - if [ "$CONFIG" = "clang8" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=clang-8; fi
   - if [ "$CONFIG" = "gcc8" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=gcc-8; fi
   - if [ "$CONFIG" = "arm-cross" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=arm-linux-gnueabihf-gcc-4.8; CONFIGURE_OPTS='--host=arm-linux-gnueabihf'; fi
   - if [ "$CONFIG" = "musl" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=musl-gcc; CONFIGURE_OPTS='--disable-shared'; fi
-  - if [ "$CONFIG" = "sanitize" ] ; then CFLAGS='-g -Wall -Wextra -fsanitize=address -fsanitize=undefined -fsanitize-address-use-after-scope'; export CC=clang-7; export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1; fi
+  - if [ "$CONFIG" = "sanitize" ] ; then CFLAGS='-g -Wall -Wextra -fsanitize=address -fsanitize=undefined -fsanitize-address-use-after-scope'; export CC=clang-8; export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_leaks=1; fi
   - if [ "$CONFIG" = "coverage" ] ; then cd "$HOME"/libexif-testsuite; CFLAGS=--coverage; CONFIGURE_OPTS="LDFLAGS=--coverage --with-failmalloc=$HOME/failmalloc/lib" ; fi
-  - ./configure --prefix="${HOME}"/install --disable-dependency-tracking CFLAGS="$CFLAGS" $CONFIGURE_OPTS || { tail -300 config.log; false; }
+  - ./configure --prefix="$HOME"/install --disable-dependency-tracking CFLAGS="$CFLAGS" $CONFIGURE_OPTS || { tail -300 config.log; false; }
 
   - make V=1
   # Skip tests when cross compiling.