f0

CMakeLists.txt

@@ -1877,7 +1877,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/s3cleanup.in ${CMAKE_CURRENT_BINARY_D
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/s3gc.in ${CMAKE_CURRENT_BINARY_DIR}/s3gc.sh @ONLY NEWLINE_STYLE LF)
 
 #####
-# Build and copy nc_test4/findplugin.sh to various places
+# Transfer files from a single source to directories that use it.
 #####
 foreach(CC nc_test4 nczarr_test v3_nczarr_test plugins h5_test examples/C)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plugins/findplugin.in ${CMAKE_CURRENT_BINARY_DIR}/${CC}/findplugin.sh @ONLY NEWLINE_STYLE LF)
@@ -1902,6 +1902,11 @@ if(NETCDF_ENABLE_TESTS)
     #####
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/pingurl.c ${CMAKE_CURRENT_BINARY_DIR}/dap4_test/pingurl4.c @ONLY NEWLINE_STYLE LF)
 
+    #####
+    # Build v3_nczarr_test/test_nczarr.sh
+    #####
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nczarr_test/test_nczarr.sh ${CMAKE_CURRENT_BINARY_DIR}/v3_nczarr_test/test_nczarr.sh @ONLY NEWLINE_STYLE LF)
+
     #####
     # Build CTestCustom.cmake to cleanup S3 after tests are done.
     #####

configure.ac

@@ -2367,7 +2367,7 @@ AC_MSG_NOTICE([generating header files and makefiles])
 AC_CONFIG_FILES(test_common.sh:test_common.in)
 AC_CONFIG_FILES(s3cleanup.sh:s3cleanup.in, [chmod ugo+x s3cleanup.sh])
 AC_CONFIG_FILES(s3gc.sh:s3gc.in, [chmod ugo+x s3gc.sh])
-for FP in plugins nc_test4 nczarr_test h5_test examples/C ; do
+for FP in plugins nc_test4 nczarr_test v3_nczarr_test h5_test examples/C ; do
 AC_CONFIG_FILES(${FP}/findplugin.sh:plugins/findplugin.in, [chmod ugo+x ${FP}/findplugin.sh])
 done
 AC_CONFIG_FILES(ncdap_test/findtestserver.c:ncdap_test/findtestserver.c.in, [chmod ugo+x ncdap_test/findtestserver.c])
@@ -2388,11 +2388,6 @@ AC_CONFIG_FILES(nczarr_test/test_filter_repeat.c:nc_test4/test_filter_repeat.c)
 AC_CONFIG_FILES(nczarr_test/test_filter_order.c:nc_test4/test_filter_order.c)
 AC_CONFIG_FILES([examples/C/run_par_test.sh], [chmod ugo+x examples/C/run_par_test.sh])
 AC_CONFIG_FILES([nc-config], [chmod 755 nc-config])
-
-# Config and copy into nczarr_test/v3_nczarr_test
-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

nczarr_test/run_cachetest.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
 

nczarr_test/run_chunkcases.sh

@@ -13,7 +13,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 
 set -e
 

nczarr_test/run_corrupt.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
 

nczarr_test/run_external.sh

@@ -5,7 +5,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 set -e
 
-. "${builddir}/test_nczarr.sh"
+. "${srcdir}/test_nczarr.sh"
 
 s3isolate "testdir_external"
 THISDIR=`pwd`

nczarr_test/run_fillonlyz.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 bug reported in github issue 
 # https://github.com/Unidata/netcdf-c/issues/1826

nczarr_test/run_filter.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
 

nczarr_test/run_filter_misc.sh

@@ -7,7 +7,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
 if test "x$TESTNCZARR" = x1; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 fi
 
 set -e

nczarr_test/run_filter_vlen.sh

@@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
 if test "x$TESTNCZARR" = x1; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 fi
 
 set -e

nczarr_test/run_filterinstall.sh

@@ -11,7 +11,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
 if test "x$TESTNCZARR" = x1; then
-. ${builddir}/test_nczarr.sh
+. ${srcdir}/test_nczarr.sh
 fi
 
 set -e