From 140c64713b451db3456287e338e1ce297a52d047 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 24 Feb 2019 08:02:45 -0500
Subject: Fix data path used by cli tests (#1288)

All other tests use PROJ_LIB, and allow it to be overridden from the
command-line, so do the same here.
---
 test/cli/testvarious | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test/cli/testvarious')

diff --git a/test/cli/testvarious b/test/cli/testvarious
index c1fa61df..43b1f63c 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -4,7 +4,6 @@
 #
 #
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -24,7 +23,7 @@ if test ! -x ${EXE}; then
 fi
 
 if test -z "${PROJ_LIB}"; then
-    export PROJ_LIB=$DATA_DIR
+    export PROJ_LIB="`dirname $0`/../../data"
 fi
 
 # Would be great to have a universale way of selecting a locale with
-- 
cgit v1.2.3


From 10e1b7b75f70c704cf78a7eb7197beebb4b82d4a Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Sun, 24 Mar 2019 11:35:16 +0100
Subject: Make cs2cs support 4D coordinates.

This is a bit of a hack, 4D coordinates *will* be written to STDOUT
but the output format speficied with -f is not respected for the
t component, rather it is forward verbatim from the input.

Fixes #1354
---
 test/cli/testvarious | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'test/cli/testvarious')

diff --git a/test/cli/testvarious b/test/cli/testvarious
index 43b1f63c..afe52ade 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -953,6 +953,19 @@ $EXE EPSG:32631 EPSG:4326 -E >> ${OUT} <<EOF
 EOF
 
 
+echo  "##############################################################" >> ${OUT}
+echo  "Test EPSG:4896 to EPSG:7930" >> ${OUT}
+# Here we test that 4D coordinates are handled by cs2cs. Due to backwards
+# compatibility, the t-component is not written to STDOUT as part of the
+# coordinate data, but rather as part of the string that follows the xyz
+# components. This is only seen by users when the -E option is used. Which
+# means that this test also experience that behaviour.
+$EXE -f %.4f EPSG:4896 EPSG:7930 -E >> ${OUT} <<EOF
+3496737.2679    743254.4507  5264462.9620 2019.0
+3496737.2679    743254.4507  5264462.9620 2029.0
+EOF
+
+
 # Done!
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-- 
cgit v1.2.3


From 2c28ca1798cb24b803c44ceebd34bb3f15822c87 Mon Sep 17 00:00:00 2001
From: Mike Taves <mwtoews@gmail.com>
Date: Fri, 5 Apr 2019 12:56:58 +1300
Subject: Adjust test outputs

 - Tests should use unified diff with expected results
 - Show CMake build compile commands (VERBOSE=1)
 - Travis CI only has two cores, so "-j2" is sufficent
---
 test/cli/testvarious | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/cli/testvarious')

diff --git a/test/cli/testvarious b/test/cli/testvarious
index afe52ade..7b4a47f3 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -969,7 +969,7 @@ EOF
 # Done!
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${TEST_CLI_DIR}/${OUT}.dist
+diff -u -b ${OUT} ${TEST_CLI_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"
-- 
cgit v1.2.3


From c5346c7c25ca9fe281df39eaeefebc1aa4009266 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 3 May 2019 20:54:42 +0200
Subject: cs2cs: set time value to HUGE_VAL if not explicitly specified

---
 test/cli/testvarious | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'test/cli/testvarious')

diff --git a/test/cli/testvarious b/test/cli/testvarious
index 7b4a47f3..2e2d854c 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -966,6 +966,16 @@ $EXE -f %.4f EPSG:4896 EPSG:7930 -E >> ${OUT} <<EOF
 EOF
 
 
+echo  "##############################################################" >> ${OUT}
+echo  "Test ITRF2000 to ITRF1993" >> ${OUT}
+# Here we test that HUGE_VAL is passed as the time value if not explicitly
+# specified
+$EXE -f %.7f ITRF2000 ITRF1993 -E >> ${OUT} <<EOF
+59.4967 -117.61748 329.396
+59.4967 -117.61748 329.396 1988
+EOF
+
+
 # Done!
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-- 
cgit v1.2.3