mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-03 02:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop_minor

Browse Source
This commit is contained in:
Dana Robinson 2020-08-01 10:26:11 -07:00
commit 4486905131
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/test/h5diff/CMakeTests.cmake
View File

@ -341,9 +341,10 @@
# Overwrite system dependent files (Windows) and not VS2015
#
set (COPY_WINDOWS_FILES false)
if (MINGW)
set (COPY_WINDOWS_FILES true)
endif ()
# MinGW tests may depend on host system
#if (MINGW)
# set (COPY_WINDOWS_FILES true)
#endif ()
if (WIN32 AND MSVC_VERSION LESS 1900)
set (COPY_WINDOWS_FILES true)
endif ()

6
tools/test/h5jam/tellub.c
View File

@ -71,6 +71,7 @@ parse_command_line (int argc, const char *argv[])
case 'h':
usage (h5tools_getprogname());
h5tools_setstatus(EXIT_SUCCESS);
break;
case '?':
default:
usage (h5tools_getprogname());
@ -105,7 +106,7 @@ int
main (int argc, const char *argv[])
{
char *ifname;
hid_t ifile;
hid_t ifile = H5I_INVALID_HID;
hsize_t usize;
htri_t testval;
herr_t status;
@ -165,7 +166,8 @@ main (int argc, const char *argv[])
done:
H5Pclose (plist);
H5Fclose (ifile);
if(ifile >= 0)
H5Fclose (ifile);
leave(h5tools_getstatus());
} /* end main() */