diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-08-01 17:26:11 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-08-01 17:26:11 (GMT) |
| commit | 4486905131b9e840be564ba6519bf42fa0fd19cf (patch) | |
| tree | 6caf56da1316e9967fadf5656c911a2d664e55a3 | |
| parent | 64ffb37ff6e43966d570bc737b6fa7f96acded56 (diff) | |
| parent | 66ce984dee99b7b58ec4632fecad3b2b758d08d5 (diff) | |
| download | hdf5-4486905131b9e840be564ba6519bf42fa0fd19cf.zip hdf5-4486905131b9e840be564ba6519bf42fa0fd19cf.tar.gz hdf5-4486905131b9e840be564ba6519bf42fa0fd19cf.tar.bz2 | |
Merge branch 'develop' into develop_minor
| -rw-r--r-- | tools/test/h5diff/CMakeTests.cmake | 7 | ||||
| -rw-r--r-- | tools/test/h5jam/tellub.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index 74e3929..5aa1d1a 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -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 () diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c index e7bb561..453444d 100644 --- a/tools/test/h5jam/tellub.c +++ b/tools/test/h5jam/tellub.c @@ -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() */ |