Merge branch 'master' into patch-1

Unidata · Sep 25, 2017 · 6fb871f · 6fb871f
2 parents a079381 + fde8720
commit 6fb871f
Show file tree

Hide file tree

Showing 134 changed files with 1,841 additions and 552 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -955,9 +955,7 @@ IF(ENABLE_LARGE_FILE_SUPPORT)
     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE")
     SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /LARGEADDRESSAWARE")
   ELSE()
-    SET(_FILE_OFFSET_BITS 64)
-    SET(_LARGEFILE64_SOURCE TRUE)
-    SET(_LARGEFILE_SOURCE TRUE)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64")
   ENDIF()
 ENDIF()
 
@@ -1029,6 +1027,7 @@ SET(STATUS_ERANGE_FILL "OFF")
 OPTION(ENABLE_ERANGE_FILL "Enable use of fill value when out-of-range type conversion causes NC_ERANGE error." OF)
 IF(ENABLE_ERANGE_FILL)
   SET(STATUS_ERANGE_FILL "ON")
+  ADD_DEFINITIONS(-DERANGE_FILL)
 ENDIF()
 
 # Options to use a more relaxed coordinate argument boundary check
@@ -1234,6 +1233,8 @@ CHECK_INCLUDE_FILE("BaseTsd.h"  HAVE_BASETSD_H)
 CHECK_INCLUDE_FILE("stddef.h"   HAVE_STDDEF_H)
 CHECK_INCLUDE_FILE("memory.h"  HAVE_MEMORY_H)
 CHECK_INCLUDE_FILE("string.h"  HAVE_STRING_H)
+CHECK_INCLUDE_FILE("winsock2.h" HAVE_WINSOCK2_H)
+CHECK_INCLUDE_FILE("ftw.h"  HAVE_FTW_H)
 
 CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -7,8 +7,14 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.5.0 - TBD
 
