From 12c502d09f7cd06afc48dee7f1a064f40d99900c Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Tue, 9 Jan 2018 21:09:54 +0100
Subject: Add gie tests to autoconf makefile.

Download grid files as the first thing in the travis install script and
that 'make check' can be run without errors caused by missing grids.
---
 travis/install.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'travis')

diff --git a/travis/install.sh b/travis/install.sh
index 5be36eb1..5f520902 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -2,6 +2,15 @@
 
 set -e
 
+# Download grid files to nad/
+wget http://download.osgeo.org/proj/proj-datumgrid-1.6.zip
+cd nad
+unzip -o ../proj-datumgrid-1.6.zip
+wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx
+GRIDDIR=`pwd`
+echo $GRIDDIR
+cd ..
+
 # prepare build files
 ./autogen.sh
 # cmake build
@@ -20,7 +29,7 @@ make -j3
 make install
 make dist-all
 find /tmp/proj_autoconf_install
-make check
+PROJ_LIB=$GRIDDIR make check
 # Check consistency of generated tarball
 TAR_FILENAME=`ls *.tar.gz`
 TAR_DIRECTORY=`basename $TAR_FILENAME .tar.gz`
@@ -30,7 +39,7 @@ cd $TAR_DIRECTORY
 make -j3
 make install
 make dist-all
-make check
+PROJ_LIB=$GRIDDIR make check
 CURRENT_PWD=`pwd`
 cd /tmp/proj_autoconf_install
 find | sort > /tmp/list_proj_autoconf_install.txt
@@ -42,14 +51,6 @@ cd $CURRENT_PWD
 cd ..
 #
 cd ..
-# Now with grids
-wget http://download.osgeo.org/proj/proj-datumgrid-1.6.zip
-cd nad
-unzip -o ../proj-datumgrid-1.6.zip
-wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx
-GRIDDIR=`pwd`
-echo $GRIDDIR
-cd ..
 # cmake build with grids
 mkdir build_cmake_nad
 cd build_cmake_nad
@@ -65,7 +66,7 @@ cd build_autoconf_nad
 make -j3
 make install
 find /tmp/proj_autoconf_install_nad
-make check
+PROJ_LIB=$GRIDDIR make check
 cd src
 make multistresstest
 make test228
@@ -79,8 +80,7 @@ if [ $TRAVIS_OS_NAME == "osx" ]; then
       CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure;
     fi
 make -j3
-make check
-PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/*.gie
+PROJ_LIB=$GRIDDIR make check
 
 # install & run the working GIGS test
   # create locations that pyproj understands
-- 
cgit v1.2.3