diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | nad/Makefile.am | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 12 | ||||
| -rw-r--r-- | test/gie/Makefile.am | 9 | ||||
| -rw-r--r-- | test/gigs/5101.4-jhs.gie_failing (renamed from test/gigs/5101.4-jhs.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5102.2.gie_failing (renamed from test/gigs/5102.2.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5104.gie_failing (renamed from test/gigs/5104.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5105.1.gie_failing (renamed from test/gigs/5105.1.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5108.gie_failing (renamed from test/gigs/5108.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5110.gie_failing (renamed from test/gigs/5110.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5111.2.gie_failing (renamed from test/gigs/5111.2.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5203.1.gie_failing (renamed from test/gigs/5203.1.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5204.1.gie_failing (renamed from test/gigs/5204.1.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5205.1.gie_failing (renamed from test/gigs/5205.1.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5206.gie_failing (renamed from test/gigs/5206.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5207.1.gie_failing (renamed from test/gigs/5207.1.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/5207.2.gie_failing (renamed from test/gigs/5207.2.gie) | 0 | ||||
| -rw-r--r-- | test/gigs/Makefile.am | 18 |
19 files changed, 42 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 3795cfdb..692e8a21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src man nad jniwrap cmake +SUBDIRS = src man nad jniwrap cmake test EXTRA_DIST = makefile.vc nmake.opt CMakeLists.txt diff --git a/configure.ac b/configure.ac index 072b27d0..4893646e 100644 --- a/configure.ac +++ b/configure.ac @@ -131,6 +131,7 @@ AC_SUBST(MUTEX_SETTING,$MUTEX_SETTING) AC_SUBST(THREAD_LIB,$THREAD_LIB) AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile + test/Makefile test/gie/Makefile test/gigs/Makefile man/Makefile man/man1/Makefile man/man3/Makefile nad/Makefile jniwrap/Makefile jniwrap/org/Makefile jniwrap/org/proj4/Makefile]) AC_CONFIG_FILES([nad/install], [chmod +x nad/install]) 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) diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 00000000..0cb83342 --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,12 @@ +EXEPATH = ../src +GIEEXE = $(EXEPATH)/gie +GIETESTS = gie +GIGSTESTS = gigs + +SUBDIRS = gie gigs + +EXTRA_DIST = CMakeLists.txt + +check-local: + $(GIEEXE) $(GIETESTS)/*.gie + $(GIEEXE) $(GIGSTESTS)/*.gie diff --git a/test/gie/Makefile.am b/test/gie/Makefile.am new file mode 100644 index 00000000..291bc3f7 --- /dev/null +++ b/test/gie/Makefile.am @@ -0,0 +1,9 @@ +EXTRA_DIST = 4D-API_cs2cs-style.gie \ + GDA.gie \ + Makefile.am \ + axisswap.gie \ + builtins.gie \ + deformation.gie \ + ellipsoid.gie \ + more_builtins.gie \ + unitconvert.gie diff --git a/test/gigs/5101.4-jhs.gie b/test/gigs/5101.4-jhs.gie_failing index 615bf60b..615bf60b 100644 --- a/test/gigs/5101.4-jhs.gie +++ b/test/gigs/5101.4-jhs.gie_failing diff --git a/test/gigs/5102.2.gie b/test/gigs/5102.2.gie_failing index db812dbd..db812dbd 100644 --- a/test/gigs/5102.2.gie +++ b/test/gigs/5102.2.gie_failing diff --git a/test/gigs/5104.gie b/test/gigs/5104.gie_failing index 10c42935..10c42935 100644 --- a/test/gigs/5104.gie +++ b/test/gigs/5104.gie_failing diff --git a/test/gigs/5105.1.gie b/test/gigs/5105.1.gie_failing index a0803d2b..a0803d2b 100644 --- a/test/gigs/5105.1.gie +++ b/test/gigs/5105.1.gie_failing diff --git a/test/gigs/5108.gie b/test/gigs/5108.gie_failing index a5273a65..a5273a65 100644 --- a/test/gigs/5108.gie +++ b/test/gigs/5108.gie_failing diff --git a/test/gigs/5110.gie b/test/gigs/5110.gie_failing index 2d26d1ab..2d26d1ab 100644 --- a/test/gigs/5110.gie +++ b/test/gigs/5110.gie_failing diff --git a/test/gigs/5111.2.gie b/test/gigs/5111.2.gie_failing index dfa6bca2..dfa6bca2 100644 --- a/test/gigs/5111.2.gie +++ b/test/gigs/5111.2.gie_failing diff --git a/test/gigs/5203.1.gie b/test/gigs/5203.1.gie_failing index 960b9171..960b9171 100644 --- a/test/gigs/5203.1.gie +++ b/test/gigs/5203.1.gie_failing diff --git a/test/gigs/5204.1.gie b/test/gigs/5204.1.gie_failing index 3c7e3fff..3c7e3fff 100644 --- a/test/gigs/5204.1.gie +++ b/test/gigs/5204.1.gie_failing diff --git a/test/gigs/5205.1.gie b/test/gigs/5205.1.gie_failing index df4cb674..df4cb674 100644 --- a/test/gigs/5205.1.gie +++ b/test/gigs/5205.1.gie_failing diff --git a/test/gigs/5206.gie b/test/gigs/5206.gie_failing index 5f3d6eb6..5f3d6eb6 100644 --- a/test/gigs/5206.gie +++ b/test/gigs/5206.gie_failing diff --git a/test/gigs/5207.1.gie b/test/gigs/5207.1.gie_failing index 8384bf0e..8384bf0e 100644 --- a/test/gigs/5207.1.gie +++ b/test/gigs/5207.1.gie_failing diff --git a/test/gigs/5207.2.gie b/test/gigs/5207.2.gie_failing index bc76504a..bc76504a 100644 --- a/test/gigs/5207.2.gie +++ b/test/gigs/5207.2.gie_failing diff --git a/test/gigs/Makefile.am b/test/gigs/Makefile.am new file mode 100644 index 00000000..4840c272 --- /dev/null +++ b/test/gigs/Makefile.am @@ -0,0 +1,18 @@ +EXTRA_DIST = \ + 5101.1-jhs.gie \ + 5101.2-jhs.gie \ + 5101.3-jhs.gie \ + 5101.4-jhs-etmerc.gie \ + 5102.1.gie \ + 5103.1.gie \ + 5103.2.gie \ + 5103.3.gie \ + 5105.2.gie \ + 5106.gie \ + 5107.gie \ + 5109.gie \ + 5111.1.gie \ + 5112.gie \ + 5113.gie \ + 5201.gie \ + 5208.gie |