X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Fplugin.c;h=5990481286dc49bb4c83824f28b2dddaceb7604e;hb=b5a3c4cee71873333101fe00ce806ef27a98c839;hp=ff287c1c100a945bf14b7dc8cf9898b1cfab7349;hpb=1270d0e93800811494a97ed8f9cc7e24b1c9d2a2;p=babeltrace.git

diff --git a/tests/lib/plugin.c b/tests/lib/plugin.c
index ff287c1c..59904812 100644
--- a/tests/lib/plugin.c
+++ b/tests/lib/plugin.c
@@ -41,8 +41,8 @@ static int check_env_var(const char *name)
 
 static void reset_test_plugin_env_vars(void)
 {
-	g_setenv("BT_TEST_PLUGIN_INIT_CALLED", "0", 1);
-	g_setenv("BT_TEST_PLUGIN_EXIT_CALLED", "0", 1);
+	g_setenv("BT_TEST_PLUGIN_INITIALIZE_CALLED", "0", 1);
+	g_setenv("BT_TEST_PLUGIN_FINALIZE_CALLED", "0", 1);
 }
 
 static char *get_test_plugin_path(const char *plugin_dir,
@@ -79,7 +79,7 @@ static void test_minimal(const char *plugin_dir)
 		"bt_plugin_find_all_from_file() succeeds with a valid file");
 	ok(plugin_set,
 		"bt_plugin_find_all_from_file() returns a plugin set");
-	ok(check_env_var("BT_TEST_PLUGIN_INIT_CALLED") == 1,
+	ok(check_env_var("BT_TEST_PLUGIN_INITIALIZE_CALLED") == 1,
 		"plugin's initialization function is called during bt_plugin_find_all_from_file()");
 	ok(bt_plugin_set_get_plugin_count(plugin_set) == 1,
 		"bt_plugin_find_all_from_file() returns the expected number of plugins");
@@ -105,8 +105,8 @@ static void test_minimal(const char *plugin_dir)
 	ok(bt_plugin_get_sink_component_class_count(plugin) == 0,
 		"bt_plugin_get_sink_component_class_count() returns the expected value");
 	bt_plugin_set_put_ref(plugin_set);
-	ok(check_env_var("BT_TEST_PLUGIN_EXIT_CALLED") == 1,
-		"plugin's exit function is called when the plugin is destroyed");
+	ok(check_env_var("BT_TEST_PLUGIN_FINALIZE_CALLED") == 1,
+		"plugin's finalize function is called when the plugin is destroyed");
 
 	free(minimal_path);
 }
@@ -197,7 +197,6 @@ static void test_sfs(const char *plugin_dir)
 		"bt_component_class_query() receives the expected parameters");
 
 	bt_component_class_sink_get_ref(sink_comp_class);
-	diag("> putting the plugin set object here");
 	BT_PLUGIN_SET_PUT_REF_AND_RESET(plugin_set);
 	graph = bt_graph_create(0);
 	BT_ASSERT(graph);