From a9bc6e5fb000f618c9df6276f4ef79063ce4cdfc Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Feb 2020 20:36:33 +0100 Subject: Make tests independent of proj-datumgrid Fixes #1984 - Copy BETA2007.gsb, MD, alaska, conus, ntf_r93.gsb, ntv1_can.dat grids from proj-datumgrid to data/tests. - Replace a couple uses of nzgd2kgrid0005.gsb in tests by ntf_r93.gsb - Add downsampled/subsetted versions of egm96_15.gtx as tests/egm96_15_downsampled.gtx and ntv2_0.gsb as tests/ntv2_0_downsampled.gsb This results in a few changes in expected results - Simpify travis/install.sh due to less configurations to test This results in a hopefully acceptable increase of the proj-X.Y.Z.tar.gz from 2.9 to 5.3 MB --- travis/mingw32/install.sh | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'travis/mingw32') diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index 8c756ced..67873dd1 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -54,25 +54,6 @@ make dist-all find /tmp/proj_autoconf_install (cd test; make -j2) cp -r ../data/tests /tmp/proj_autoconf_install/share/proj +cp ../data/tests/egm96_15_downsampled.gtx /tmp/proj_autoconf_install/share/proj/egm96_15.gtx +cp ../data/tests/ntv2_0_downsampled.gsb /tmp/proj_autoconf_install/share/proj/ntv2_0.gsb test/unit/test_cpp_api.exe -cd .. -# Now with grids -wget https://download.osgeo.org/proj/proj-datumgrid-1.5.zip -cd data -unzip -o ../proj-datumgrid-1.5.zip -cd .. -# autoconf build with grids -mkdir build_autoconf_grids -cd build_autoconf_grids -CC="ccache $MINGW_ARCH-gcc" CXX="ccache $MINGW_ARCH-g++" LD=$MINGW_ARCH-ld ../configure --host=$MINGW_ARCH --prefix=/tmp/proj_autoconf_install_nad --without-curl -make -j2 -make install -find /tmp/proj_autoconf_install_nad -#make check -cd src -make multistresstest.exe -make test228.exe -cd .. -PROJ_LIB=../data src/multistresstest.exe -num_iterations 100000 -cd .. - -- cgit v1.2.3