rebuild1

DennisHeimbigner · Dec 21, 2024 · 16ecb4a · 16ecb4a
1 parent 6dc793b
commit 16ecb4a
Show file tree

Hide file tree

Showing 29 changed files with 35 additions and 36 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2393,6 +2393,8 @@ AC_CONFIG_FILES([nc-config], [chmod 755 nc-config])
 AC_CONFIG_FILES(nczarr_test/findplugin.sh:plugins/findplugin.in, [chmod ugo+x nczarr_test/findplugin.sh])
 AC_CONFIG_FILES(v3_nczarr_test/findplugin.sh:plugins/findplugin.in, [chmod ugo+x v3_nczarr_test/findplugin.sh])
 
+AC_CONFIG_FILES(v3_nczarr_test/test_nczarr.sh:nczarr_test/test_nczarr.sh, [])
+
 AC_CONFIG_FILES([Makefile
                  netcdf.pc
                  libnetcdf.settings

diff --git a/nczarr_test/run_interop.sh b/nczarr_test/run_interop.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -x
 set -e

diff --git a/nczarr_test/run_it_chunks1.sh b/nczarr_test/run_it_chunks1.sh
@@ -6,7 +6,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/run_jsonconvention.sh b/nczarr_test/run_jsonconvention.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/run_misc.sh b/nczarr_test/run_misc.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -x
 set -e

diff --git a/nczarr_test/run_mud.sh b/nczarr_test/run_mud.sh
@@ -12,7 +12,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 set -e
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 s3isolate "testdir_mud4"
 else
 isolate "testdir_mud4"

diff --git a/nczarr_test/run_nan.sh b/nczarr_test/run_nan.sh
@@ -8,7 +8,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 # Isolate both test and S3
 s3isolate "testdir_nan"

diff --git a/nczarr_test/run_nccopy5.sh b/nczarr_test/run_nccopy5.sh
@@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 set -e
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 s3isolate "testdir_nccopy5"
 else
 isolate testdir_ncccopy5

diff --git a/nczarr_test/run_ncgen4.sh b/nczarr_test/run_ncgen4.sh
@@ -8,7 +8,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 # Isolate both test and S3
 s3isolate "testdir_ncgen4"

diff --git a/nczarr_test/run_nczarr_fill.sh b/nczarr_test/run_nczarr_fill.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 s3isolate "testdir_nczarr_fill"
 THISDIR=`pwd`

diff --git a/nczarr_test/run_nczfilter.sh b/nczarr_test/run_nczfilter.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 # This shell script runs test_nczfilter.c
 

diff --git a/nczarr_test/run_newformat.sh b/nczarr_test/run_newformat.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/run_notzarr.sh b/nczarr_test/run_notzarr.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/run_nulls.sh b/nczarr_test/run_nulls.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/run_perf_chunks1.sh b/nczarr_test/run_perf_chunks1.sh
@@ -9,7 +9,7 @@
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 s3isolate "testdir_perf_chunks1"
 THISDIR=`pwd`

diff --git a/nczarr_test/run_purezarr.sh b/nczarr_test/run_purezarr.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/run_quantize.sh b/nczarr_test/run_quantize.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 # Construct both ISOPATH and S3ISOPATH
 s3isolate "testdir_quantize"

diff --git a/nczarr_test/run_scalar.sh b/nczarr_test/run_scalar.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/run_specific_filters.sh b/nczarr_test/run_specific_filters.sh
@@ -14,7 +14,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 set -e
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 s3isolate "testdir_specific_filters"
 THISDIR=`pwd`
 cd $ISOPATH

diff --git a/nczarr_test/run_strings.sh b/nczarr_test/run_strings.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 # This shell script tests support for the NC_STRING type
 

diff --git a/nczarr_test/run_unknown.sh b/nczarr_test/run_unknown.sh
@@ -11,7 +11,7 @@ THISDIR=`pwd`
 cd $ISOPATH
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 s3isolate
 fi
 

diff --git a/nczarr_test/run_unlim_io.sh b/nczarr_test/run_unlim_io.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 
 set -e
 

diff --git a/nczarr_test/run_ut_map.sh b/nczarr_test/run_ut_map.sh
@@ -5,7 +5,7 @@ export SETX=1
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 
 set -e
 

diff --git a/nczarr_test/run_ut_mapapi.sh b/nczarr_test/run_ut_mapapi.sh
@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 #TR="-T10"
 

diff --git a/nczarr_test/run_ut_misc.sh b/nczarr_test/run_ut_misc.sh
@@ -1,12 +1,9 @@
 #!/bin/sh
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
-. ${top_srcdir}/test_common.sh
+. ../test_common.sh
 
-echo "@@@ ${builddir}/test_nczarr.sh"
-ls -l ${builddir}/test_nczarr.sh
-
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 set -e
 

diff --git a/nczarr_test/test_nczarr.sh b/nczarr_test/test_nczarr.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# This file must kept in sync with
+#	nczarr_test/test_nczarr.sh
+# and
+#	v3_nczarr_test/test_nczarr.sh
+
 # Load only once
 if test "x$TEST_NCZARR_SH" = x ; then
 export TEST_NCZARR_SH=1

diff --git a/v3_nczarr_test/Makefile.am b/v3_nczarr_test/Makefile.am
@@ -194,7 +194,7 @@ V3DATA = ref_nczarr2zarr.cdl ref_purezarr.cdl ref_xarray.cdl ref_misc2.cdl ref_j
 
 EXTRA_DIST += ${V3FILES} ${V3DATA}
 
-DISTCLEANFILES += findplugin.sh ${TESTFILES_NCZARR} ${TESTDATA_NCZARR}
+DISTCLEANFILES += findplugin.sh test_nczarr.sh ${TESTFILES_NCZARR} ${TESTDATA_NCZARR}
 
 # Remove directories
 
@@ -220,11 +220,6 @@ TESTFILES_NCZARR_SH = run_chunkcases.sh run_corrupt.sh run_external.sh run_fillo
 
 TESTDATA_NCZARR = ref_nulls_nczarr.baseline ref_zarr_test_data.cdl.gz ref_avail1.cdl ref_byte.cdl ref_byte_fill_value_null.cdl ref_fillonly.cdl ref_misc1.cdl ref_ndims.cdl ref_newformatpure.cdl ref_nulls.cdl ref_oldformat.cdl ref_perdimspecs.cdl ref_power_901_constants.cdl ref_purezarr_base.cdl ref_quotes.cdl ref_rem.cdl ref_scalar.cdl ref_skip.cdl ref_skipw.cdl ref_string.cdl ref_t_meta_dim1.cdl ref_t_meta_var1.cdl ref_ut_mapapi_create.cdl ref_ut_mapapi_data.cdl ref_ut_mapapi_meta.cdl ref_ut_map_create.cdl ref_ut_map_writedata.cdl ref_ut_map_writemeta.cdl ref_ut_map_writemeta2.cdl ref_ut_testmap_create.cdl ref_whole.cdl ref_avail1.dmp ref_misc1.dmp ref_ndims.dmp ref_rem.dmp ref_noshape.file.zip ref_groups.h5 ref_notzarr.tar.gz ref_avail1.txt ref_skip.txt ref_ut_json_build.txt ref_ut_json_parse.txt ref_ut_mapapi_search.txt ref_ut_map_readmeta.txt ref_ut_map_readmeta2.txt ref_ut_map_search.txt ref_ut_proj.txt ref_whole.txt ref_byte.zarr.zip ref_byte_fill_value_null.zarr.zip ref_oldformat.zip ref_power_901_constants_orig.zip ref_quotes_orig.zip ref_cmip6.zmap
 
-BUILT_SOURCES += test_nczarr.sh
-test_nczarr.sh: 
-	if ! test -f "${builddir}/test_nczarr.sh" ; then \
-	    cp ${top_srcdir}/nczarr_test/test_nczarr.sh ${builddir}/test_nczarr.sh
-
 BUILT_SOURCES += testdata_nczarr.built testfiles_nczarr_sh.built testfiles_nczarr_c.built
 DISTCLEANFILES += ${BUILT_SOURCES}
 

diff --git a/v3_nczarr_test/run_mud.sh b/v3_nczarr_test/run_mud.sh
@@ -12,7 +12,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 set -e
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 s3isolate "testdir_mud4"
 else
 isolate "testdir_mud4"

diff --git a/v3_nczarr_test/run_nan.sh b/v3_nczarr_test/run_nan.sh
@@ -8,7 +8,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 # Isolate both test and S3
 s3isolate "testdir_nan"