diff options
| author | Mike Taves <mwtoews@gmail.com> | 2019-04-05 12:56:58 +1300 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2019-04-05 17:47:15 +1300 |
| commit | 2c28ca1798cb24b803c44ceebd34bb3f15822c87 (patch) | |
| tree | 5a8ed6d5be8792c145101a3474b73228b58247c5 /test/cli | |
| parent | 1e2e512f9a671df504f6f01eee53dc26939b3c0a (diff) | |
| download | PROJ-2c28ca1798cb24b803c44ceebd34bb3f15822c87.tar.gz PROJ-2c28ca1798cb24b803c44ceebd34bb3f15822c87.zip | |
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
Diffstat (limited to 'test/cli')
| -rwxr-xr-x | test/cli/test27 | 2 | ||||
| -rwxr-xr-x | test/cli/test83 | 2 | ||||
| -rwxr-xr-x | test/cli/testIGNF | 2 | ||||
| -rwxr-xr-x | test/cli/testdatumfile | 2 | ||||
| -rwxr-xr-x | test/cli/testflaky | 2 | ||||
| -rwxr-xr-x | test/cli/testntv2 | 2 | ||||
| -rwxr-xr-x | test/cli/testvarious | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/test/cli/test27 b/test/cli/test27 index 421f9044..bfc1cb0a 100755 --- a/test/cli/test27 +++ b/test/cli/test27 @@ -836,7 +836,7 @@ EOF # # do 'diff' with distribution results echo "diff ${OUT} with pj_out27.dist" -diff -b ${OUT} ${TEST_CLI_DIR}/pj_out27.dist +diff -u -b ${OUT} ${TEST_CLI_DIR}/pj_out27.dist if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURRED" 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" 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" 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" diff --git a/test/cli/testflaky b/test/cli/testflaky index 0b823cf6..23580146 100755 --- a/test/cli/testflaky +++ b/test/cli/testflaky @@ -58,7 +58,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" diff --git a/test/cli/testntv2 b/test/cli/testntv2 index 50b5d0ca..73371dbe 100755 --- a/test/cli/testntv2 +++ b/test/cli/testntv2 @@ -57,7 +57,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" 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" |
