diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-02-02 06:46:40 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-02-02 06:46:40 (GMT) |
| commit | cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9 (patch) | |
| tree | 9f39886657d25fd8bf621b8e1a769ad64dfb7534 /test | |
| parent | 45eefdbdea5aec34f67dabec64a5a1005483c095 (diff) | |
| parent | 67f41bf9f80499f1e1f6dc8e27a599ba0a4b9ef3 (diff) | |
| download | hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.zip hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.gz hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.bz2 | |
[svn-r26096] Merged r26024-26095 from trunk.
Tested on: jam with Fortran and C++
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | test/test_plugin.sh.in | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index f98ab67..1e497ae 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -7,8 +7,8 @@ # make test dir file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST") -file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/tesfiles") -file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/tesfiles/plist_files") +file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/testfiles") +file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files") if (HDF5_TEST_VFD) set (VFD_LIST sec2 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 |