6 files changed, 68 insertions, 5 deletions
diff --git a/test/cli/CMakeLists.txt b/test/cli/CMakeLists.txt
index d197b2aa..0c4ccf1b 100644
--- a/test/cli/CMakeLists.txt
+++ b/test/cli/CMakeLists.txt
@@ -3,10 +3,13 @@
 #
 set(CS2CS_BIN "cs2cs")
 set(PROJ_BIN "proj")
+set(PROJINFO_BIN "projinfo")
+set(CCT_BIN "cct")
 proj_add_test_script_sh("test27" PROJ_BIN )
 proj_add_test_script_sh("test83" PROJ_BIN )
 proj_add_test_script_sh("testvarious" CS2CS_BIN )
 proj_add_test_script_sh("testdatumfile" CS2CS_BIN "connu")
 proj_add_test_script_sh("testIGNF" CS2CS_BIN "ntf_r93.gsb")
 proj_add_test_script_sh("testntv2" CS2CS_BIN "ntv2_0.gsb")
-
+proj_add_test_script_sh("testprojinfo" PROJINFO_BIN )
+proj_add_test_script_sh("testcct" CCT_BIN )
diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am
index 50654968..c0bc0871 100644
--- a/test/cli/Makefile.am
+++ b/test/cli/Makefile.am
@@ -5,6 +5,7 @@ EXEPATH = ../../src
 PROJEXE = $(EXEPATH)/proj
 CS2CSEXE = $(EXEPATH)/cs2cs
 PROJINFOEXE = $(EXEPATH)/projinfo
+CCTEXE = $(EXEPATH)/cct
 
 # PROJ.4 test scripts
 TEST27 = $(THIS_DIR)/test27
@@ -15,12 +16,14 @@ TESTFLAKY = $(THIS_DIR)/testflaky
 TESTDATUMFILE = $(THIS_DIR)/testdatumfile
 TESTIGN = $(THIS_DIR)/testIGNF
 TESTPROJINFO = $(THIS_DIR)/testprojinfo
+TESTCCT = $(THIS_DIR)/testcct
 
 EXTRA_DIST = pj_out27.dist pj_out83.dist td_out.dist \
 		test27 test83 tv_out.dist tf_out.dist \
 		testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
 		testIGNF proj_outIGNF.dist \
 		testprojinfo testprojinfo_out.dist \
+		testcct testcct_out.dist \
 		CMakeLists.txt
 
 testprojinfo-check:
@@ -50,4 +53,7 @@ testntv2-check:
 	  PROJ_LIB=$(DATAPATH) $(TESTNTV2) $(CS2CSEXE) ; \
 	fi
 
-check-local: testprojinfo-check test27-check test83-check testvarious-check testdatumfile-check testign-check testntv2-check
+testcct-check:
+	PROJ_LIB=$(DATAPATH) $(TESTCCT) $(CCTEXE)
+
+check-local: testprojinfo-check test27-check test83-check testvarious-check testdatumfile-check testign-check testntv2-check testcct-check
diff --git a/test/cli/testcct b/test/cli/testcct
new file mode 100755
index 00000000..93749052
--- /dev/null
+++ b/test/cli/testcct
@@ -0,0 +1,51 @@
+:
+# Test cct
+
+TEST_CLI_DIR=`dirname $0`
+DATA_DIR=`dirname $0`/../../data
+EXE=$1
+
+usage()
+{
+    echo "Usage: ${0} <path to 'cct' program>" 
+    echo
+    exit 1
+}
+
+if test -z "${EXE}"; then
+    EXE=../../src/cct
+fi
+
+if test ! -x ${EXE}; then
+    echo "*** ERROR: Can not find '${EXE}' program!"
+    exit 1
+fi
+
+echo "============================================"
+echo "Running ${0} using ${EXE}:"
+echo "============================================"
+
+OUT=testcct_out
+
+rm -f ${OUT}
+
+echo "Testing cct -d 8 +proj=merc +R=1" >> ${OUT}
+echo "90 45" 0 | $EXE -d 8 +proj=merc +R=1 >>${OUT}
+echo "" >>${OUT}
+
+# do 'diff' with distribution results
+echo "diff ${OUT} with testcct_out.dist"
+diff -u ${OUT} ${TEST_CLI_DIR}/testcct_out.dist
+if [ $? -ne 0 ] ; then
+	echo  ""
+	echo "PROBLEMS HAVE OCCURRED"
+	echo "test file ${OUT} saved"
+    echo
+	exit 100
+else
+	echo "TEST OK"
+	echo "test file ${OUT} removed"
+    echo
+	/bin/rm -f ${OUT}
+	exit 0
+fi
diff --git a/test/cli/testcct_out.dist b/test/cli/testcct_out.dist
new file mode 100644
index 00000000..44dd6964
--- /dev/null
+++ b/test/cli/testcct_out.dist
@@ -0,0 +1,3 @@
+Testing cct -d 8 +proj=merc +R=1
+   1.57079633     0.88137359    0.00000000           inf
+
diff --git a/test/cli/testvarious b/test/cli/testvarious
index 7ec50bb3..c1fa61df 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -239,7 +239,7 @@ EOF
 echo "##############################################################" >> ${OUT}
 echo "Test transverse mercator (#97)" >> ${OUT}
 #
-$EXE +proj=tmerc +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
+$EXE +proj=tmerc +approx +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
  +to +proj=latlong +datum=WGS84 \
  -E >>${OUT} <<EOF
 10000 20000
@@ -253,7 +253,7 @@ echo "##############################################################" >> ${OUT}
 echo "Test transverse mercator inverse (#97)" >> ${OUT}
 #
 $EXE +proj=latlong +datum=WGS84 \
- +to +proj=tmerc +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
+ +to +proj=tmerc +approx +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
  -E >>${OUT} <<EOF
 0dN 0.000
 15d22'16.108"W	17d52'53.478"N 0.000
diff --git a/test/cli/tv_out.dist b/test/cli/tv_out.dist
index 148d413d..72e95634 100644
--- a/test/cli/tv_out.dist
+++ b/test/cli/tv_out.dist
@@ -352,7 +352,7 @@ Test inverse handling
 10 20	-1384841.19	7581707.88 0.00
 ##############################################################
 Test MGI datum gives expected results (#207)
-16.33 48.20	595710.3732102	5357598.4645755 -44.4951085
+16.33 48.20	595710.3731286	5357598.4645652 -44.4951085
 ##############################################################
 Test omerc sensitivity with locations 90d from origin(#114)
 56.958381652832 72.8798	-9985.16336453	-227.67701050 0.00000000