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

* commit 'e19b0302cc38d1850ada7a00431511343cddc8a6': (31 commits)
  HDFFV-10845 update note
  Correct format of drive check
  Use generator expr to get correct name
  HDFFV-10845 Allow mingw to find functionality
  HDFFV-10845 fix comment syntax
  HDFFV-10845 Windows drive can only goto Z
  HDFFV-10845 make flags private
  Correct java load library name access
  Correct syntax
  Fix typo
  Correct OUTPUT_NAME usage
  CMake generator expr cannot be used in get_property cmd
  HDFFV-1045 gcc static must be link flags
  HDFFV-10845 quote multiple strings in cmake link command
  HDFFV-10845 update mingw cmake changes
  Add missing target root path, check other export macro
  HDFFV-10845 skip test if CMake command doesn't support ignore EOL
  HDFFV-10845 copy files with windows EOL
  HDFFV-10845 separate test used by copy windows files
  HDFFV-10845 mingw needs special windows reference files
  ...

8 files changed, 30 insertions, 21 deletions

diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index 0269ba8..e819e58 100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@@ -72,7 +72,7 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
   ## Uncompress source if tar or zip file provided
   ## --------------------------
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
     message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
     execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
   else ()
@@ -101,6 +101,11 @@ endif ()
 include (ProcessorCount)
 ProcessorCount (N)
 if (NOT N EQUAL 0)
+  if (MAX_PROC_COUNT)
+    if (N GREATER MAX_PROC_COUNT)
+      set (N ${MAX_PROC_COUNT})
+    endif ()
+  endif ()
   if (NOT WIN32)
     set (CTEST_BUILD_FLAGS -j${N})
   endif ()
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index c1abeed..3bd0553 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -102,7 +102,7 @@ endif ()
 CHECK_FUNCTION_EXISTS (difftime          ${HDF_PREFIX}_HAVE_DIFFTIME)
 
 # Find the library containing clock_gettime()
-if (NOT WINDOWS)
+if (MINGW OR NOT WINDOWS)
   CHECK_FUNCTION_EXISTS (clock_gettime CLOCK_GETTIME_IN_LIBC)
   CHECK_LIBRARY_EXISTS (rt clock_gettime "" CLOCK_GETTIME_IN_LIBRT)
   CHECK_LIBRARY_EXISTS (posix4 clock_gettime "" CLOCK_GETTIME_IN_LIBPOSIX4)
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index 44ac15b..fa687f5 100644
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@@ -49,7 +49,7 @@ endif ()
 
 message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")
 
-if (WIN32 AND NOT MINGW)
+if (WIN32 OR MINGW)
   set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
 else ()
   set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -124,9 +124,11 @@ message (STATUS "COMMAND Error: ${TEST_ERROR}")
 # compare output files to references unless this must be skipped
 if (NOT TEST_SKIP_COMPARE)
   if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
-    if (WIN32 AND NOT MINGW)
-      file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-      file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+    if (WIN32 OR MINGW)
+      configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+      file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+      #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+      #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
     endif ()
 
     if (NOT TEST_SORT_COMPARE)
@@ -186,9 +188,11 @@ if (NOT TEST_SKIP_COMPARE)
 
   # now compare the .err file with the error reference, if supplied
   if (TEST_ERRREF)
-    if (WIN32 AND NOT MINGW)
-      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
+    if (WIN32 OR MINGW)
+      configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
+      file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+      #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+      #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
     endif ()
 
     # now compare the error output with the error reference
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index e1fe85a..dc3939e 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -69,7 +69,7 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
   ## Uncompress source if tar file provided
   ## --------------------------
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
     message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
     execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
   else ()
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 44ed531..e6c9619 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -90,7 +90,7 @@ endif ()
 
 set (CTEST_BINARY_NAME "build")
 set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")
-if (WIN32)
+if (WIN32 AND NOT MINGW)
   set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
   set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
 else ()
@@ -104,7 +104,7 @@ if (NOT DEFINED HPC)
   if (NOT DEFINED BUILD_GENERATOR)
     message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
   endif ()
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
     set (SITE_OS_NAME "Windows")
     set (SITE_OS_VERSION "WIN7")
     if (BUILD_GENERATOR STREQUAL "VS201764")
@@ -212,7 +212,7 @@ set (REPOSITORY_BRANCH "develop")
 
 ###################################################################
 
-if (WIN32)
+if (WIN32 AND NOT MINGW)
   set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")
   include (${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)
   include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake
index 0e9d01b..c9fc36f 100644
--- a/config/cmake/userblockTest.cmake
+++ b/config/cmake/userblockTest.cmake
@@ -55,7 +55,7 @@ if (TEST_CHECKUB STREQUAL "YES")
     #  of the user block
     #s2=`$JAM_BIN/tellub $origfile`
     EXECUTE_PROCESS (
-        COMMAND ${TEST_PROGRAM} ${TEST_OFILE}
+        COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
         OUTPUT_FILE ${TEST_HFILE}.len.txt
@@ -73,7 +73,7 @@ if (TEST_CHECKUB STREQUAL "YES")
   if (TEST_O_STRING_LEN)
     #$JAM_BIN/getub -c $s2 $origfile > $cmpfile
     EXECUTE_PROCESS (
-        COMMAND ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
+        COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
         OUTPUT_FILE ${TEST_HFILE}-ub.cmp
@@ -91,7 +91,7 @@ if (TEST_CHECKUB STREQUAL "YES")
 
   #$JAM_BIN/getub -c $size $hfile > $tfile
   EXECUTE_PROCESS (
-      COMMAND ${TEST_GET_PROGRAM} -c ${TEST_STRING_SIZE} ${TEST_HFILE}
+      COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_STRING_SIZE} ${TEST_HFILE}
       WORKING_DIRECTORY ${TEST_FOLDER}
       RESULT_VARIABLE TEST_RESULT
       OUTPUT_FILE ${TEST_HFILE}.cmp
@@ -115,7 +115,7 @@ else ()
     # call 'ubsize' to get the size of the user block
     #ubsize=`$JAM_BIN/tellub $hfile`
     EXECUTE_PROCESS (
-        COMMAND ${TEST_PROGRAM} ${TEST_HFILE}
+        COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_HFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_H_STRING_LEN
         OUTPUT_VARIABLE TEST_OUT
diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake
index 8e186e9..3556d07 100644
--- a/config/cmake/vfdTest.cmake
+++ b/config/cmake/vfdTest.cmake
@@ -36,13 +36,13 @@ endif ()
 #  set (ERROR_APPEND 1)
 #endif ()
 
-message (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+message (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
 
 set (ENV{HDF5_DRIVER} "${TEST_VFD}")
 
 # run the test program, capture the stdout/stderr and the result var
 execute_process (
-    COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
+    COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
     WORKING_DIRECTORY ${TEST_FOLDER}
     RESULT_VARIABLE TEST_RESULT
     OUTPUT_FILE ${TEST_OUTPUT}_${TEST_VFD}.out
diff --git a/config/cmake/volTest.cmake b/config/cmake/volTest.cmake
index a9dd756..6554f00 100644
--- a/config/cmake/volTest.cmake
+++ b/config/cmake/volTest.cmake
@@ -36,13 +36,13 @@ endif ()
 #  set (ERROR_APPEND 1)
 #endif ()
 
-message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
 
 set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}")
 
 # run the test program, capture the stdout/stderr and the result var
 execute_process (
-    COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
+    COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
     WORKING_DIRECTORY ${TEST_FOLDER}
     RESULT_VARIABLE TEST_RESULT
     OUTPUT_FILE ${TEST_OUTPUT}.out