diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-01-09 21:09:54 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-01-09 23:24:43 +0100 |
| commit | 12c502d09f7cd06afc48dee7f1a064f40d99900c (patch) | |
| tree | 370eb831000a5571dd052875d856632a83c9c0e7 | |
| parent | 4cf424f18a99be6bbce979fd17027f0ebdd934a6 (diff) | |
| download | PROJ-12c502d09f7cd06afc48dee7f1a064f40d99900c.tar.gz PROJ-12c502d09f7cd06afc48dee7f1a064f40d99900c.zip | |
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.
| -rw-r--r-- | nad/Makefile.am | 5 | ||||
| -rwxr-xr-x | travis/install.sh | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/nad/Makefile.am b/nad/Makefile.am index e8f31f4b..af466df8 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -1,8 +1,11 @@ # Executables paths passed to test scripts NADPATH = $(top_srcdir)/nad +GIETESTPATH = $(top_srcdir)/test/gie +GIGSTESTPATH = $(top_srcdir)/test/gigs EXEPATH = ../src PROJEXE = $(EXEPATH)/proj CS2CSEXE = $(EXEPATH)/cs2cs +GIEEXE = $(EXEPATH)/gie # PROJ.4 test scripts TEST27 = $(NADPATH)/test27 @@ -87,6 +90,8 @@ check-local: process-nad2bin export PROJ_LIB=. ; \ $(TESTNTV2) $(CS2CSEXE) ; \ fi + $(GIEEXE) $(GIETESTPATH)/*.gie +#$(GIEEXE) $(GIGSTESTPATH)/*.gie clean-local: $(RM) $(TEST_DB) 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 |