X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Fplugin.c;h=3b5c05fcc2f4a2fb91a9899300c72e155e2bdb3c;hb=3c729b9af1b926f739be5bbba4ec20a296746023;hp=b6cad1e2c76885a33959cece85806715fd074b33;hpb=9c08c816a55bbc538957648b49d41354e43c7cdf;p=babeltrace.git diff --git a/tests/lib/plugin.c b/tests/lib/plugin.c index b6cad1e2..3b5c05fc 100644 --- a/tests/lib/plugin.c +++ b/tests/lib/plugin.c @@ -129,11 +129,10 @@ static void test_sfs(const char *plugin_dir) bt_graph *graph; const char *object_str; bt_graph_add_component_status graph_ret; - bt_query_executor *query_exec = bt_query_executor_create(); + bt_query_executor *query_exec; int ret; bt_plugin_find_all_from_file_status status; - BT_ASSERT(query_exec); BT_ASSERT(sfs_path); diag("sfs plugin test below"); @@ -181,9 +180,11 @@ static void test_sfs(const char *plugin_dir) "bt_plugin_borrow_filter_component_class_by_name_const() finds a filter component class"); params = bt_value_integer_signed_create_init(23); BT_ASSERT(params); - ret = bt_query_executor_query(query_exec, - bt_component_class_filter_as_component_class_const(filter_comp_class), - "get-something", params, BT_LOGGING_LEVEL_NONE, &results); + query_exec = bt_query_executor_create( + bt_component_class_filter_as_component_class_const( + filter_comp_class), "get-something", params); + BT_ASSERT(query_exec); + ret = bt_query_executor_query(query_exec, &results); ok(ret == 0 && results, "bt_query_executor_query() succeeds"); BT_ASSERT(bt_value_is_array(results) && bt_value_array_get_size(results) == 2); object = bt_value_array_borrow_element_by_index_const(results, 0); @@ -250,8 +251,8 @@ static void test_find(const char *plugin_dir) char *plugin_path; bt_plugin_find_status status; - ok(bt_plugin_find(NON_EXISTING_PATH, BT_FALSE, &plugin) == - BT_PLUGIN_FIND_STATUS_NOT_FOUND, + ok(bt_plugin_find(NON_EXISTING_PATH, BT_TRUE, BT_FALSE, BT_FALSE, + BT_FALSE, BT_FALSE, &plugin) == BT_PLUGIN_FIND_STATUS_NOT_FOUND, "bt_plugin_find() returns BT_PLUGIN_STATUS_NOT_FOUND with an unknown plugin name"); ret = asprintf(&plugin_path, "%s" G_SEARCHPATH_SEPARATOR_S G_DIR_SEPARATOR_S "ec1d09e5-696c-442e-b1c3-f9c6cf7f5958" @@ -263,7 +264,8 @@ static void test_find(const char *plugin_dir) BT_ASSERT(ret > 0 && plugin_path); g_setenv("BABELTRACE_PLUGIN_PATH", plugin_path, 1); plugin = NULL; - status = bt_plugin_find("test_minimal", BT_FALSE, &plugin); + status = bt_plugin_find("test_minimal", BT_TRUE, BT_FALSE, BT_FALSE, + BT_FALSE, BT_FALSE, &plugin); ok(status == BT_PLUGIN_FIND_STATUS_OK, "bt_plugin_find() succeeds with a plugin name it can find"); ok(plugin, "bt_plugin_find() returns a plugin object");