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/testIGNF | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test/cli/testIGNF')

diff --git a/test/cli/testIGNF b/test/cli/testIGNF
index 0fa04e84..2b2d5a57 100755
--- a/test/cli/testIGNF
+++ b/test/cli/testIGNF
@@ -12,7 +12,6 @@
 #               the gsb grid is still ok
 
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -32,7 +31,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
 
 echo "============================================"
-- 
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/testIGNF | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/cli/testIGNF')

diff --git a/test/cli/testIGNF b/test/cli/testIGNF
index 2b2d5a57..aa8c3354 100755
--- a/test/cli/testIGNF
+++ b/test/cli/testIGNF
@@ -158,7 +158,7 @@ EOF
 #
 # 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