From: Darafei Praliaskouski <me@komzpa.net>
Date: Fri, 12 Jan 2018 10:29:34 +0000 (+0000)
Subject: [travis] fix RUNTESTFLAGS to hold --verbose even when there is --dumprestore specified
X-Git-Tag: 2.5.0alpha~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b198fd79b82dd4db76d48b5af13b5dfc57c2681;p=postgis

[travis] fix RUNTESTFLAGS to hold --verbose even when there is --dumprestore specified

Closes https://github.com/postgis/postgis/pull/187


git-svn-id: http://svn.osgeo.org/postgis/trunk@16268 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/.travis.yml b/.travis.yml
index 1dadf3c3c..3e186ded4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 env:
-  global:
-    - RUNTESTFLAGS=-v
   matrix:
     - CFLAGS="-g -Og" MATRIX_EVAL="touch check-no-trailing-blanks"
     - CFLAGS="-g -O2 -fstack-protector -Wformat -Werror=format-security" LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro"
@@ -17,6 +15,7 @@ before_install:
   - eval "${MATRIX_EVAL}"
   - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload"
   - curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.3.tar.gz | sudo tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=/usr/local
+  - curl -sSfL https://raw.githubusercontent.com/mapbox/logbt/30c554dd37b6c96c23fc424f75910fc6d6696f00/bin/logbt | sudo tee /usr/local/bin/logbt > /dev/null
   - sudo logbt --setup
   - sudo service postgresql stop 9.6
   - sudo chown -hRL --from=postgres travis:travis /etc /var /tmp
@@ -58,11 +57,11 @@ script:
   - ./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $CONFIGURE_FLAGS || cat config.log
   - make -j
   - chmod 755 /home/travis
-  - logbt -- make check
-  - logbt -- make check RUNTESTFLAGS='--dumprestore'
+  - logbt -- make check "RUNTESTFLAGS=--verbose"
+  - logbt -- make check "RUNTESTFLAGS='--dumprestore --verbose'"
   - sudo make install
-  - logbt -- make installcheck
-  - logbt -- make installcheck RUNTESTFLAGS='--dumprestore'
+  - logbt -- make installcheck "RUNTESTFLAGS=--verbose"
+  - logbt -- make installcheck "RUNTESTFLAGS=--dumprestore --verbose"
 
 notifications:
   email: false