diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-14 19:53:47 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-14 19:53:47 (GMT) |
| commit | b2f94f9faf805035e4d0e9cb76007204c8250e58 (patch) | |
| tree | 3223073aa294642f5657bde00ae960d33b783e50 /test | |
| parent | 43443b22080bd7ac112d402cbfd5c6335eecd7d6 (diff) | |
| download | hdf5-b2f94f9faf805035e4d0e9cb76007204c8250e58.zip hdf5-b2f94f9faf805035e4d0e9cb76007204c8250e58.tar.gz hdf5-b2f94f9faf805035e4d0e9cb76007204c8250e58.tar.bz2 | |
[svn-r27774] Description:
Correct test reset code in plugin code and fix typo in testing script.
Tested on:
Linux 2.6/32 (jam) w/serial
Diffstat (limited to 'test')
| -rw-r--r-- | test/plugin.c | 6 | ||||
| -rw-r--r-- | test/test_plugin.sh.in | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test/plugin.c b/test/plugin.c index 07b20ea..e34c691 100644 --- a/test/plugin.c +++ b/test/plugin.c @@ -768,6 +768,9 @@ main(void) if(H5Pclose(fapl2) < 0) TEST_ERROR if(H5Pclose(fapl) < 0) TEST_ERROR + /* Restore the default error handler (set in h5_reset()) */ + h5_restore_err(); + puts("\nTesting reading data with with dynamic plugin filters:"); /* Close the library so that all loaded plugin libraries are unloaded */ @@ -784,6 +787,9 @@ main(void) /* Open the groups with filters */ nerrors += (test_groups_with_filters(file) < 0 ? 1 : 0); + /* Restore the default error handler (set in h5_reset()) */ + h5_restore_err(); + /* Close the library so that all loaded plugin libraries are unloaded */ h5_reset(); fapl = h5_fileaccess(); diff --git a/test/test_plugin.sh.in b/test/test_plugin.sh.in index a6d8c50..43e76c4 100644 --- a/test/test_plugin.sh.in +++ b/test/test_plugin.sh.in @@ -36,7 +36,7 @@ case $(uname) in *) PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*" PLUGIN_LIB2="$FROM_DIR/libdynlib2.*" - :: + ;; esac PLUGIN_LIBDIR1=testdir1 PLUGIN_LIBDIR2=testdir2 |