summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-07-31 18:26:17 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-07-31 18:26:17 (GMT)
commit5007f822250b3e94e83f6d9af8d26721f6278261 (patch)
tree426bee35ef84e41cb52335d8e0c768866c689b44
parent50f404c887118577034c6412aeaaa1f6db2fe475 (diff)
parentfc57490e02835ddfce644135e93e893f77b379d3 (diff)
downloadhdf5-5007f822250b3e94e83f6d9af8d26721f6278261.zip
hdf5-5007f822250b3e94e83f6d9af8d26721f6278261.tar.gz
hdf5-5007f822250b3e94e83f6d9af8d26721f6278261.tar.bz2
Merge pull request #2722 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'fc57490e02835ddfce644135e93e893f77b379d3': Mingw copy disabled
-rw-r--r--tools/test/h5diff/CMakeTests.cmake7
-rw-r--r--tools/test/h5jam/tellub.c6
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() */