fix == in shell scripts

This commit is contained in:
Dennis Heimbigner 2012-07-17 20:13:17 +00:00
parent 46736d24ab
commit b083b9e758
18 changed files with 26 additions and 40 deletions

View File

@ -44,7 +44,7 @@ do
do
for c2 in 128
do
if test $d == -1; then
if test $d = -1; then
file_out="pr_A1_${c0}_${c1}_${c2}.nc"
else
file_out="pr_A1_z${d}_${c0}_${c1}_${c2}.nc"

View File

@ -9,7 +9,7 @@
srcdir=`dirname $0`
cd $srcdir
srcdir=`pwd`
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -12,7 +12,7 @@ srcdir=`pwd`
builddir=`pwd`/..
# Hack for CYGWIN
cd $srcdir
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -10,7 +10,7 @@ srcdir=`pwd`
# compute the build directory
builddir=`pwd`/..
# Hack for CYGWIN
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -74,7 +74,7 @@ echo '#DODSRC' >./.dodsrc
for x in ${TESTSET} ; do
url="${PARAMS}${TESTURL}/$x"
if test "x$quiet" = "x0" ; then echo "*** Testing: ${x}"; fi
if test "x$quiet" = "x0" ; then echo "*** Testing: ${x} ; url=$url" ; fi
# determine if this is an xfailtest
isxfail=0
for t in ${XFAILTESTS} ; do
@ -103,7 +103,7 @@ for x in ${TESTSET} ; do
;;
2)
xfailcount=`expr $xfailcount + 1`
echo "*** XFAIL: ${x}"
echo "*** XFAIL : ${x}"
;;
esac

View File

@ -17,7 +17,7 @@ builddir=`pwd`/..
# Hack for CYGWIN
cd $srcdir
srcdir=`pwd`
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir=`echo $builddir | sed 's/\/c\//c:\//g'`
fi

View File

@ -15,7 +15,7 @@ srcdir=`pwd`
# Do a hack to remove e.g. c: for CYGWIN
builddir=`pwd`/..
# Hack for CYGWIN
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -43,7 +43,7 @@ test.nc text.nc"
XFAILTESTS=""
# For now, remove some tests from windows platform.
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
XFAILTESTS="$XFAILTESTS EOSDB OverideExample SimpleDrdsExample test.67 test.gr5 123bears.nc 123.nc bears.nc ber-2002-10-01 data.nc in1.nc in_2.nc in_no_three_double_dmn.nc test.nc text.nc test.22 test.23 test.gr1 in.nc ber-2002-10-01.nc"
fi

View File

@ -11,7 +11,7 @@ srcdir=`pwd`
# Do a hack to remove e.g. c: for CYGWIN
builddir=`pwd`/..
# Hack for CYGWIN
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -11,7 +11,7 @@ srcdir=`pwd`
# Do a hack to remove e.g. c: for CYGWIN
builddir=`pwd`/..
# Hack for CYGWIN
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -34,20 +34,6 @@ if test -n "$longtests"; then
WHICHTESTS="${WHICHTESTS} L1 LC1"
fi
# This fails because solaris ping does not like the -c1 option
# # See if we can access the remote server at all
# PINGURL="test.opendap.org"
# # do we have ping command?
# #if test ping -c1 localhost >/dev/null 2>&1 ; then
# if test ping -c1 localhost ; then
# if ping -c1 ${PINGURL} >/dev/null 2>&1 ; then
# ignore=1
# else
# echo "WARNING: NETWORK ACCESS NOT AVAILABLE"
# fi
# fi
#locate the testdata and expected directory
if test "$cache" = 0 ; then
# No cache means no cache, including prefetch
@ -152,7 +138,7 @@ IGNORE="test.07.2"
XFAILTESTS3=""
# For now, remove some tests from windows platform.
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
XFAILTESTS3="$XFAILTESTS3 test.67 test.06.1 test.06"
fi
@ -306,11 +292,11 @@ for t in ${TESTSET} ; do
;;
2)
xfailcount=`expr $xfailcount + 1`
echo "*** XFAIL: ${name}"
echo "*** XFAIL : ${name}"
;;
3)
svcfailcount=`expr $svcfailcount + 1`
echo "*** SVCFAIL: ${name}"
echo "*** SVCFAIL : ${name}"
;;
esac

View File

@ -12,7 +12,7 @@ builddir=`pwd`/..
# Hack for CYGWIN
cd $srcdir
srcdir=`pwd`
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -11,7 +11,7 @@ srcdir=`pwd`
# Do a hack to remove e.g. c: for CYGWIN
builddir=`pwd`/..
# Hack for CYGWIN
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi

View File

@ -11,7 +11,7 @@ srcdir=`pwd`
# compute the build directory
builddir=`pwd`/..
# Hack for CYGWIN
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi
@ -142,7 +142,7 @@ for t in ${SPECIALTESTS} ; do
;;
2)
xfailcount=`expr $xfailcount + 1`
echo "*** XFAIL: ${name}"
echo "*** XFAIL : ${name}"
;;
esac

View File

@ -11,7 +11,7 @@ srcdir=`pwd`
# compute the build directory
builddir=`pwd`/..
# Hack for CYGWIN
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi
@ -145,7 +145,7 @@ for t in ${TESTSET} ; do
;;
2)
xfailcount=`expr $xfailcount + 1`
echo "*** XFAIL: ${name}"
echo "*** XFAIL : ${name}"
;;
esac

View File

@ -4,8 +4,8 @@
set -e
if test "x$srcdir" = "x"; then
srcdir=`dirname $0`;
export srcdir=$srcdir
fi
export srcdir
echo ""
TESTFILES='c0 c0tmp ctest0 ctest0_64 small small2 test0 test1

View File

@ -7,7 +7,8 @@ set -e
if test "x$srcdir" = "x"; then
srcdir=`dirname $0`;
fi
export srcdir=$srcdir
# add hack for sunos
export srcdir;
echo ""
echo "*** Testing ncgen and ncdump test output for netCDF-4 format."

View File

@ -5,10 +5,9 @@
set -e
if test "x$srcdir" = "x"; then
srcdir=`dirname $0`;
cd $srcdir
#srcdir=`pwd`
#export srcdir=$srcdir
fi
export srcdir
echo ""
echo "*** Running extra netcdf-4 tests."
@ -23,7 +22,7 @@ echo "*** Running extra netcdf-4 tests."
# remove the './','../../ncdump'.
#
if [ `uname | cut -d "_" -f 1` == "MINGW32" ]; then # MINGW Platforms
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then # MINGW Platforms
echo "*** dumping tst_string_data.nc to tst_string_data.cdl..."