summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/h5test.c10
-rw-r--r--test/vol.c14
2 files changed, 12 insertions, 12 deletions
diff --git a/test/h5test.c b/test/h5test.c
index c1cc55b..3c02e4e 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1908,14 +1908,14 @@ error:
* Purpose: Returns a disposable, generally non-functional,
* VOL class struct.
*
- * In some of the test code, we need a disposable VOL driver
+ * In some of the test code, we need a disposable VOL plugin
* but we don't want to mess with the real VFDs and we also
- * don't have access to the internals of the real VOL drivers
+ * don't have access to the internals of the real VOL plugins
* (which use static globals and functions) to easily duplicate
- * them (e.g.: for testing VOL driver ID handling).
+ * them (e.g.: for testing VOL plugin ID handling).
*
* This API call will return a pointer to a VOL class that
- * can be used to construct a test VOL using H5VLregister_driver().
+ * can be used to construct a test VOL using H5VLregister_plugin().
*
* Return: Success: A pointer to a VOL class struct
* Failure: NULL
@@ -1931,7 +1931,7 @@ h5_get_dummy_vol_class(void)
if(NULL == (vol_class = (H5VL_class_t *)HDcalloc((size_t)1, sizeof(H5VL_class_t))))
TEST_ERROR;
- /* Fill in the minimum parameters to make a VOL driver class that
+ /* Fill in the minimum parameters to make a VOL plugin class that
* can be registered.
*/
vol_class->name = "dummy";
diff --git a/test/vol.c b/test/vol.c
index 553a9cf..fc47087 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -147,7 +147,7 @@ test_vol_registration(void)
FAIL_PUTS_ERROR("native VOL plugin is inappropriately registered");
/* Load a VOL interface */
- if ((vol_id = H5VLregister_plugin(&fake_vol_g)) < 0)
+ if ((vol_id = H5VLregister_plugin(&fake_vol_g, H5P_DEFAULT)) < 0)
FAIL_STACK_ERROR;
/* The test/fake VOL plugin should be registered now */
@@ -157,27 +157,27 @@ test_vol_registration(void)
FAIL_PUTS_ERROR("native VOL plugin is un-registered");
/* Re-register a VOL plugin */
- if ((vol_id2 = H5VLregister(&fake_vol_g, H5P_DEFAULT)) < 0)
+ if ((vol_id2 = H5VLregister_plugin(&fake_vol_g, H5P_DEFAULT)) < 0)
FAIL_STACK_ERROR;
/* The test/fake VOL plugin should still be registered now */
- if ((is_registered = H5VLis_registered(FAKE_VOL_NAME)) < 0)
+ if ((is_registered = H5VLis_plugin_registered(FAKE_VOL_NAME)) < 0)
FAIL_STACK_ERROR;
if (0 == is_registered)
FAIL_PUTS_ERROR("native VOL plugin is un-registered");
/* Unregister the second test/fake VOL ID */
- if (H5VLunregister(vol_id2) < 0)
+ if (H5VLunregister_plugin(vol_id2) < 0)
FAIL_STACK_ERROR;
/* The test/fake VOL plugin should still be registered now */
- if ((is_registered = H5VLis_registered(FAKE_VOL_NAME)) < 0)
+ if ((is_registered = H5VLis_plugin_registered(FAKE_VOL_NAME)) < 0)
FAIL_STACK_ERROR;
if (0 == is_registered)
FAIL_PUTS_ERROR("native VOL plugin is un-registered");
/* Unregister the original test/fake VOL ID */
- if (H5VLunregister(vol_id) < 0)
+ if (H5VLunregister_plugin(vol_id) < 0)
FAIL_STACK_ERROR;
PASSED();
@@ -185,7 +185,7 @@ test_vol_registration(void)
error:
H5E_BEGIN_TRY {
- H5VLunregister(vol_id);
+ H5VLunregister_plugin(vol_id);
} H5E_END_TRY;
return FAIL;