aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/ProjTest.cmake2
-rw-r--r--configure.ac2
-rw-r--r--data/CMakeLists.txt13
-rw-r--r--data/Makefile.am51
-rw-r--r--test/CMakeLists.txt1
-rw-r--r--test/Makefile.am2
-rw-r--r--test/old/CMakeLists.txt12
-rw-r--r--test/old/Makefile.am35
-rw-r--r--test/old/ntv2_out.dist (renamed from data/ntv2_out.dist)0
-rw-r--r--test/old/pj_out27.dist (renamed from data/pj_out27.dist)0
-rw-r--r--test/old/pj_out83.dist (renamed from data/pj_out83.dist)0
-rw-r--r--test/old/proj_outIGNF.dist (renamed from data/proj_outIGNF.dist)0
-rw-r--r--test/old/td_out.dist (renamed from data/td_out.dist)0
-rwxr-xr-xtest/old/test27 (renamed from data/test27)7
-rwxr-xr-xtest/old/test83 (renamed from data/test83)7
-rwxr-xr-xtest/old/testIGNF (renamed from data/testIGNF)24
-rwxr-xr-xtest/old/testdatumfile (renamed from data/testdatumfile)9
-rwxr-xr-xtest/old/testflaky (renamed from data/testflaky)7
-rwxr-xr-xtest/old/testntv2 (renamed from data/testntv2)7
-rwxr-xr-xtest/old/testvarious (renamed from data/testvarious)13
-rw-r--r--test/old/tf_out.dist (renamed from data/tf_out.dist)0
-rw-r--r--test/old/tv_out.dist (renamed from data/tv_out.dist)0
22 files changed, 105 insertions, 87 deletions
diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
index aa8f8098..9d886f5e 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 9c3cb40a..a8747838 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 904066f4..82927b8b 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 35587216..f85a5ddb 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 ed44f8a2..ae3d6bf4 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 8ea641b9..428e1650 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 00000000..d197b2aa
--- /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 00000000..9e659280
--- /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
index 5ce26e6e..5ce26e6e 100644
--- a/data/ntv2_out.dist
+++ b/test/old/ntv2_out.dist
diff --git a/data/pj_out27.dist b/test/old/pj_out27.dist
index 632dfc62..632dfc62 100644
--- a/data/pj_out27.dist
+++ b/test/old/pj_out27.dist
diff --git a/data/pj_out83.dist b/test/old/pj_out83.dist
index 726140f3..726140f3 100644
--- a/data/pj_out83.dist
+++ b/test/old/pj_out83.dist
diff --git a/data/proj_outIGNF.dist b/test/old/proj_outIGNF.dist
index 45112f60..45112f60 100644
--- a/data/proj_outIGNF.dist
+++ b/test/old/proj_outIGNF.dist
diff --git a/data/td_out.dist b/test/old/td_out.dist
index 060d14d2..060d14d2 100644
--- a/data/td_out.dist
+++ b/test/old/td_out.dist
diff --git a/data/test27 b/test/old/test27
index 1a887f71..3b62855a 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
index 15f11dfd..02f99d5f 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
index c1428bfb..f785641e 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} <<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"
diff --git a/data/testdatumfile b/test/old/testdatumfile
index 565c1953..6cd25b76 100755
--- a/data/testdatumfile
+++ b/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"
diff --git a/data/testflaky b/test/old/testflaky
index ac5ae396..ccb9dfd5 100755
--- a/data/testflaky
+++ b/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"
diff --git a/data/testntv2 b/test/old/testntv2
index 6e4a831a..a0867789 100755
--- a/data/testntv2
+++ b/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"
diff --git a/data/testvarious b/test/old/testvarious
index 2c4bd46e..dbaeb0ce 100755
--- a/data/testvarious
+++ b/test/old/testvarious
@@ -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
@@ -22,6 +23,10 @@ if test ! -x ${EXE}; then
exit 1
fi
+if test -z "${PROJ_LIB}"; then
+ export PROJ_LIB=$DATA_DIR
+fi
+
# Would be great to have a universale way of selecting a locale with
# a decimal separator that is not '.'
if command locale >/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
index 9f1778e7..9f1778e7 100644
--- a/data/tf_out.dist
+++ b/test/old/tf_out.dist
diff --git a/data/tv_out.dist b/test/old/tv_out.dist
index 222c0c5f..222c0c5f 100644
--- a/data/tv_out.dist
+++ b/test/old/tv_out.dist
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 19:09:13 +0000