conflicts

Unidata · Nov 27, 2022 · 7fd059f · 7fd059f
1 parent 65eca29
commit 7fd059f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am
@@ -49,7 +49,7 @@ TESTS += test_remote.sh
 endif
 endif
 
-EXTRA_DIST = CMakeLists.txt test_common.h \
+EXTRA_DIST = CMakeLists.txt test_common.h build.sh \
 	d4test_common.sh \
 	test_curlopt.sh test_data.sh test_hyrax.sh test_meta.sh \
 	test_parse.sh test_raw.sh test_remote.sh test_thredds.sh \

diff --git a/dap4_test/bt.sh.txt → dap4_test/build.sh b/dap4_test/bt.sh.txt → dap4_test/build.sh
@@ -102,7 +102,7 @@ excluded() {
 fileset() {
   local TMP x X
   # Total file set
-  TMP=`ls -1 ${srcdir}/testsrc/*.cdl`
+  TMP=`ls -1 ${srcdir}/cdltestfiles/*.cdl`
   for x in $TMP ; do
     X=`basename $x .cdl`
     F="$F $X"
@@ -142,7 +142,7 @@ build() {
     for f in $F ; do
       excluded ${f} cdl
       if test $? = 0 ; then
-          ${NCGEN} -4 -o "${srcdir}/downloads/${f}.nc" "${srcdir}/testsrc/${f}.cdl"
+          ${NCGEN} -4 -o "${srcdir}/downloads/${f}.nc" "${srcdir}/cdltestfiles/${f}.cdl"
           ${NCDUMP} "${srcdir}/downloads/${f}.nc" > ${srcdir}/downloads/${f}.ncdump
       fi
     done