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/test83 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'test/cli/test83')

diff --git a/test/cli/test83 b/test/cli/test83
index 82b491a7..59793870 100755
--- a/test/cli/test83
+++ b/test/cli/test83
@@ -8,7 +8,6 @@
 #   Mercator due to greater precision of meridional distance function.
 #
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -27,12 +26,16 @@ if test ! -x ${EXE}; then
     exit 1
 fi
 
+if test -z "${PROJ_LIB}"; then
+    export PROJ_LIB="`dirname $0`/../../data"
+fi
+
 echo "============================================"
 echo "Running ${0} using ${EXE}:"
 echo "============================================"
 
 OUT=proj_out83
-INIT_FILE=${DATA_DIR}/nad83
+INIT_FILE=${PROJ_LIB}/nad83
 #
 echo "doing tests into file ${OUT}, please wait"
 #
-- 
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/test83 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/cli/test83')

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