diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-05 22:55:01 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-01-05 23:50:38 +0100 |
| commit | cff5dd526edebd8aefa4405e7a9ddf7914fd79fc (patch) | |
| tree | 75d10eb9111b7f2a72ff611a1d6ae8b5539a8176 /test | |
| parent | 5be02bf6d1d45ac0d835c138074611843982e9e8 (diff) | |
| download | PROJ-cff5dd526edebd8aefa4405e7a9ddf7914fd79fc.tar.gz PROJ-cff5dd526edebd8aefa4405e7a9ddf7914fd79fc.zip | |
Make sure tests pass if extra grids are present
Should fix the issue reported in https://lists.osgeo.org/pipermail/proj/2020-January/009188.html
Some extra north-american grids present in data/ can affect the results of
some tests, so create a data/for_tests/ subdirectory in which we copy only
select grids.
Diffstat (limited to 'test')
| -rw-r--r-- | test/cli/Makefile.am | 2 | ||||
| -rw-r--r-- | test/gie/Makefile.am | 2 | ||||
| -rw-r--r-- | test/gigs/Makefile.am | 2 | ||||
| -rw-r--r-- | test/unit/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am index fb7169e4..33878743 100644 --- a/test/cli/Makefile.am +++ b/test/cli/Makefile.am @@ -1,5 +1,5 @@ # Executables paths passed to test scripts -PROJ_LIB ?= ../../data +PROJ_LIB = ../../data/for_tests THIS_DIR = $(top_srcdir)/test/cli EXEPATH = ../../src PROJEXE = $(EXEPATH)/proj diff --git a/test/gie/Makefile.am b/test/gie/Makefile.am index 44facd87..058b1fe9 100644 --- a/test/gie/Makefile.am +++ b/test/gie/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = 4D-API_cs2cs-style.gie \ unitconvert.gie \ DHDN_ETRS89.gie -PROJ_LIB ?= ../../data +PROJ_LIB ?= ../../data/for_tests 4D-API-cs2cs-style: 4D-API_cs2cs-style.gie PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< diff --git a/test/gigs/Makefile.am b/test/gigs/Makefile.am index bea3be59..a66052db 100644 --- a/test/gigs/Makefile.am +++ b/test/gigs/Makefile.am @@ -20,7 +20,7 @@ EXTRA_DIST = \ 5201.gie \ 5208.gie -PROJ_LIB ?= ../../data +PROJ_LIB ?= ../../data/for_tests 5101.1: 5101.1-jhs.gie PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 57a03ca8..b7196828 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = gtest_include.h test_primitives.hpp AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/test @GTEST_CFLAGS@ @SQLITE3_CFLAGS@ AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@ -PROJ_LIB ?= ../../data +PROJ_LIB ?= ../../data/for_tests noinst_PROGRAMS = pj_transform_test noinst_PROGRAMS += pj_phi2_test |