summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-07-15 14:44:14 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-07-17 16:58:04 (GMT)
commitf724e867272b5316dc95c2ff90f32a10975dc850 (patch)
tree92a0bf0bd7cfd7bafa01ef3f41bb296b7042aefb /fortran/test
parentac5680ce8db5452d3705e6530a087ff927cc8687 (diff)
downloadhdf5-f724e867272b5316dc95c2ff90f32a10975dc850.zip
hdf5-f724e867272b5316dc95c2ff90f32a10975dc850.tar.gz
hdf5-f724e867272b5316dc95c2ff90f32a10975dc850.tar.bz2
HDFFV-10845 use of TARGETFILE disables auto emulator
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/CMakeTests.cmake16
1 files changed, 10 insertions, 6 deletions
diff --git a/fortran/test/CMakeTests.cmake b/fortran/test/CMakeTests.cmake
index 20fb7e3..c93b4a2 100644
--- a/fortran/test/CMakeTests.cmake
+++ b/fortran/test/CMakeTests.cmake
@@ -65,9 +65,10 @@ endif ()
set (last_test "FORTRAN_testhdf5-clear-objects")
if (HDF5_ENABLE_USING_MEMCHECKER)
- add_test (NAME FORTRAN_testhdf5_fortran COMMAND $<TARGET_FILE:testhdf5_fortran>)
+ add_test (NAME FORTRAN_testhdf5_fortran COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5_fortran>)
else ()
add_test (NAME FORTRAN_testhdf5_fortran COMMAND "${CMAKE_COMMAND}"
+ -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:testhdf5_fortran>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
@@ -85,9 +86,10 @@ set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES DEPENDS FORTRAN_testhd
#-- Adding test for testhdf5_fortran_1_8
if (HDF5_ENABLE_USING_MEMCHECKER)
- add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>)
+ add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5_fortran_1_8>)
else ()
add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND "${CMAKE_COMMAND}"
+ -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:testhdf5_fortran_1_8>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
@@ -105,9 +107,10 @@ set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES DEPENDS FORTRAN_te
#-- Adding test for fortranlib_test_F03
if (HDF5_ENABLE_USING_MEMCHECKER)
- add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND $<TARGET_FILE:fortranlib_test_F03>)
+ add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fortranlib_test_F03>)
else ()
add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND "${CMAKE_COMMAND}"
+ -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:fortranlib_test_F03>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
@@ -125,9 +128,10 @@ endif ()
#-- Adding test for vol_connector
if (HDF5_ENABLE_USING_MEMCHECKER)
- add_test (NAME FORTRAN_vol_connector COMMAND $<TARGET_FILE:vol_connector>)
+ add_test (NAME FORTRAN_vol_connector COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:vol_connector>)
else ()
add_test (NAME FORTRAN_vol_connector COMMAND "${CMAKE_COMMAND}"
+ -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:vol_connector>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
@@ -142,9 +146,9 @@ else ()
endif ()
#-- Adding test for fflush1
-add_test (NAME FORTRAN_fflush1 COMMAND $<TARGET_FILE:fflush1>)
+add_test (NAME FORTRAN_fflush1 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush1>)
set_tests_properties (FORTRAN_fflush1 PROPERTIES DEPENDS FORTRAN_testhdf5-clear-objects)
#-- Adding test for fflush2
-add_test (NAME FORTRAN_fflush2 COMMAND $<TARGET_FILE:fflush2>)
+add_test (NAME FORTRAN_fflush2 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush2>)
set_tests_properties (FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1)
span class='column5'>| | | | | | | | | Purpose: Potential bug fix Description: In H5Fget_filesize, file size was returned as haddr_t. Change it to hsize_t and return it as parameter to make fortran interface easier. Platforms tested: fuss(simple change). * [svn-r8817] Purpose:Xuan Bai2004-07-071-1/+1 | | | | | | | | | | | | | | | | | | Bug Fix. Description: nh5zget_filter_info_c function was not declcared as H5_FCDLL, which is required for fortran dll in Windows. _H5ZGET_FILTER_INFO_C is considered as an unresolved external symbol by Fortran Compiler in Windows without H5_FCDLL. Solution: Added H5_FCDLL for nh5zget_filter_info_c function. Platforms tested: DEC Fortran 6.0 in Windows XP. Misc. update: * [svn-r8816] Purpose: Remove filesBinh-Minh Ribler2004-07-076-0/+0 | | | | | | | | | | Description: These data files are generated by the example programs and shouldn't need to be in the CVS. Removed them. Platforms tested: SunOS 5.7 (arabica) Linux 2.4 (eirene) * [svn-r8813] Purpose:Pedro Vicente Nunes2004-07-062-5/+6 | | | | | | | | | | | | | | bug fix Description: one run from the tests had a wrong dataset name Solution: Platforms tested: linux (small ) Misc. update: * [svn-r8812] Purpose:Pedro Vicente Nunes2004-07-0624-259/+2697 | | | | | | | | | | | | | | | | | | h5dump new tests Description: added new tests for the -p option, superblock, file contents, fill values, array indices. Solution: Platforms tested: linux AIX solaris Misc. update: * [svn-r8809] Purpose:Xuan Bai2004-07-051-0/+0 | | | | | | | | | | | | | | | | Update projects in Windows workspace. Description: John added three files under hdf5/src. Update these files into windows workspace. Solution: 1. Added H5C.c to the source folders of hdf5 and hdf5dll projects. 2. Added H5Cprivate.h and H5Cpublic.h to the head folders of hdf5 and hdf5dll projects. Platforms tested: Microsoft Visual C++ 6.0 and DEC Fortran 6.0 in Windows XP and Windows 2000. Misc. update: * [svn-r8807] Purpose:Quincey Koziol2004-07-051-42/+43 | | | | | | | | | | | | | Code optimization Description: Don't copy layout information, just point to existing information. Platforms tested: Solaris 2.7 (arabica) FreeBSD 4.10 (sleipnir) w/parallel Too minor to require h5committest * [svn-r8805] Purpose:Quincey Koziol2004-07-051-86/+120 | | | | | | | | | | | | | | | | | Code optimization & bug fix Description: Speed up "fast comparison" lookups in trees by a factor of 2-3x Correctly handle "fast comparisons" for unsigned values (esp. hsize_t). Solution: Mostly removing if statements and redundant assigns, etc. Platforms tested: Solaris 2.7 (arabica) FreeBSD 4.10 (sleipnir) w/parallel Too minor to require h5committest * [svn-r8803] Snapshot version 1.7 release 29HDF Admin2004-07-04