Rename test/old/ to test/cli/ to better reflect their nature

20 files changed, 19 insertions, 19 deletions

diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
index 9d886f5e..46c4e515 100644
--- a/cmake/ProjTest.cmake
+++ b/cmake/ProjTest.cmake
@@ -23,7 +23,7 @@ function(proj_add_test_script_sh SH_NAME BIN_USE)
     if(${TEST_OK})
       add_test( NAME "${testname}"
                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data
-                COMMAND  ${PROJECT_SOURCE_DIR}/test/old/${SH_NAME}
+                COMMAND  ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME}
                          ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
                )
     endif(${TEST_OK})
diff --git a/configure.ac b/configure.ac
index 25675d6a..4b400858 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,7 +351,7 @@ dnl Generate files
 dnl ---------------------------------------------------------------------------
 
 AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile include/Makefile include/proj/Makefile include/proj/internal/Makefile
-                 test/Makefile test/old/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile
+                 test/Makefile test/cli/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile
                  test/googletest/Makefile test/googletest/include/Makefile
                  test/googletest/include/gtest/Makefile
                  test/googletest/include/gtest/internal/Makefile
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ae3d6bf4..c46ad5d7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -52,5 +52,5 @@ proj_add_gie_test("GIGS-5208" "gigs/5208.gie")
 #                    ${TEST_MAIN_SRC}
 #                    ${CATCH2_INCLUDE}  )
 
-add_subdirectory(old)
+add_subdirectory(cli)
 add_subdirectory(unit)
diff --git a/test/Makefile.am b/test/Makefile.am
index 428e1650..b65e9785 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,4 +7,4 @@ EXTRA_DIST = CMakeLists.txt
 # libtestmain_la_LDFLAGS = -no-undefined
 # libtestmain_la_SOURCES = test_main.cpp
 
-SUBDIRS = old googletest . gie gigs unit
+SUBDIRS = cli googletest . gie gigs unit
diff --git a/test/old/CMakeLists.txt b/test/cli/CMakeLists.txt
index d197b2aa..d197b2aa 100644
--- a/test/old/CMakeLists.txt
+++ b/test/cli/CMakeLists.txt
diff --git a/test/old/Makefile.am b/test/cli/Makefile.am
index 2848d40a..f1bd4543 100644
--- a/test/old/Makefile.am
+++ b/test/cli/Makefile.am
@@ -1,6 +1,6 @@
 # Executables paths passed to test scripts
 DATAPATH = ../../data
-THIS_DIR = $(top_srcdir)/test/old
+THIS_DIR = $(top_srcdir)/test/cli
 EXEPATH = ../../src
 PROJEXE = $(EXEPATH)/proj
 CS2CSEXE = $(EXEPATH)/cs2cs
diff --git a/test/old/ntv2_out.dist b/test/cli/ntv2_out.dist
index 5ce26e6e..5ce26e6e 100644
--- a/test/old/ntv2_out.dist
+++ b/test/cli/ntv2_out.dist
diff --git a/test/old/pj_out27.dist b/test/cli/pj_out27.dist
index 632dfc62..632dfc62 100644
--- a/test/old/pj_out27.dist
+++ b/test/cli/pj_out27.dist
diff --git a/test/old/pj_out83.dist b/test/cli/pj_out83.dist
index 726140f3..726140f3 100644
--- a/test/old/pj_out83.dist
+++ b/test/cli/pj_out83.dist
diff --git a/test/old/proj_outIGNF.dist b/test/cli/proj_outIGNF.dist
index 611144b8..611144b8 100644
--- a/test/old/proj_outIGNF.dist
+++ b/test/cli/proj_outIGNF.dist
diff --git a/test/old/td_out.dist b/test/cli/td_out.dist
index f6b2a219..f6b2a219 100644
--- a/test/old/td_out.dist
+++ b/test/cli/td_out.dist
diff --git a/test/old/test27 b/test/cli/test27
index 3b62855a..43c060d8 100755
--- a/test/old/test27
+++ b/test/cli/test27
@@ -6,7 +6,7 @@
 # Proj will vary in the .001ft range with projections using Transverse
 #   Mercator due to greater precision of meridional distance function.
 #
-TEST_OLD_DIR=`dirname $0`
+TEST_CLI_DIR=`dirname $0`
 DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
