diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-01-27 16:01:48 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-01-27 16:01:48 (GMT) |
| commit | 75da78bc7580ebb71093d077e070c3b60d59fe9f (patch) | |
| tree | 3abda93343c6f1ece3e5c17e39f3b6dbfd2ffabe | |
| parent | ba9a30fd8e56db9d72636baebb4d05bc1e646ac8 (diff) | |
| download | hdf5-75da78bc7580ebb71093d077e070c3b60d59fe9f.zip hdf5-75da78bc7580ebb71093d077e070c3b60d59fe9f.tar.gz hdf5-75da78bc7580ebb71093d077e070c3b60d59fe9f.tar.bz2 | |
[svn-r26048] HDFFV-8736: Patch H5PL.c and test for cygwin plugin support. Merged from trunk.
| -rw-r--r-- | src/H5PL.c | 6 | ||||
| -rw-r--r-- | test/test_plugin.sh.in | 12 |
2 files changed, 16 insertions, 2 deletions
@@ -406,8 +406,14 @@ H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info) /* The library we are looking for should be called libxxx.so... on Unix * or libxxx.xxx.dylib on Mac. */ +#ifndef __CYGWIN__ if(!HDstrncmp(dp->d_name, "lib", (size_t)3) && (HDstrstr(dp->d_name, ".so") || HDstrstr(dp->d_name, ".dylib"))) { +#else + if(!HDstrncmp(dp->d_name, "cyg", (size_t)3) && + HDstrstr(dp->d_name, ".dll") ) { + +#endif h5_stat_t my_stat; size_t pathname_len; htri_t found_in_dir; diff --git a/test/test_plugin.sh.in b/test/test_plugin.sh.in index b268661..a6d8c50 100644 --- a/test/test_plugin.sh.in +++ b/test/test_plugin.sh.in @@ -28,8 +28,16 @@ exit_code=$EXIT_SUCCESS TEST_NAME=plugin TEST_BIN=`pwd`/$TEST_NAME FROM_DIR=`pwd`/.libs -PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*" -PLUGIN_LIB2="$FROM_DIR/libdynlib2.*" +case $(uname) in + CYGWIN* ) + PLUGIN_LIB1="$FROM_DIR/cygdynlib1* $FROM_DIR/cygdynlib3*" + PLUGIN_LIB2="$FROM_DIR/cygdynlib2*" + ;; + *) + PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*" + PLUGIN_LIB2="$FROM_DIR/libdynlib2.*" + :: +esac PLUGIN_LIBDIR1=testdir1 PLUGIN_LIBDIR2=testdir2 CP="cp -p" # Use -p to preserve mode,ownership,timestamps |