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
  ...

1 files changed, 15 insertions, 8 deletions

diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index 20e7f59..f0eb65f 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -53,9 +53,10 @@ add_test (
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
+  add_test (NAME PERFORM_h5perf_serial COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial>)
 else ()
   add_test (NAME PERFORM_h5perf_serial COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:h5perf_serial>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -70,13 +71,14 @@ set_tests_properties (PERFORM_h5perf_serial PROPERTIES TIMEOUT ${CTEST_VERY_LONG
 set_tests_properties (PERFORM_h5perf_serial PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
-  add_test (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
+  add_test (NAME PERFORM_h5perf_serial_alone COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial_alone>)
 endif ()
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>)
+  add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>)
 else ()
   add_test (NAME PERFORM_chunk COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:chunk>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -90,9 +92,10 @@ endif ()
 set_tests_properties (PERFORM_chunk PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>)
+  add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>)
 else ()
   add_test (NAME PERFORM_iopipe COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:iopipe>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -106,9 +109,10 @@ endif ()
 set_tests_properties (PERFORM_iopipe PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>)
+  add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>)
 else ()
   add_test (NAME PERFORM_overhead COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:overhead>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -122,9 +126,10 @@ endif ()
 set_tests_properties (PERFORM_overhead PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>)
+  add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>)
 else ()
   add_test (NAME PERFORM_perf_meta COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:perf_meta>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -138,9 +143,10 @@ endif ()
 set_tests_properties (PERFORM_perf_meta PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h")
+  add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h")
 else ()
   add_test (NAME PERFORM_zip_perf_help COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -154,9 +160,10 @@ endif ()
 set_tests_properties (PERFORM_zip_perf_help PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5)
+  add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5)
 else ()
   add_test (NAME PERFORM_zip_perf COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"