@@ -833,7 +833,7 @@ EOF
 #
 # do 'diff' with distribution results
 echo "diff ${OUT} with pj_out27.dist"
-diff -b ${OUT} ${TEST_OLD_DIR}/pj_out27.dist
+diff -b ${OUT} ${TEST_CLI_DIR}/pj_out27.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"
diff --git a/test/old/test83 b/test/cli/test83
index 02f99d5f..82b491a7 100755
--- a/test/old/test83
+++ b/test/cli/test83
@@ -7,7 +7,7 @@
 # Proj will vary in the .001ft range with projections using Transverse
 #   Mercator due to greater precision of meridional distance function.
 #
-TEST_OLD_DIR=`dirname $0`
+TEST_CLI_DIR=`dirname $0`
 DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
@@ -714,7 +714,7 @@ EOF
 #
 # do 'diff' with distribution results
 echo "diff ${OUT} with pj_out83.dist"
-diff -b ${OUT} ${TEST_OLD_DIR}/pj_out83.dist
+diff -b ${OUT} ${TEST_CLI_DIR}/pj_out83.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"
diff --git a/test/old/testIGNF b/test/cli/testIGNF
index abbaed94..0fa04e84 100755
--- a/test/old/testIGNF
+++ b/test/cli/testIGNF
@@ -11,7 +11,7 @@
 # 2009-10-04 :  addition of NTFG to RGF93G test to check if
 #               the gsb grid is still ok
 
-TEST_OLD_DIR=`dirname $0`
+TEST_CLI_DIR=`dirname $0`
 DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
@@ -159,7 +159,7 @@ EOF
 #
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_CLI_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 echo  ""
 echo "PROBLEMS HAVE OCCURRED"
diff --git a/test/old/testdatumfile b/test/cli/testdatumfile
index 6520453d..55900427 100755
--- a/test/old/testdatumfile
+++ b/test/cli/testdatumfile
@@ -3,7 +3,7 @@
 # files that are not always available.
 #
 #
-TEST_OLD_DIR=`dirname $0`
+TEST_CLI_DIR=`dirname $0`
 DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
@@ -99,7 +99,7 @@ EOF
 # Done!     
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_CLI_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"
diff --git a/test/old/testflaky b/test/cli/testflaky
index ccb9dfd5..af56a9cd 100755
--- a/test/old/testflaky
+++ b/test/cli/testflaky
@@ -3,7 +3,7 @@
 # on datum files.
 #
 #
-TEST_OLD_DIR=`dirname $0`
+TEST_CLI_DIR=`dirname $0`
 DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
@@ -59,7 +59,7 @@ EOF
 # Done!
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_CLI_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"
diff --git a/test/old/testntv2 b/test/cli/testntv2
index a0867789..e82026fc 100755
--- a/test/old/testntv2
+++ b/test/cli/testntv2
@@ -3,7 +3,7 @@
 # Test NTv2 (.gsb) support.  Assumes ntv2_0.gsb is installed.
 #
 #
-TEST_OLD_DIR=`dirname $0`
+TEST_CLI_DIR=`dirname $0`
 DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
@@ -58,7 +58,7 @@ EOF
 # Done! 
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_CLI_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"
diff --git a/test/old/testvarious b/test/cli/testvarious
index b3ba4040..88673c5d 100755
--- a/test/old/testvarious
+++ b/test/cli/testvarious
@@ -3,7 +3,7 @@
 # on datum files.
 #
 #
-TEST_OLD_DIR=`dirname $0`
+TEST_CLI_DIR=`dirname $0`
 DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
@@ -957,7 +957,7 @@ EOF
 # Done!
 # do 'diff' with distribution results
 echo "diff ${OUT} with ${OUT}.dist"
-diff -b ${OUT} ${TEST_OLD_DIR}/${OUT}.dist
+diff -b ${OUT} ${TEST_CLI_DIR}/${OUT}.dist
 if [ $? -ne 0 ] ; then
 	echo  ""
 	echo "PROBLEMS HAVE OCCURRED"
diff --git a/test/old/tf_out.dist b/test/cli/tf_out.dist
index 9f1778e7..9f1778e7 100644
--- a/test/old/tf_out.dist
+++ b/test/cli/tf_out.dist
diff --git a/test/old/tv_out.dist b/test/cli/tv_out.dist
index 148d413d..148d413d 100644
--- a/test/old/tv_out.dist
+++ b/test/cli/tv_out.dist