From 140c64713b451db3456287e338e1ce297a52d047 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade 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/testdatumfile | 1 - 1 file changed, 1 deletion(-) (limited to 'test/cli/testdatumfile') diff --git a/test/cli/testdatumfile b/test/cli/testdatumfile index e8995150..27c39840 100755 --- a/test/cli/testdatumfile +++ b/test/cli/testdatumfile @@ -4,7 +4,6 @@ # # TEST_CLI_DIR=`dirname $0` -DATA_DIR=`dirname $0`/../../data EXE=$1 usage() -- cgit v1.2.3 From 2c28ca1798cb24b803c44ceebd34bb3f15822c87 Mon Sep 17 00:00:00 2001 From: Mike Taves 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/testdatumfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/cli/testdatumfile') diff --git a/test/cli/testdatumfile b/test/cli/testdatumfile index 27c39840..5b56f077 100755 --- a/test/cli/testdatumfile +++ b/test/cli/testdatumfile @@ -113,7 +113,7 @@ rm -rf "dir with \" space" # 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