use ../src/cs2cs for testing by default

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1884 4e78687f-474d-0410-85f9-8d5e500ac6b2

7 files changed, 40 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index f27f8875..d5eab4f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-21  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* nad/test*: default to using ../src/cs2cs
+
 2010-07-31  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* nad/epsg: updated from GDAL.  Adds TMSO projection definitions,
diff --git a/nad/test27 b/nad/test27
index cd25621d..583f6032 100755
--- a/nad/test27
+++ b/nad/test27
@@ -16,13 +16,12 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    echo "*** ERROR: Missing path to 'proj' program."
-    usage
-else
-    if test ! -x ${EXE}; then
-        echo "*** ERROR: Can not find '${EXE}' program!"
-        exit 1
-    fi
+    EXE=../src/cs2cs
+fi
+
+if test ! -x ${EXE}; then
+    echo "*** ERROR: Can not find '${EXE}' program!"
+    exit 1
 fi
 
 echo "============================================"
diff --git a/nad/test83 b/nad/test83
index 2927dc76..2de16ab7 100755
--- a/nad/test83
+++ b/nad/test83
@@ -17,13 +17,12 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    echo "*** ERROR: Missing path to 'proj' program."
-    usage
-else
-    if test ! -x ${EXE}; then
-        echo "*** ERROR: Can not find '${EXE}' program!"
-        exit 1
-    fi
+    EXE=../src/cs2cs
+fi
+
+if test ! -x ${EXE}; then
+    echo "*** ERROR: Can not find '${EXE}' program!"
+    exit 1
 fi
 
 echo "============================================"
diff --git a/nad/testIGNF b/nad/testIGNF
index 3de07548..15226774 100755
--- a/nad/testIGNF
+++ b/nad/testIGNF
@@ -20,13 +20,12 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    echo "*** ERROR: Missing path to 'cs2cs' program."
-    usage
-else
-    if test ! -x ${EXE}; then
-        echo "*** ERROR: Can not find '${EXE}' program!"
-        exit 1
-    fi
+    EXE=../src/cs2cs
+fi
+
+if test ! -x ${EXE}; then
+    echo "*** ERROR: Can not find '${EXE}' program!"
+    exit 1
 fi
 
 echo "============================================"
diff --git a/nad/testdatumfile b/nad/testdatumfile
index 4a647ef3..0285e4cf 100755
--- a/nad/testdatumfile
+++ b/nad/testdatumfile
@@ -13,13 +13,12 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    echo "*** ERROR: Missing path to 'cs2cs' program."
-    usage
-else
-    if test ! -x ${EXE}; then
-        echo "*** ERROR: Can not find '${EXE}' program!"
-        exit 1
-    fi
+    EXE=../src/cs2cs
+fi
+
+if test ! -x ${EXE}; then
+    echo "*** ERROR: Can not find '${EXE}' program!"
+    exit 1
 fi
 
 echo "============================================"
diff --git a/nad/testntv2 b/nad/testntv2
index 096f4bbb..4a4cfb28 100755
--- a/nad/testntv2
+++ b/nad/testntv2
@@ -13,13 +13,12 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    echo "*** ERROR: Missing path to 'cs2cs' program."
-    usage
-else
-    if test ! -x ${EXE}; then
-        echo "*** ERROR: Can not find '${EXE}' program!"
-        exit 1
-    fi
+    EXE=../src/cs2cs
+fi
+
+if test ! -x ${EXE}; then
+    echo "*** ERROR: Can not find '${EXE}' program!"
+    exit 1
 fi
 
 echo "============================================"
diff --git a/nad/testvarious b/nad/testvarious
index e02b4d7b..ce2ed2a5 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -13,13 +13,12 @@ usage()
 }
 
 if test -z "${EXE}"; then
-    echo "*** ERROR: Missing path to 'cs2cs' program."
-    usage
-else
-    if test ! -x ${EXE}; then
-        echo "*** ERROR: Can not find '${EXE}' program!"
-        exit 1
-    fi
+    EXE=../src/cs2cs
+fi
+
+if test ! -x ${EXE}; then
+    echo "*** ERROR: Can not find '${EXE}' program!"
+    exit 1
 fi
 
 echo "============================================"