mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r23526] Bug fix: Mac system has dynamic library name in the form of libxyz.dylib. Changed test_plugin.in

Browse Source 
to copy library file names in the form of libdynlib{123].*.

Another problem: Even when copy failed in copying the libray files (was in the form of *.so*),
the test still passed.  That was because .libs was included in $HDF5_PLUGIN_PATH and the needed
plug in libraries were generated there.
Fixed by copying the plug in library files to separate directories and seetup HDF5_PLUGIN_PATH
to include them but NOT .libs.

Tested: used desycommittest (duck, emu, jam, koala, ostrich) plus cmakehdf5 in jam.
The cmakehdf5 in jam reported a failure in 
Test #594: H5REPART-h5repart_test ....................................***Failed
Since this failure could not be caused by my change in test_plugin.sh, I reported it to Allen
and proceed to check this in.
This commit is contained in:
Albert Cheng 2013-04-02 16:26:14 -05:00
parent 26785f6af5
commit 7ee9828c26
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/test_plugin.sh.in
View File

@ -34,7 +34,9 @@ exit_code=$EXIT_SUCCESS
TEST_NAME=plugin
TEST_BIN=`pwd`/$TEST_NAME
FROM_DIR=`pwd`/.libs
PLUGIN_LIB2="$FROM_DIR/libdynlib2.so.*"
PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*"
PLUGIN_LIB2="$FROM_DIR/libdynlib2.*"
PLUGIN_LIBDIR1=testdir1
PLUGIN_LIBDIR2=testdir2
CP="cp -p" # Use -p to preserve mode,ownership,timestamps
RM="rm -rf"
@ -48,7 +50,13 @@ TESTING() {
}
# Main Body
# Create test directory if not exists yet.
# Create test directories if not exists yet.
test -d $PLUGIN_LIBDIR1 || mkdir -p $PLUGIN_LIBDIR1
if [ $? != 0 ]; then
echo "Failed to create test directory($PLUGIN_LIBDIR1)"
exit $EXIT_FAILURE
fi
test -d $PLUGIN_LIBDIR2 || mkdir -p $PLUGIN_LIBDIR2
if [ $? != 0 ]; then
echo "Failed to create test directory($PLUGIN_LIBDIR2)"
@ -56,6 +64,12 @@ if [ $? != 0 ]; then
fi
# copy plugin library for test
$CP $PLUGIN_LIB1 $PLUGIN_LIBDIR1
if [ $? != 0 ]; then
echo "Failed to copy plugin library ($PLUGIN_LIB1) for test."
exit $EXIT_FAILURE
fi
$CP $PLUGIN_LIB2 $PLUGIN_LIBDIR2
if [ $? != 0 ]; then
echo "Failed to copy plugin library ($PLUGIN_LIB2) for test."
@ -63,7 +77,7 @@ if [ $? != 0 ]; then
fi
# setup plugin path
ENVCMD="env HDF5_PLUGIN_PATH=${PLUGIN_LIBDIR2}:$FROM_DIR"
ENVCMD="env HDF5_PLUGIN_PATH=${PLUGIN_LIBDIR1}:${PLUGIN_LIBDIR2}"
# Run the test
$ENVCMD $TEST_BIN