[travis] enable coverage reports and caching

Closes https://github.com/postgis/postgis/pull/158
Closes #3953

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

diff --git a/.travis.yml b/.travis.yml
index 9993f5a01cad5f5af1a05fba1c3b02768142e4a3..dccfde79dbb4d5a500d5ff0123a0f232741cc9b4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,59 +1,67 @@
 env:
   global:
     - RUNTESTFLAGS=-v
-    - CFLAGS="-O3 -fno-omit-frame-pointer -Werror"
+  matrix:
+    - CFLAGS="-O3 -march=native -mtune=native"
+    - CFLAGS="-O3 -march=native -mtune=native -fno-omit-frame-pointer -Werror"
+    - CFLAGS="-O0 --coverage -fprofile-arcs -ftest-coverage" LDFLAGS="--coverage -fprofile-arcs -ftest-coverage"
 
 addons:
   postgresql: "9.6"
   apt:
     packages:
-      - postgresql-server-dev-9.6
-      - libxml2-utils
-      - libcunit1-dev
-      - xsltproc
-      - docbook-xsl
-      - docbook-mathml
-      - dblatex
-      - libgeos-dev
-      - libjson0-dev
-      - libprotobuf-c0-dev
-      - libgdal-dev
       - eatmydata
 
 before_install:
-  - sudo eatmydata add-apt-repository --yes ppa:ubuntugis/ppa
-  - sudo eatmydata add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable
-  - sudo eatmydata apt-get update -qq
-  - sudo eatmydata apt-get install -y --no-install-recommends --no-install-suggests libsfcgal1 libsfcgal-dev
-  - wget http://download.osgeo.org/proj/proj-4.9.2.tar.gz
-  - tar zxvf proj-4.9.2.tar.gz
+  - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload"
+  - sudo add-apt-repository --yes ppa:ubuntugis/ppa
+  - sudo add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable
+  - sudo apt-get update -qq
+  - mkdir -p /home/travis/deb && touch /home/travis/deb/__ && sudo cp -n /home/travis/deb/* /var/cache/apt/archives || true
+  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests libsfcgal1 libsfcgal-dev postgresql-server-dev-9.6 libxml2-utils libcunit1-dev xsltproc docbook-xsl docbook-mathml dblatex libgeos-dev libjson0-dev libprotobuf-c0-dev libgdal-dev
+  - sudo sh -c "echo deb http://archive.ubuntu.com/ubuntu/ artful main restricted universe multiverse >> /etc/apt/sources.list"
+  - sudo apt-get update -qq
+  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests binutils
+  - cp -n /var/cache/apt/archives/* /home/travis/deb || true
+  - ls -la /home/travis/deb/
+  - cd /home/travis/proj
+  - test -f proj-4.9.2.tar.gz || wget -c http://download.osgeo.org/proj/proj-4.9.2.tar.gz
+  - test -d proj-4.9.2 || tar zxvf proj-4.9.2.tar.gz
   - cd proj-4.9.2
-  - CFLAGS="-O3" ./configure --prefix=/usr
-  - CFLAGS="-O3" eatmydata make -j
+  - CFLAGS="-O3" LDFLAGS="" ./configure --prefix=/usr || cat config.log
+  - CFLAGS="-O3" LDFLAGS="" make -j
   - sudo make install
-  - cd ..
-  - rm -rf proj-4.9.2
-  - rm proj-4.9.2.tar.gz
+  - cd /home/travis/build/postgis/postgis/
   - sudo ldconfig
   - ./autogen.sh
 
+after_failure:
+  - sudo head -n1000 /var/log/postgresql/postgresql-9.6-main.log 
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
 language: c
 
 compiler: gcc
 
 dist: trusty
 
-cache: ccache
+cache: 
+  ccache: true
+  directories:
+    - /home/travis/proj
+    - /home/travis/deb
 
 script:
-  - ./configure
-  - eatmydata make -j
+  - ./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" || cat config.log
+  - make -j
   - chmod 755 /home/travis
-  - eatmydata make check
-  - eatmydata make check RUNTESTFLAGS='--dumprestore'
+  - make check
+  - make check RUNTESTFLAGS='--dumprestore'
   - sudo make install
-  - eatmydata make installcheck
-  - eatmydata make installcheck RUNTESTFLAGS='--dumprestore'
+  - make installcheck
+  - make installcheck RUNTESTFLAGS='--dumprestore'
 
 notifications:
   email: false

diff --git a/configure.ac b/configure.ac
index c694683a002a4159a1b1907dcf37d6e8dc522778..872354a985df21bf6793b2f48732992774304eb7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1141,8 +1141,6 @@ if test "x$with_address_standardizer" != "xno"; then
     AC_SUBST([PCRE_CPPFLAGS])
     AC_SUBST([PCRE_LDFLAGS])
 
-
-
 else
     ADDRESS_STANDARDIZER=""
     AC_SUBST([ADDRESS_STANDARDIZER])
@@ -1152,7 +1150,7 @@ fi
 CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $PROTOBUF_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $JSON_CPPFLAGS $PCRE_CPPFLAGS $CPPFLAGS"
 dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
 
-SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $PROTOBUF_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS $PCRE_LDFLAGS $EXCLUDELIBS_LDFLAGS"
+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $PROTOBUF_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS $PCRE_LDFLAGS $EXCLUDELIBS_LDFLAGS $LDFLAGS"
 AC_SUBST([SHLIB_LINK])
 dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])