Merge pull request #2394 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'cf58730177d60fd7311582a29539d87f10a7d88e':
  Update Windows platforms
  HDFFV-11036 add release note
  HDFFV-11036 add file compare test process
  Correct usage of add_compile_definitions

CMakeLists.txt

@@ -564,9 +564,7 @@ endif ()
 set (EXE_EXT "")
 if (WIN32 OR MINGW)
   set (EXE_EXT ".exe")
-  add_compile_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
+  add_compile_definitions (_BIND_TO_CURRENT_VCLIBS_VERSION=1 _CRT_SECURE_NO_WARNINGS _CONSOLE)
-  add_compile_definitions (-D_CRT_SECURE_NO_WARNINGS)
-  add_compile_definitions (-D_CONSOLE)
 endif ()
 
 if (MSVC)

MANIFEST

@@ -3350,6 +3350,7 @@
 ./config/cmake/ConfigureChecks.cmake
 ./config/cmake/CPack.Info.plist.in
 ./config/cmake/CTestCustom.cmake
+./config/cmake/fileCompareTest.cmake
 ./config/cmake/FindHDFS.cmake
 ./config/cmake/H5cxx_config.h.in
 ./config/cmake/H5pubconf.h.in

config/cmake/fileCompareTest.cmake

@@ -0,0 +1,104 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# fileCompareTest.cmake compares two files.
+
+# arguments checking
+if (NOT TEST_FOLDER)
+  message (FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
+if (NOT TEST_ONEFILE)
+  message (FATAL_ERROR "Require TEST_ONEFILE the first file to be defined")
+endif ()
+if (NOT TEST_TWOFILE)
+  message (FATAL_ERROR "Require TEST_TWOFILE the second file to be defined")
+endif ()
+if (NOT TEST_FUNCTION)
+  message (FATAL_ERROR "Require TEST_FUNCTION (LT,LTEQ,EQ,GTEQ,GT) to be defined")
+endif ()
+#if (NOT TEST_EXPECT)
+#  message (STATUS "Require TEST_EXPECT to be defined")
+#endif ()
+
+set (TEST_ONE_SIZE 0)
+set (TEST_TWO_SIZE 0)
+set (TEST_ONE_STRING 0)
+set (TEST_TWO_STRING 0)
+set (TEST_ONE_STRING_LEN 0)
+set (TEST_TWO_STRING_LEN 0)
+
+if (TEST_STRINGS STREQUAL "YES")
+  # find the length of the first file
+  #s1=`cat $ufile | wc -c | sed -e 's/ //g'`
+  file (STRINGS ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_STRING)
+  string (LENGTH ${TEST_ONE_STRING} TEST_ONE_STRING_LEN)
+
+  # Get the size of the second file.
+  file (STRINGS ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_STRING)
+  string (LENGTH ${TEST_TWO_STRING} TEST_TWO_STRING_LEN)
+
+  math (EXPR TEST_STRING_SIZE "${TEST_ONE_STRING_LEN} - ${TEST_TWO_STRING_LEN}" )
+
+  # now compare the outputs
+  execute_process (
+      COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_ONEFILE} ${TEST_FOLDER}/${TEST_TWOFILE}
+      RESULT_VARIABLE TEST_RESULT
+  )
+
+  message (STATUS "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}-${TEST_O_STRING_LEN}")
+  # if the return value is !=${TEST_EXPECT} bail out
+  if (NOT TEST_RESULT EQUAL TEST_EXPECT)
+    message (FATAL_ERROR "Failed: The output of ${TEST_FOLDER}/${TEST_ONEFILE} did not match ${TEST_FOLDER}/${TEST_TWOFILE}.\n${TEST_ERROR}")
+  endif ()
+else ()
+  if (CMAKE_VERSION VERSION_LESS "3.14.0")
+    message (FATAL_ERROR "CANNOT get file size, file command SIZE not supported")
+  else ()
+    file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
+    file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
+    if (TEST_FUNCTION MATCHES "LT")
+      if (TEST_ONE_SIZE LESS TEST_TWO_SIZE)
+        message (STATUS "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less ${TEST_FOLDER}/${TEST_TWOFILE}")
+      else ()
+        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less ${TEST_FOLDER}/${TEST_TWOFILE}")
+      endif ()
+    elseif (TEST_FUNCTION MATCHES "LTEQ")
+      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+        message (STATUS "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      else ()
+        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      endif ()
+    elseif (TEST_FUNCTION MATCHES "EQ")
+      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+        message (STATUS "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      else ()
+        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      endif ()
+    elseif (TEST_FUNCTION MATCHES "GTEQ")
+      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+        message (STATUS "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      else ()
+        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      endif ()
+    elseif (TEST_FUNCTION MATCHES "GT")
+      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+        message (STATUS "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+      else ()
+        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+      endif ()
+    else ()
+      message (FATAL_ERROR "Failed: Incorrect test size compare command provided.\n${TEST_ERROR}")
+    endif ()
+  endif ()
+endif ()
+
+# everything went fine...
+

config/cmake/userblockTest.cmake

@@ -54,7 +54,7 @@ if (TEST_CHECKUB STREQUAL "YES")
     # 'tellub' calls H5Fget_user_block to get the size
     #  of the user block
     #s2=`$JAM_BIN/tellub $origfile`
-    EXECUTE_PROCESS (
+    execute_process (
         COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
@@ -72,7 +72,7 @@ if (TEST_CHECKUB STREQUAL "YES")
 
   if (TEST_O_STRING_LEN)
     #$JAM_BIN/getub -c $s2 $origfile > $cmpfile
-    EXECUTE_PROCESS (
+    execute_process (
         COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
@@ -90,7 +90,7 @@ if (TEST_CHECKUB STREQUAL "YES")
   endif ()
 
   #$JAM_BIN/getub -c $size $hfile > $tfile
-  EXECUTE_PROCESS (
+  execute_process (
       COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_STRING_SIZE} ${TEST_HFILE}
       WORKING_DIRECTORY ${TEST_FOLDER}
       RESULT_VARIABLE TEST_RESULT
@@ -101,7 +101,7 @@ if (TEST_CHECKUB STREQUAL "YES")
   )
 
   # now compare the outputs
-  EXECUTE_PROCESS (
+  execute_process (
       COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
       RESULT_VARIABLE TEST_RESULT
   )
@@ -114,7 +114,7 @@ if (TEST_CHECKUB STREQUAL "YES")
 else ()
     # call 'ubsize' to get the size of the user block
     #ubsize=`$JAM_BIN/tellub $hfile`
-    EXECUTE_PROCESS (
+    execute_process (
         COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_HFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_H_STRING_LEN

release_docs/RELEASE.txt

@@ -48,6 +48,13 @@ New Features
 
     Configuration:
     -------------
+    - Added test script for file size compare
+
+      if CMake minimum version is at least 3.14, the fileCompareTest.cmake
+      script will compare file sizes.
+
+      (ADB - 2020/02/24, HDFFV-11036)
+
     - Update CMake minimum version to 3.12
 
       Updated CMake minimum version to 3.12 and added version checks
@@ -894,7 +901,7 @@ Bug Fixes since HDF5-1.10.3 release
       (MSB, 2018/1/8, HDFFV-10443)
 
     - Corrected INTERFACE INTENT(IN) to INTENT(OUT) for buf_size in h5fget_file_image_f.
-    
+
       (MSB - 2020/2/18, HDFFV-11029)
 
     Tools
@@ -1215,12 +1222,8 @@ Supported Platforms
     (emu)                         Sun Fortran 95 8.6 SunOS_sparc
                                   Sun C++ 5.12 SunOS_sparc
 
-    Windows 7                     Visual Studio 2015 w/ Intel Fortran 18 (cmake)
-
     Windows 7 x64                 Visual Studio 2015 w/ Intel C, Fortran 2018 (cmake)
-                                  Visual Studio 2015 w/ MSMPI 8 (cmake)
+                                  Visual Studio 2015 w/ MSMPI 10 (cmake)
-
-    Windows 10                    Visual Studio 2015 w/ Intel Fortran 18 (cmake)
 
     Windows 10 x64                Visual Studio 2015 w/ Intel Fortran 18 (cmake)
                                   Visual Studio 2017 w/ Intel Fortran 19 (cmake)

tools/test/h5repack/CMakeTests.cmake

@@ -638,12 +638,16 @@
   macro (ADD_H5_TEST_META testname testfile)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5REPACK_META-${testname}_N-clear-objects
+          NAME H5REPACK_META-${testname}-clear-objects
           COMMAND ${CMAKE_COMMAND} -E remove
               testfiles/out-${testname}_N.${testname}.h5
+              testfiles/out-${testname}_N.${testname}.out
+              testfiles/out-${testname}_N.${testname}.out.err
               testfiles/out-${testname}_M.${testname}.h5
+              testfiles/out-${testname}_M.${testname}.out
+              testfiles/out-${testname}_M.${testname}.out.err
       )
-      set_tests_properties (H5REPACK_META-${testname}_N-clear-objects PROPERTIES
+      set_tests_properties (H5REPACK_META-${testname}-clear-objects PROPERTIES
           FIXTURES_REQUIRED clear_h5repack
       )
       add_test (
@@ -651,21 +655,61 @@
           COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_file_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5
       )
       set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES
-          DEPENDS H5REPACK_META-${testname}_N-clear-objects
+          DEPENDS H5REPACK_META-${testname}-clear-objects
+      )
+      add_test (
+          NAME H5REPACK_META-${testname}_N_DFF
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_file_ext}>"
+              -D "TEST_ARGS:STRING=-v;${testfile};out-${testname}_N.${testname}.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=out-${testname}_N.${testname}.out"
+              -D "TEST_EXPECT=0"
+              -D "TEST_REFERENCE=out-${testname}_N.${testname}.txt"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5REPACK_META-${testname}_N_DFF PROPERTIES
+          DEPENDS H5REPACK_META-${testname}_N
       )
       add_test (
           NAME H5REPACK_META-${testname}_M
           COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_file_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5
       )
       set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES
-          DEPENDS H5REPACK_META-${testname}_N
+          DEPENDS H5REPACK_META-${testname}_N_DFF
       )
-
+      add_test (
-      add_test (NAME H5REPACK_META-${testname} COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5 ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5)
+          NAME H5REPACK_META-${testname}_M_DFF
-      set_tests_properties (H5REPACK_META-${testname} PROPERTIES
+          COMMAND "${CMAKE_COMMAND}"
-          WILL_FAIL "true"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_file_ext}>"
+              -D "TEST_ARGS:STRING=-v;${testfile};out-${testname}_M.${testname}.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=out-${testname}_M.${testname}.out"
+              -D "TEST_EXPECT=0"
+              -D "TEST_REFERENCE=out-${testname}_M.${testname}.txt"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5REPACK_META-${testname}_M_DFF PROPERTIES
           DEPENDS H5REPACK_META-${testname}_M
       )
+      add_test (NAME H5REPACK_META-${testname}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_ONEFILE=out-${testname}_N.${testname}.out"
+              -D "TEST_TWOFILE=out-${testname}_M.${testname}.h5"
+              -D "TEST_FUNCTION=LTEQ"
+              -P "${HDF_RESOURCES_DIR}/fileCompareTest.cmake"
+      )
+      if (CMAKE_VERSION VERSION_LESS "3.14.0")
+        set_tests_properties (H5REPACK_META-${testname} PROPERTIES
+            DISABLED "true"
+        )
+      endif ()
+      set_tests_properties (H5REPACK_META-${testname} PROPERTIES
+          DEPENDS H5REPACK_META-${testname}_M_DFF
+      )
   endmacro ()
 
   macro (ADD_H5_UD_TEST testname resultcode resultfile)