Move data/test* scripts and expected results to test/old/

cmake/ProjTest.cmake

@@ -23,7 +23,7 @@ function(proj_add_test_script_sh SH_NAME BIN_USE)
     if(${TEST_OK})
       add_test( NAME "${testname}"
                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data
-                COMMAND  ${PROJECT_SOURCE_DIR}/data/${SH_NAME}
+                COMMAND  ${PROJECT_SOURCE_DIR}/test/old/${SH_NAME}
                          ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
                )
     endif(${TEST_OK})

configure.ac

@@ -264,7 +264,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 test/unit/Makefile
+                 test/Makefile test/old/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile
                  test/googletest/Makefile test/googletest/include/Makefile
                  test/googletest/include/gtest/Makefile
                  test/googletest/include/gtest/internal/Makefile

data/CMakeLists.txt

@@ -48,16 +48,3 @@ set(ALL_DATA_FILE ${PROJ_DICTIONARY}
                   ${GEOID_FILES})
 install(FILES ${ALL_DATA_FILE}
        DESTINATION ${DATADIR})
-
-#
-# test
-#
-set(CS2CS_BIN "cs2cs")
-set(PROJ_BIN "proj")
-proj_add_test_script_sh("test27" PROJ_BIN )
-proj_add_test_script_sh("test83" PROJ_BIN )
-proj_add_test_script_sh("testvarious" CS2CS_BIN )
-proj_add_test_script_sh("testdatumfile" CS2CS_BIN "connu")
-proj_add_test_script_sh("testIGNF" CS2CS_BIN "ntf_r93.gsb")
-proj_add_test_script_sh("testntv2" CS2CS_BIN "ntv2_0.gsb")
-

data/Makefile.am

@@ -1,28 +1,14 @@
-# Executables paths passed to test scripts
 DATAPATH = $(top_srcdir)/data
-EXEPATH = ../src
-PROJEXE = $(EXEPATH)/proj
-CS2CSEXE = $(EXEPATH)/cs2cs
-
-# PROJ.4 test scripts
-TEST27 = $(DATAPATH)/test27
-TEST83 = $(DATAPATH)/test83
-TESTNTV2 = $(DATAPATH)/testntv2
-TESTVARIOUS = $(DATAPATH)/testvarious
-TESTFLAKY = $(DATAPATH)/testflaky
-TESTDATUMFILE = $(DATAPATH)/testdatumfile
-TESTIGN = $(DATAPATH)/testIGNF
 
 pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \
 		esri.extra other.extra \
 		CH IGNF \
 		ITRF2000 ITRF2008 ITRF2014
 
-EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \
-		test27 test83 world epsg esri tv_out.dist tf_out.dist \
-		testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
+EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 \
+		world epsg esri \
 		esri.extra other.extra \
-		CH IGNF testIGNF proj_outIGNF.dist \
+		CH IGNF \
 		ITRF2000 ITRF2008 ITRF2014 \
 		makefile.vc CMakeLists.txt tests/test_nodata.gtx null.lla
 
@@ -59,34 +45,3 @@ install-data-local: process-nad2bin
 	    $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \
           fi; \
 	done
