summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2013-03-22 21:39:53 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2013-03-22 21:39:53 (GMT)
commit8ffd55478e11904f193b4a98477b3bcb452b93ac (patch)
tree5843b13e826ae4c9b3f471dfa4536d7882b4d8ba /test
parentf0e328cc04ae9cf6032e740cf223fcfdd83a5f6d (diff)
downloadhdf5-8ffd55478e11904f193b4a98477b3bcb452b93ac.zip
hdf5-8ffd55478e11904f193b4a98477b3bcb452b93ac.tar.gz
hdf5-8ffd55478e11904f193b4a98477b3bcb452b93ac.tar.bz2
[svn-r23432] I added a new macro HDF5_PLUGIN_PRELOAD to skip plugin loading during data reading.
Tested on koala and jam.
Diffstat (limited to 'test')
-rw-r--r--test/plugin.c7
-rw-r--r--test/testerror.sh.in9
2 files changed, 14 insertions, 2 deletions
diff --git a/test/plugin.c b/test/plugin.c
index 3cadb3c..d5a30f9 100644
--- a/test/plugin.c
+++ b/test/plugin.c
@@ -31,6 +31,13 @@
#define H5Z_PACKAGE
#include "H5Zpkg.h"
+/* Filters for HDF5 internal test */
+#define H5Z_FILTER_DYNLIB1 257
+#define H5Z_FILTER_DYNLIB2 258
+
+/* Bzip2 filter */
+#define H5Z_FILTER_BZIP2 307
+
const char *FILENAME[] = {
"plugin",
NULL
diff --git a/test/testerror.sh.in b/test/testerror.sh.in
index b68fa7e..eb01fb1 100644
--- a/test/testerror.sh.in
+++ b/test/testerror.sh.in
@@ -23,6 +23,9 @@ DEPRECATED_SYMBOLS="@DEPRECATED_SYMBOLS@"
CMP='cmp -s'
DIFF='diff -c'
+# Skip plugin module to test missing filter
+ENVCMD="env HDF5_PLUGIN_PRELOAD=::"
+
nerrors=0
verbose=yes
@@ -61,7 +64,9 @@ TEST() {
echo "#############################"
echo "Expected output for $TEST_ERR"
echo "#############################"
- $RUNSERIAL $TEST_ERR_BIN
+
+ # Skip the plugin for testing missing filter.
+ $ENVCMD $RUNSERIAL $TEST_ERR_BIN
) >$actual 2>$actual_err
# Extract file name, line number, version and thread IDs because they may be different
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
@@ -109,7 +114,7 @@ else
TEST err_compat
fi
-# test for error_test
+# test for error_test. Skip the plugin for testing missing filter.
TEST error_test
if test $nerrors -eq 0 ; then