From 777ffb185b3f00c4f858cb90dfcc9c6a77231a9f Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dennis.heimbigner@gmail.com>
Date: Sat, 20 Apr 2024 18:36:07 -0600
Subject: [PATCH] push5

---
 nczarr_test/run_chunkcases.sh |  6 +++---
 nczarr_test/run_notzarr.sh    |  2 +-
 nczarr_test/run_unlim_io.sh   |  3 +--
 nczarr_test/test_nczarr.sh    | 18 +++++++++---------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/nczarr_test/run_chunkcases.sh b/nczarr_test/run_chunkcases.sh
index 492c8f8b23..d8f60cd62f 100755
--- a/nczarr_test/run_chunkcases.sh
+++ b/nczarr_test/run_chunkcases.sh
@@ -96,7 +96,7 @@ rm -f tmp_rem_${zext}.txt tmp_rem_${zext}.cdl
 $TC -d 8,8 -c 3,3 -s 0,0 -p 8,8 -Ocw $F
 ${NCDUMP} $F > tmp_rem_${zext}.cdl
 diff -b ${srcdir}/ref_rem.cdl tmp_rem_${zext}.cdl
-${execdir}/ncdumpchunks -v v $F > tmp_rem_${zext}.txt
+${NCDUMPCHUNKS} -v v $F > tmp_rem_${zext}.txt
 diff -b ${srcdir}/ref_rem.dmp tmp_rem_${zext}.txt
 
 echo "Test rank > 2"
@@ -105,7 +105,7 @@ rm -f tmp_ndims_${zext}.txt tmp_ndims_${zext}.cdl
 $TC -d 8,8,8,8 -c 3,3,4,4 -s 0,0,0,0 -p 8,8,8,8 -Ocw $F
 ${NCDUMP} $F > tmp_ndims_${zext}.cdl
 diff -b ${srcdir}/ref_ndims.cdl tmp_ndims_${zext}.cdl
-${execdir}/ncdumpchunks -v v $F > tmp_ndims_${zext}.dmp
+${NCDUMPCHUNKS} -v v $F > tmp_ndims_${zext}.dmp
 diff -b ${srcdir}/ref_ndims.dmp tmp_ndims_${zext}.dmp
 
 echo "Test miscellaneous 1"
@@ -114,7 +114,7 @@ rm -f tmp_misc1_${zext}.txt tmp_misc1_${zext}.cdl
 $TC -d 6,12,4 -c 2,3,1 -s 0,0,0 -e 6,1,4 -Ocw $F
 ${NCDUMP} $F > tmp_misc1_${zext}.cdl
 diff -b ${srcdir}/ref_misc1.cdl tmp_misc1_${zext}.cdl
-${execdir}/ncdumpchunks -v v $F > tmp_misc1_${zext}.dmp
+${NCDUMPCHUNKS} -v v $F > tmp_misc1_${zext}.dmp
 diff -b ${srcdir}/ref_misc1.dmp tmp_misc1_${zext}.dmp
 } # testcasespass()
 
diff --git a/nczarr_test/run_notzarr.sh b/nczarr_test/run_notzarr.sh
index 1066cb06e5..f5900dea51 100755
--- a/nczarr_test/run_notzarr.sh
+++ b/nczarr_test/run_notzarr.sh
@@ -31,7 +31,7 @@ cp ${srcdir}/ref_notzarr.tar.gz .
 gunzip ref_notzarr.tar.gz
 tar -xf ref_notzarr.tar
 if test "x$FEATURE_S3TESTS" = xyes ; then
-    ${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "${S3ISOPATH}/notzarr.s3/notzarr.txt" upload
+    ${S3UTIL} -f notzarr.file/notzarr.txt -u "https://${URL}" -k "${S3ISOPATH}/notzarr.s3/notzarr.txt" upload
 fi
 
 echo "Test empty file"
diff --git a/nczarr_test/run_unlim_io.sh b/nczarr_test/run_unlim_io.sh
index de5fb6ff81..aec2320003 100755
--- a/nczarr_test/run_unlim_io.sh
+++ b/nczarr_test/run_unlim_io.sh
@@ -12,7 +12,6 @@ THISDIR=`pwd`
 cd $ISOPATH
 
 TC="${execdir}/test_unlim_io -4"
-ZM="${execdir}/zmapio -t int"
 
 remfile() {
   case "$zext" in
@@ -69,7 +68,7 @@ $TC -d 0,0 -c 2,2 -s 0,0 -e 2,2 -v 17 -Ocw "$file"
 ${NCDUMP} -n tmp_unlim_io2 tmp_unlim_io2.nc >tmp_unlim_io2.nc.txt
 ${NCDUMP} -n tmp_unlim_io2 "$file" >tmp_unlim_io2.${zext}.txt
 diff -b tmp_unlim_io2.nc.txt tmp_unlim_io2.${zext}.txt
-${execdir}/ncdumpchunks -v v "$file"
+${NCDUMPCHUNKS} -v v "$file"
 }
 
 testcase3() {
diff --git a/nczarr_test/test_nczarr.sh b/nczarr_test/test_nczarr.sh
index 3e40535613..c79b5e132e 100755
--- a/nczarr_test/test_nczarr.sh
+++ b/nczarr_test/test_nczarr.sh
@@ -24,14 +24,14 @@ else
 fi
 
 # Fix execdir
-EXECDIR="${execdir}/../nczarr_test"
+NCZARRDIR="${execdir}/../nczarr_test"
 
-ZMD="${EXECDIR}/${DL}zmapio"
-S3UTIL="${EXECDIR}/${DL}s3util"
-ZS3PARSE="${EXECDIR}/${DL}zs3parse"
-NCDUMPCHUNKS="${EXECDIR}/${DL}ncdumpchunks"
-ZHEX="${EXECDIR}/${DL}zhex"
-ZISJSON="${EXECDIR}/${DL}zisjson"
+ZMD="${NCZARRDIR}/${DL}zmapio"
+S3UTIL="${NCZARRDIR}/${DL}s3util"
+ZS3PARSE="${NCZARRDIR}/${DL}zs3parse"
+NCDUMPCHUNKS="${NCZARRDIR}/${DL}ncdumpchunks"
+ZHEX="${NCZARRDIR}/${DL}zhex"
+ZISJSON="${NCZARRDIR}/${DL}zisjson"
 
 # Check settings
 checksetting() {
@@ -176,7 +176,7 @@ resetrc() {
 }
 
 s3sdkdelete() {
-if test -f ${execdir}/s3util ; then
+if test -f ${S3UTIL} ; then
   ${S3UTIL} ${PROFILE} -u "${NCZARR_S3_TEST_URL}" -k "$1" clear
 elif which aws ; then
   aws s3api delete-object --endpoint-url=https://${NCZARR_S3_TEST_HOST} --bucket=${NCZARR_S3_TEST_BUCKET} --key="/${S3ISOPATH}/$1"
@@ -186,7 +186,7 @@ fi
 }
 
 s3sdkcleanup() {
-if test -f ${execdir}/s3util ; then
+if test -f ${S3UTIL} ; then
   ${S3UTIL} ${PROFILE} -u "${NCZARR_S3_TEST_URL}" -k "$1" clear
 elif which aws ; then
   aws s3api delete-object --endpoint-url=https://${NCZARR_S3_TEST_HOST} --bucket=${NCZARR_S3_TEST_BUCKET} --key="/${S3ISOPATH}/$1"