-### 4.5.0-rc2 - TBD
+* [Bug Fix] Corrected an issue when subsetting a netcdf3 file via `nccopy -v/-V`. See [Github #425](https://github.com/Unidata/netcdf-c/issues/425) and [Github #463](https://github.com/Unidata/netcdf-c/issues/463) for more information.
+* [Bug Fix] Corrected `--has-dap` and `--has-dap4` output for cmake-based builds. See [GitHub #473](https://github.com/Unidata/netcdf-c/pull/473) for more information.
+* [Bug Fix] Corrected an issue where `NC_64BIT_DATA` files were being read incorrectly by ncdump, despite the data having been written correctly.  See [GitHub #457](https://github.com/Unidata/netcdf-c/issues/457) for more information.
+* [Bug Fix] Corrected a potential stack buffer overflow.  See [GitHub #450](https://github.com/Unidata/netcdf-c/pull/450) for more information.
 
+### 4.5.0-rc2 - August 7, 2017
+
+* [Bug Fix] Addressed an issue with how cmake was implementing large file support on 32-bit systems. See [GitHub #385](https://github.com/Unidata/netcdf-c/issues/385) for more information.
 * [Bug Fix] Addressed an issue where ncgen would not respect keyword case. See [GitHub #310](https://github.com/Unidata/netcdf-c/issues/310) for more information.
 
 ### 4.5.0-rc1 - June 5, 2017

diff --git a/cf b/cf
@@ -111,7 +111,6 @@ FLAGS="$FLAGS --enable-logging"
 #FLAGS="$FLAGS --enable-jna"
 #FLAGS="$FLAGS --disable-properties-attribute"
 #FLAGS="$FLAGS --disable-silent-rules"
-#FLAGS="$FLAGS --enable-dap4"
 #FLAGS="$FLAGS --with-testservers=remotestserver.localhost:8083"
 
 if test "x$PAR4" != x1 ; then

diff --git a/cf.cmake b/cf.cmake
@@ -1,5 +1,14 @@
 # Visual Studio
 VS=1
+#VSSETUP=1
+
+#export NCPATHDEBUG=1
+
+if test "x$VSSETUP" = x1 ; then
+CFG="Debug"
+else
+CFG="Release"
+fi
 
 # Is netcdf-4 and/or DAP enabled?
 NC4=1
@@ -33,13 +42,13 @@ NCLIB=`pwd`
 
 if test "x$VS" != x ; then
 # Visual Studio
-#CFG="RelWithDebInfo"
-CFG="Release"
 NCLIB="${NCLIB}/build/liblib/$CFG"
 export PATH="${NCLIB}:${PATH}"
 cmake $FLAGS ..
+if test "x$VSSETUP" = x ; then
 cmake --build . --config ${CFG}
 cmake --build . --config ${CFG} --target RUN_TESTS
+fi
 else
 # GCC
 NCLIB="${NCLIB}/build/liblib"

diff --git a/config.h.cmake.in b/config.h.cmake.in
@@ -13,7 +13,12 @@
    * https://stackoverflow.com/questions/1372480/c-redefinition-header-files-winsock2-h
 
    */
+
+#cmakedefine HAVE_WINSOCK2_H
+
+#ifdef HAVE_WINSOCK2_H
    #define _WINSOCKAPI_
+#endif
 
    #if _MSC_VER>=1900
      #define STDC99
@@ -358,6 +363,9 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have the <string.h> header file. */
 #cmakedefine HAVE_STRING_H 1
 
+/* Define to 1 if you have the <ftw.h> header file. */
+#cmakedefine HAVE_FTW_H 1
+
 /* Define to 1 if you have the `strlcat' function. */
 #cmakedefine HAVE_STRLCAT 1
 

diff --git a/configure.ac b/configure.ac
@@ -790,6 +790,9 @@ AC_CHECK_HEADERS([sys/resource.h])
 # Check for <stdbool.h> that conforms to C99 requirements
 AC_HEADER_STDBOOL
 
+# See if we have ftw.h to walk directory trees
+AC_CHECK_HEADERS([ftw.h])
+
 # Check for these functions...
 AC_CHECK_FUNCS([strlcat strerror snprintf strchr strrchr strcat strcpy \
                 strdup strcasecmp strtod strtoll strtoull strstr \
@@ -804,11 +807,10 @@ AC_ARG_ENABLE([diskless],
 test "x$enable_diskless" = xno || enable_diskless=yes
 AC_MSG_RESULT($enable_diskless)
 
-# Check for enable DAP
-if test "x$enable_dap" = "xyes" -a "xenable_diskless" = xno  ; then
-AC_MSG_NOTICE([--enable-dap requires --enable-diskless])
-AC_MSG_NOTICE([dap support disabled])
-enable_dap=no
+# If DAP enabled and diskless not enabled, then warn of consequences
+if test "x$enable_dap" = "xyes" -a "x$enable_diskless" = xno  ; then
+AC_MSG_NOTICE([Warning: DAP support is enabled but diskless support is disabled.])
+AC_MSG_NOTICE([=> temporary files will be created + reclaimed when using DAP.])
 fi
 
 # disable dap4 if netcdf-4 is disabled
@@ -1190,6 +1192,7 @@ if test "x$enable_erange_fill" = xyes ; then
    else
       M4FLAGS="$M4FLAGS -DERANGE_FILL"
    fi
+   AC_DEFINE([ERANGE_FILL], [1], [if true, use _FillValue for NC_ERANGE data elements])
 fi
 AC_SUBST(M4FLAGS)
 

diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt
@@ -2,7 +2,6 @@ SET(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 
 remove_definitions(-DDLL_EXPORT)
 
-
 ADD_SUBDIRECTORY(baseline)
 ADD_SUBDIRECTORY(baselineraw)
 ADD_SUBDIRECTORY(baselineremote)

diff --git a/dap4_test/baseline/CMakeLists.txt b/dap4_test/baseline/CMakeLists.txt
@@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/dap4_test/baseline/test_struct1.nc.d4d b/dap4_test/baseline/test_struct1.nc.d4d
@@ -6,7 +6,6 @@ types:
   }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct1.nc.d4m b/dap4_test/baseline/test_struct1.nc.d4m
@@ -6,7 +6,6 @@ types:
   }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct1.nc.d4p b/dap4_test/baseline/test_struct1.nc.d4p
@@ -11,10 +11,7 @@
     </Structure>
   </Types>
   <Variables>
-    <Struct name="s" type="/s">
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
-    </Struct>
+    <Struct name="s" type="/s"/>
   </Variables>
   <Attribute name="_DAP4_Little_Endian" type="UInt8">
     <Value value="1"/>

diff --git a/dap4_test/baseline/test_struct_array.6.nc.d4d b/dap4_test/baseline/test_struct_array.6.nc.d4d
@@ -8,7 +8,6 @@ dimensions:
 	_Anonymous2 = 2 ;
 variables:
 	s_t s(_Anonymous2, _Anonymous2) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		string :_dap4.ce = "/s[0:2:3][0:1]" ;

diff --git a/dap4_test/baseline/test_struct_array.6.nc.d4m b/dap4_test/baseline/test_struct_array.6.nc.d4m
@@ -8,7 +8,6 @@ dimensions:
 	_Anonymous2 = 2 ;
 variables:
 	s_t s(_Anonymous2, _Anonymous2) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		string :_dap4.ce = "/s[0:2:3][0:1]" ;

diff --git a/dap4_test/baseline/test_struct_array.6.nc.d4p b/dap4_test/baseline/test_struct_array.6.nc.d4p
@@ -17,8 +17,6 @@
     <Struct name="s" type="/s">
       <Dim name="/_Anonymous2"/>
       <Dim name="/_Anonymous2"/>
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
     </Struct>
   </Variables>
   <Attribute name="_dap4.ce" type="String">

diff --git a/dap4_test/baseline/test_struct_array.nc.d4d b/dap4_test/baseline/test_struct_array.nc.d4d
@@ -9,7 +9,6 @@ dimensions:
 	dy = 3 ;
 variables:
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_array.nc.d4m b/dap4_test/baseline/test_struct_array.nc.d4m
@@ -9,7 +9,6 @@ dimensions:
 	dy = 3 ;
 variables:
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_array.nc.d4p b/dap4_test/baseline/test_struct_array.nc.d4p
@@ -18,8 +18,6 @@
     <Struct name="s" type="/s">
       <Dim name="/dx"/>
       <Dim name="/dy"/>
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
     </Struct>
   </Variables>
   <Attribute name="_DAP4_Little_Endian" type="UInt8">

diff --git a/dap4_test/baseline/test_struct_array.syn.d4d b/dap4_test/baseline/test_struct_array.syn.d4d
@@ -11,7 +11,7 @@ variables:
 	float z(dx) ;
 	float t(dy) ;
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/z", "/t" ;
+ 		string s:_edu.ucar.maps = "/z", "/t" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_array.syn.d4m b/dap4_test/baseline/test_struct_array.syn.d4m
@@ -11,7 +11,7 @@ variables:
 	float z(dx) ;
 	float t(dy) ;
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/z", "/t" ;
+ 		string s:_edu.ucar.maps = "/z", "/t" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_nested.nc.d4d b/dap4_test/baseline/test_struct_nested.nc.d4d
@@ -14,7 +14,6 @@ types:
   }; // x_t
 variables:
 	x_t x ;
-		string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_nested.nc.d4m b/dap4_test/baseline/test_struct_nested.nc.d4m
@@ -14,7 +14,6 @@ types:
   }; // x_t
 variables:
 	x_t x ;
-		string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_nested.nc.d4p b/dap4_test/baseline/test_struct_nested.nc.d4p
@@ -19,10 +19,7 @@
     </Structure>
   </Types>
   <Variables>
-    <Struct name="x" type="/x">
-      <Map name="/x_field1.x"/>
-      <Map name="/x_field1.y"/>
-    </Struct>
+    <Struct name="x" type="/x"/>
   </Variables>
   <Attribute name="_DAP4_Little_Endian" type="UInt8">
     <Value value="1"/>

diff --git a/dap4_test/baseline/test_struct_type.nc.d4d b/dap4_test/baseline/test_struct_type.nc.d4d
@@ -6,7 +6,6 @@ types:
   }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_type.nc.d4m b/dap4_test/baseline/test_struct_type.nc.d4m
@@ -6,7 +6,6 @@ types:
   }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baseline/test_struct_type.nc.d4p b/dap4_test/baseline/test_struct_type.nc.d4p
@@ -11,10 +11,7 @@
     </Structure>
   </Types>
   <Variables>
-    <Struct name="s" type="/s">
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
-    </Struct>
+    <Struct name="s" type="/s"/>
   </Variables>
   <Attribute name="_DAP4_Little_Endian" type="UInt8">
     <Value value="1"/>

diff --git a/dap4_test/baselineraw/CMakeLists.txt b/dap4_test/baselineraw/CMakeLists.txt
@@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/dap4_test/baselineraw/test_struct1.nc.dmp b/dap4_test/baselineraw/test_struct1.nc.dmp
@@ -6,7 +6,6 @@ types:
   }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baselineraw/test_struct_array.6.nc.dmp b/dap4_test/baselineraw/test_struct_array.6.nc.dmp
@@ -8,7 +8,6 @@ dimensions:
 	_Anonymous2 = 2 ;
 variables:
 	s_t s(_Anonymous2, _Anonymous2) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		string :_dap4.ce = "/s[0:2:3][0:1]" ;

diff --git a/dap4_test/baselineraw/test_struct_array.nc.dmp b/dap4_test/baselineraw/test_struct_array.nc.dmp
@@ -9,7 +9,6 @@ dimensions:
 	dy = 3 ;
 variables:
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baselineraw/test_struct_nested.nc.dmp b/dap4_test/baselineraw/test_struct_nested.nc.dmp
@@ -14,7 +14,6 @@ types:
   }; // x_t
 variables:
 	x_t x ;
-		string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baselineraw/test_struct_type.nc.dmp b/dap4_test/baselineraw/test_struct_type.nc.dmp
@@ -6,7 +6,6 @@ types:
   }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;
 
 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;

diff --git a/dap4_test/baselineremote/CMakeLists.txt b/dap4_test/baselineremote/CMakeLists.txt
@@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/dap4_test/cdltestfiles/CMakeLists.txt b/dap4_test/cdltestfiles/CMakeLists.txt
@@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/dap4_test/daptestfiles/CMakeLists.txt b/dap4_test/daptestfiles/CMakeLists.txt
@@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/dap4_test/daptestfiles/test_atomic_array.nc.dap b/dap4_test/daptestfiles/test_atomic_array.nc.dap
diff --git a/dap4_test/daptestfiles/test_atomic_array.syn.dap b/dap4_test/daptestfiles/test_atomic_array.syn.dap
diff --git a/dap4_test/daptestfiles/test_atomic_types.nc.dap b/dap4_test/daptestfiles/test_atomic_types.nc.dap
diff --git a/dap4_test/daptestfiles/test_atomic_types.syn.dap b/dap4_test/daptestfiles/test_atomic_types.syn.dap
diff --git a/dap4_test/daptestfiles/test_enum.nc.dap b/dap4_test/daptestfiles/test_enum.nc.dap
diff --git a/dap4_test/daptestfiles/test_enum_2.nc.dap b/dap4_test/daptestfiles/test_enum_2.nc.dap
diff --git a/dap4_test/daptestfiles/test_enum_array.4.nc.dap b/dap4_test/daptestfiles/test_enum_array.4.nc.dap
diff --git a/dap4_test/daptestfiles/test_enum_array.nc.dap b/dap4_test/daptestfiles/test_enum_array.nc.dap
diff --git a/dap4_test/daptestfiles/test_struct1.nc.dap b/dap4_test/daptestfiles/test_struct1.nc.dap
diff --git a/dap4_test/daptestfiles/test_struct_array.6.nc.dap b/dap4_test/daptestfiles/test_struct_array.6.nc.dap
diff --git a/dap4_test/daptestfiles/test_struct_array.nc.dap b/dap4_test/daptestfiles/test_struct_array.nc.dap
diff --git a/dap4_test/daptestfiles/test_struct_nested.nc.dap b/dap4_test/daptestfiles/test_struct_nested.nc.dap
diff --git a/dap4_test/daptestfiles/test_struct_type.nc.dap b/dap4_test/daptestfiles/test_struct_type.nc.dap
diff --git a/dap4_test/dmrtestfiles/CMakeLists.txt b/dap4_test/dmrtestfiles/CMakeLists.txt
@@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/dap4_test/dmrtestfiles/test_atomic_array.nc.dmr b/dap4_test/dmrtestfiles/test_atomic_array.nc.dmr
@@ -51,7 +51,7 @@
     </Opaque>
     <Enum name="primary_cloud" enum="/cloud_class_t">
         <Dim name="/d5"/>
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
             <Value value="Missing"/>
         </Attribute>
     </Enum>

diff --git a/dap4_test/dmrtestfiles/test_atomic_array.syn.dmr b/dap4_test/dmrtestfiles/test_atomic_array.syn.dmr
@@ -51,7 +51,7 @@
     </Opaque>
     <Enum name="primary_cloud" enum="/cloud_class_t">
         <Dim name="/d5"/>
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
             <Value value="Missing"/>
         </Attribute>
     </Enum>