diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake index aa8f809866..9d886f5e80 100644 --- a/cmake/ProjTest.cmake +++ b/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}) diff --git a/configure.ac b/configure.ac index 9c3cb40a5d..a87478388e 100644 --- a/configure.ac +++ b/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 diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 904066f423..82927b8bd2 100644 --- a/data/CMakeLists.txt +++ b/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") - diff --git a/data/Makefile.am b/data/Makefile.am index 35587216d8..f85a5ddbd9 100644 --- a/data/Makefile.am +++ b/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) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ed44f8a2d2..ae3d6bf403 100644 --- a/test/CMakeLists.txt +++ b/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) diff --git a/test/Makefile.am b/test/Makefile.am index 8ea641b941..428e165045 100644 --- a/test/Makefile.am +++ b/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 diff --git a/test/old/CMakeLists.txt b/test/old/CMakeLists.txt new file mode 100644 index 0000000000..d197b2aa52 --- /dev/null +++ b/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") + diff --git a/test/old/Makefile.am b/test/old/Makefile.am new file mode 100644 index 0000000000..9e659280b4 --- /dev/null +++ b/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 diff --git a/data/ntv2_out.dist b/test/old/ntv2_out.dist similarity index 100% rename from data/ntv2_out.dist rename to test/old/ntv2_out.dist diff --git a/data/pj_out27.dist b/test/old/pj_out27.dist similarity index 100% rename from data/pj_out27.dist rename to test/old/pj_out27.dist diff --git a/data/pj_out83.dist b/test/old/pj_out83.dist similarity index 100% rename from data/pj_out83.dist rename to test/old/pj_out83.dist diff --git a/data/proj_outIGNF.dist b/test/old/proj_outIGNF.dist similarity index 100% rename from data/proj_outIGNF.dist rename to test/old/proj_outIGNF.dist diff --git a/data/td_out.dist b/test/old/td_out.dist similarity index 100% rename from data/td_out.dist rename to test/old/td_out.dist diff --git a/data/test27 b/test/old/test27 similarity index 99% rename from data/test27 rename to test/old/test27 index 1a887f7199..3b62855aa6 100755 --- a/data/test27 +++ b/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" diff --git a/data/test83 b/test/old/test83 similarity index 99% rename from data/test83 rename to test/old/test83 index 15f11dfd69..02f99d5f94 100755 --- a/data/test83 +++ b/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" diff --git a/data/testIGNF b/test/old/testIGNF similarity index 94% rename from data/testIGNF rename to test/old/testIGNF index c1428bfb2f..f785641e79 100755 --- a/data/testIGNF +++ b/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,7 +23,7 @@ usage() } if test -z "${EXE}"; then - EXE=../src/cs2cs + EXE=../../src/cs2cs fi if test ! -x ${EXE}; then @@ -29,11 +31,22 @@ if test ! -x ${EXE}; then 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} </dev/null 2>/dev/null; then @@ -37,7 +42,7 @@ echo "Running ${0} using ${EXE}:" echo "============================================" OUT=tv_out -#EXE=../src/cs2cs + # echo "doing tests into file ${OUT}, please wait" rm -f ${OUT} @@ -938,7 +943,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" diff --git a/data/tf_out.dist b/test/old/tf_out.dist similarity index 100% rename from data/tf_out.dist rename to test/old/tf_out.dist diff --git a/data/tv_out.dist b/test/old/tv_out.dist similarity index 100% rename from data/tv_out.dist rename to test/old/tv_out.dist