diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-09-19 17:48:19 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-09-19 17:54:51 +0200 |
| commit | aee8e5d10664c0b096edaee1ef3a0c897731eb2d (patch) | |
| tree | b70afba3a036028a16ff6ac29751596ec45c5af4 /travis/install.sh | |
| parent | 00f6873a159806cf08a3f51d90776e2840ede946 (diff) | |
| download | PROJ-aee8e5d10664c0b096edaee1ef3a0c897731eb2d.tar.gz PROJ-aee8e5d10664c0b096edaee1ef3a0c897731eb2d.zip | |
travis/install.sh: cleanups
Diffstat (limited to 'travis/install.sh')
| -rwxr-xr-x | travis/install.sh | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/travis/install.sh b/travis/install.sh index be3c1989..98072d8a 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -45,25 +45,18 @@ cd .. cd ../.. # Install grid files -cd data -unzip -o ../proj-datumgrid-1.7.zip -GRIDDIR=`pwd` -echo $GRIDDIR -cd .. +(cd data && unzip -o ../proj-datumgrid-1.7.zip) # autoconf build with grids mkdir build_autoconf_grids cd build_autoconf_grids ../configure --prefix=/tmp/proj_autoconf_install_grids make -j3 +make check +(cd src && make multistresstest && make test228) +PROJ_LIB=../data src/multistresstest make install find /tmp/proj_autoconf_install_grids -PROJ_LIB=$GRIDDIR make check -cd src -make multistresstest -make test228 -cd .. -PROJ_LIB=../data src/multistresstest cd .. # autoconf build with grids and coverage @@ -73,10 +66,10 @@ else CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure; fi make -j3 -PROJ_LIB=$GRIDDIR make check +make check # Rerun tests without grids not included in proj-datumgrid -rm -v ${GRIDDIR}/egm96_15.gtx -PROJ_LIB=$GRIDDIR make check +rm -v data/egm96_15.gtx +make check mv src/.libs/*.gc* src |