-
-check-local: process-nad2bin
-# Check if we are doing an out-of-tree build
-	@if test ! -f epsg; then \
-	  for gridfile in $(DATAPATH)/*.gsb $(DATAPATH)/*.gtx $(DATAPATH)/ntv1_can.dat dummy ; do \
-	    if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \
-	      cp $$gridfile .; \
-	    fi; \
-	  done; \
-	  for gridfile in $(pkgdata_DATA); do \
-	    cp $(DATAPATH)/$$gridfile .; \
-	  done; \
-	fi
-	$(TEST27) $(PROJEXE)
-	$(TEST83) $(PROJEXE)
-	PROJ_LIB=. $(TESTVARIOUS) $(CS2CSEXE)
-	@if [ -f conus ] ; then \
-	  export PROJ_LIB=. ; \
-	  $(TESTDATUMFILE) $(CS2CSEXE) ; \
-	fi
-	@if [ -f ntf_r93.gsb ] ; then \
-	  export PROJ_LIB=. ; \
-	  $(TESTIGN) $(CS2CSEXE) ; \
-	fi
-	@if [ -f ntv2_0.gsb ] ; then \
-	  export PROJ_LIB=. ; \
-	  $(TESTNTV2) $(CS2CSEXE) ; \
-	fi
-
-clean-local:
-	$(RM) $(TEST_DB)

test/CMakeLists.txt

@@ -52,4 +52,5 @@ proj_add_gie_test("GIGS-5208" "gigs/5208.gie")
 #                    ${TEST_MAIN_SRC}
 #                    ${CATCH2_INCLUDE}  )
 
+add_subdirectory(old)
 add_subdirectory(unit)

test/Makefile.am

@@ -7,4 +7,4 @@ EXTRA_DIST = CMakeLists.txt
 # libtestmain_la_LDFLAGS = -no-undefined
 # libtestmain_la_SOURCES = test_main.cpp
 
-SUBDIRS = googletest . gie gigs unit
+SUBDIRS = old googletest . gie gigs unit

test/old/CMakeLists.txt

@@ -0,0 +1,12 @@
+#
+# test
+#
+set(CS2CS_BIN "cs2cs")
+set(PROJ_BIN "proj")
+proj_add_test_script_sh("test27" PROJ_BIN )
+proj_add_test_script_sh("test83" PROJ_BIN )
+proj_add_test_script_sh("testvarious" CS2CS_BIN )
+proj_add_test_script_sh("testdatumfile" CS2CS_BIN "connu")
+proj_add_test_script_sh("testIGNF" CS2CS_BIN "ntf_r93.gsb")
+proj_add_test_script_sh("testntv2" CS2CS_BIN "ntv2_0.gsb")
+

test/old/Makefile.am

@@ -0,0 +1,35 @@
+# Executables paths passed to test scripts
+DATAPATH = $(top_srcdir)/data
+THIS_DIR = $(top_srcdir)/test/old
+EXEPATH = ../../src
+PROJEXE = $(EXEPATH)/proj
+CS2CSEXE = $(EXEPATH)/cs2cs
+
+# PROJ.4 test scripts
+TEST27 = $(THIS_DIR)/test27
+TEST83 = $(THIS_DIR)/test83
+TESTNTV2 = $(THIS_DIR)/testntv2
+TESTVARIOUS = $(THIS_DIR)/testvarious
+TESTFLAKY = $(THIS_DIR)/testflaky
+TESTDATUMFILE = $(THIS_DIR)/testdatumfile
+TESTIGN = $(THIS_DIR)/testIGNF
+
+EXTRA_DIST = pj_out27.dist pj_out83.dist td_out.dist \
+		test27 test83 tv_out.dist tf_out.dist \
+		testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
+		testIGNF proj_outIGNF.dist \
+		CMakeLists.txt
+
+check-local:
+	$(TEST27) $(PROJEXE)
+	$(TEST83) $(PROJEXE)
+	PROJ_LIB=$(DATAPATH) $(TESTVARIOUS) $(CS2CSEXE)
+	@if [ -f $(DATAPATH)/conus ] ; then \
+	  PROJ_LIB=$(DATAPATH) $(TESTDATUMFILE) $(CS2CSEXE) ; \
+	fi
+	@if [ -f $(DATAPATH)/ntf_r93.gsb ] ; then \
+	  PROJ_LIB=$(DATAPATH) $(TESTIGN) $(CS2CSEXE) ; \
+	fi
+	@if [ -f $(DATAPATH)/ntv2_0.gsb ] ; then \
+	  PROJ_LIB=$(DATAPATH) $(TESTNTV2) $(CS2CSEXE) ; \
+	fi

data/test27 → test/old/test27

@@ -6,7 +6,8 @@
 # Proj will vary in the .001ft range with projections using Transverse
 #   Mercator due to greater precision of meridional distance function.
 #
-DATA_DIR=`dirname $0`
+TEST_OLD_DIR=`dirname $0`
+DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -17,7 +18,7 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    EXE=../src/cs2cs
+    EXE=../../src/cs2cs
 fi
 
 if test ! -x ${EXE}; then
@@ -832,7 +833,7 @@ EOF
 #
 # do 'diff' with distribution results
 echo "diff ${OUT} with pj_out27.dist"
-diff -b ${OUT} ${DATA_DIR}/pj_out27.dist
+diff -b ${OUT} ${TEST_OLD_DIR}/pj_out27.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"

data/test83 → test/old/test83

@@ -7,7 +7,8 @@
 # Proj will vary in the .001ft range with projections using Transverse
 #   Mercator due to greater precision of meridional distance function.
 #
-DATA_DIR=`dirname $0`
+TEST_OLD_DIR=`dirname $0`
+DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -18,7 +19,7 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    EXE=../src/cs2cs
+    EXE=../../src/cs2cs
 fi
 
 if test ! -x ${EXE}; then
@@ -713,7 +714,7 @@ EOF
 #
 # do 'diff' with distribution results
 echo "diff ${OUT} with pj_out83.dist"
-diff -b ${OUT} ${DATA_DIR}/pj_out83.dist
+diff -b ${OUT} ${TEST_OLD_DIR}/pj_out83.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"

data/testIGNF → test/old/testIGNF

@@ -10,7 +10,9 @@
 #               transformations will be wrong and vice-versa
 # 2009-10-04 :  addition of NTFG to RGF93G test to check if
 #               the gsb grid is still ok
-DATA_DIR=`dirname $0`
+
+TEST_OLD_DIR=`dirname $0`
+DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -21,19 +23,30 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    EXE=../src/cs2cs
+    EXE=../../src/cs2cs
 fi
 
 if test ! -x ${EXE}; then
     echo "*** ERROR: Can not find '${EXE}' program!"
     exit 1
 fi
 
+if test -z "${PROJ_LIB}"; then
+    export PROJ_LIB=${DATA_DIR}
+fi
+
 echo "============================================"
 echo "Running ${0} using ${EXE}:"
 echo "============================================"
 
 OUT=proj_outIGNF
+
+REMOVE_IGNF=NO
+if test ! -f IGNF; then
+    cp ${PROJ_LIB}/IGNF .
+    REMOVE_IGNF=YES
+fi
+
 INIT_FILE=./IGNF
 RES="-f %.3f"
 #
@@ -148,10 +161,15 @@ echo "+init=${INIT_FILE}:RGR92 +to +init=${INIT_FILE}:REUN47" >>${OUT}
 $EXE +init=${INIT_FILE}:RGR92 +to +init=${INIT_FILE}:REUN47 -E $RES >>${OUT} <<EOF
 3356123.5400 1303218.3090 5247430.6050
 EOF
+
+if test "${REMOVE_IGNF}" = "YES"; then
+    rm ./IGNF
+fi
+
 #
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${DATA_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 echo  ""
 echo "PROBLEMS HAVE OCCURRED"

data/testdatumfile → test/old/testdatumfile

@@ -3,7 +3,8 @@
 # files that are not always available.
 #
 #
-DATA_DIR=`dirname $0`
+TEST_OLD_DIR=`dirname $0`
+DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -14,7 +15,7 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    EXE=../src/cs2cs
+    EXE=../../src/cs2cs
 fi
 
 if test ! -x ${EXE}; then
@@ -95,10 +96,10 @@ $EXE +proj=latlong +datum=WGS84 \
 EOF
 #
 ##############################################################################
-# Done! 
+# Done!     
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${DATA_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"

data/testflaky → test/old/testflaky

@@ -3,7 +3,8 @@
 # on datum files.
 #
 #
-DATA_DIR=`dirname $0`
+TEST_OLD_DIR=`dirname $0`
+DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -14,7 +15,7 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    EXE=../src/cs2cs
+    EXE=../../src/cs2cs
 fi
 
 if test ! -x ${EXE}; then
@@ -58,7 +59,7 @@ EOF
 # Done!
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${DATA_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"

data/testntv2 → test/old/testntv2

@@ -3,7 +3,8 @@
 # Test NTv2 (.gsb) support.  Assumes ntv2_0.gsb is installed.
 #
 #
-DATA_DIR=`dirname $0`
+TEST_OLD_DIR=`dirname $0`
+DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -14,7 +15,7 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    EXE=../src/cs2cs
+    EXE=../../src/cs2cs
 fi
 
 if test ! -x ${EXE}; then
@@ -57,7 +58,7 @@ EOF
 # Done! 
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${DATA_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"