From 1a2ce997b7b7f360110d20538aa15a64fcb61f5f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 19 Jan 2019 17:48:43 +0100
Subject: test/cli/Makefile.am: fix to make testdatumfile run again

---
 test/cli/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/cli')

diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am
index 55667ee8..50654968 100644
--- a/test/cli/Makefile.am
+++ b/test/cli/Makefile.am
@@ -36,7 +36,7 @@ testvarious-check:
 	PROJ_LIB=$(DATAPATH) $(TESTVARIOUS) $(CS2CSEXE)
 
 testdatumfile-check:
-	@if [ -f $(DATAPATH)/conus -a -f $(DATAPATH)/ntv1_can.dat -a -f $(DATAPATH)/MD -a -f $(DATAPATH)/ntf_r93.dat ]; then \
+	@if [ -f $(DATAPATH)/conus -a -f $(DATAPATH)/ntv1_can.dat -a -f $(DATAPATH)/MD -a -f $(DATAPATH)/ntf_r93.gsb ]; then \
 	  PROJ_LIB=$(DATAPATH) $(TESTDATUMFILE) $(CS2CSEXE) ; \
 	fi
 
-- 
cgit v1.2.3


From 53a8cbbec1a6c9c644b35da86bc26a33ff1279e0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 19 Jan 2019 17:49:05 +0100
Subject: Add support for spaces in grid name parameters (fixes #1152)

---
 test/cli/testdatumfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'test/cli')

diff --git a/test/cli/testdatumfile b/test/cli/testdatumfile
index 55900427..d048d8e6 100755
--- a/test/cli/testdatumfile
+++ b/test/cli/testdatumfile
@@ -27,6 +27,9 @@ echo "============================================"
 echo "Running ${0} using ${EXE}:"
 echo "============================================"
 
+mkdir "dir with \" space"
+cp ${PROJ_LIB}/conus "dir with \" space/myconus"
+
 OUT=td_out
 #EXE=../src/cs2cs
 #
@@ -46,7 +49,7 @@ EOF
 echo "##############################################################" >> ${OUT}
 echo As above, but without ntv1 everything goes through conus file. >> ${OUT}
 #
-$EXE +proj=latlong +ellps=clrk66 +nadgrids=conus \
+$EXE +proj=latlong +ellps=clrk66 '+nadgrids="./dir with "" space/myconus"' \
  +to +proj=latlong +datum=NAD83 \
  -E >>${OUT} <<EOF
 111d00'00.000"W 44d00'00.000"N 0.0
@@ -94,6 +97,9 @@ $EXE +proj=latlong +datum=WGS84 \
 -5.4999 51.9999
 -5.5001 52.0
 EOF
+
+rm -rf "dir with \" space"
+
 #
 ##############################################################################
 # Done!     
-- 
cgit v1.2.3