From b2f94f9faf805035e4d0e9cb76007204c8250e58 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Mon, 14 Sep 2015 14:53:47 -0500
Subject: [PATCH] [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
---
 test/plugin.c          | 6 ++++++
 test/test_plugin.sh.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/plugin.c b/test/plugin.c
index 07b20ea508..e34c691dde 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 a6d8c50b8f..43e76c4d06 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