aboutsummaryrefslogtreecommitdiff
path: root/nad
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2018-02-02 01:03:25 +0100
committerKristian Evers <kristianevers@gmail.com>2018-02-02 12:09:04 +0100
commitc75d1879e5c465f168fcd8800b11044ee3738dee (patch)
tree8490a6e37106211dcd3c2d48b20ef5fa24ccb311 /nad
parent9a8c37ac04ce913617a2b429bbc7f8a3daa1848d (diff)
downloadPROJ-c75d1879e5c465f168fcd8800b11044ee3738dee.tar.gz
PROJ-c75d1879e5c465f168fcd8800b11044ee3738dee.zip
Improve tests and add test files to automake setup.
Make sure that the gie files in test/gie and test/gigs are included in the distribution tarball. Tests with gie are set up to run all available files matching *.gie in the gie and gigs directories. For this reason tests that are known to fail in gigs/ have been renamed to *.gie_failing, so that "make check" can be run in-tree in local copies of the git repository.
Diffstat (limited to 'nad')
-rw-r--r--nad/Makefile.am7
1 files changed, 1 insertions, 6 deletions
diff --git a/nad/Makefile.am b/nad/Makefile.am
index af466df8..99d00da3 100644
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
@@ -1,11 +1,8 @@
# 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
@@ -26,7 +23,7 @@ EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 pj_out27.dist pj_out83.dist t
testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
esri.extra other.extra \
CH IGNF testIGNF proj_outIGNF.dist \
- ITRF2000 ITRF2008 ITRF2014
+ ITRF2000 ITRF2008 ITRF2014 \
makefile.vc CMakeLists.txt
process-nad2bin:
@@ -90,8 +87,6 @@ check-local: process-nad2bin
export PROJ_LIB=. ; \
$(TESTNTV2) $(CS2CSEXE) ; \
fi
- $(GIEEXE) $(GIETESTPATH)/*.gie
-#$(GIEEXE) $(GIGSTESTPATH)/*.gie
clean-local:
$(RM) $(TEST_DB)