Travis update

Don’t install valgrind on macOS, as there’s no suitable python in brew.

Don’t install gettext from source on macOS, as brew’s is new enough.

Simplify some env var setting.

diff --git a/.travis.yml b/.travis.yml
index ef8c54a62f84c6bc9b315bca9ce83aff9610af9e..fd0f1a059f943a13a19ffd1421935d001f322ad6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,13 @@ matrix:
     - os: linux
       env:
         - COMPILER=g++-5
+        - PYTHON=/usr/bin/python-dbg
+        - DISTCHECK_CONFIGURE_FLAGS="PYTHON=/usr/bin/python-dbg"
     - os: osx
       osx_image: xcode9.2
+      env:
+        - LDFLAGS="-L/usr/local/opt/flex/lib -L/usr/local/opt/texinfo/lib"
+        - CPPFLAGS="-I/usr/local/opt/flex/include"
     - compiler: gcc
       env:
         - COMPILER=g++-6
@@ -40,19 +45,17 @@ matrix:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cython flex help2man texinfo valgrind ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/cython/bin:/usr/local/opt/flex/bin:/usr/local/opt/texinfo/bin:$PATH" ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LDFLAGS="-L/usr/local/opt/flex/lib -L/usr/local/opt/texinfo/lib" ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CPPFLAGS="-I/usr/local/opt/flex/include" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cython flex help2man texinfo ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/cython/bin:/usr/local/opt/flex/bin:/usr/local/opt/texinfo/bin:/usr/local/opt/gettext/bin:$PATH" ; fi
 
 # Need gettext 0.19, not in trusty; xenial doesn’t seem to work well yet on Travis
 install:
-  - wget ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.gz
-  - tar zxf gettext-0.19.8.1.tar.gz
-  - cd gettext-0.19.8.1 && ./configure --quiet --enable-silent-rules && sudo make install && cd ..
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.gz ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar zxf gettext-0.19.8.1.tar.gz ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd gettext-0.19.8.1 && ./configure --quiet --enable-silent-rules && sudo make install && cd .. ; fi
 
 script:
   - ./bootstrap
-  - ./configure PYTHON=/usr/bin/python-dbg --enable-silent-rules
+  - ./configure --enable-silent-rules
   - make
-  - make DISTCHECK_CONFIGURE_FLAGS="PYTHON=/usr/bin/python-dbg" distcheck
+  - make distcheck