X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tests%2Flib%2Ftest_plugin.c;h=f3f229f55f3193fd56cab595181f0e9ef20b36f5;hb=2d4b0539a90db31120bf7062843b3288fc5b372b;hp=603eb29bc79ed6b79baa416ee43d48ec62f8538b;hpb=c55a9f585da53ea54ac458155fac3cdec1779d47;p=babeltrace.git diff --git a/tests/lib/test_plugin.c b/tests/lib/test_plugin.c index 603eb29b..f3f229f5 100644 --- a/tests/lib/test_plugin.c +++ b/tests/lib/test_plugin.c @@ -23,12 +23,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include "tap/tap.h" #include "common.h" @@ -36,13 +36,21 @@ #define NON_EXISTING_PATH "/this/hopefully/does/not/exist/5bc75f8d-0dba-4043-a509-d7984b97e42b.so" /* Those symbols are written to by some test plugins */ -int test_plugin_init_called; -int test_plugin_exit_called; +static int check_env_var(const char *name) +{ + const char *val = getenv(name); + + if (!val) { + return -1; + } -static void reset_test_plugin_symbols(void) + return atoi(val); +} + +static void reset_test_plugin_env_vars(void) { - test_plugin_init_called = 0; - test_plugin_exit_called = 0; + g_setenv("BT_TEST_PLUGIN_INIT_CALLED", "0", 1); + g_setenv("BT_TEST_PLUGIN_EXIT_CALLED", "0", 1); } static char *get_test_plugin_path(const char *plugin_dir, @@ -102,11 +110,12 @@ static void test_minimal(const char *plugin_dir) assert(minimal_path); diag("minimal plugin test below"); - reset_test_plugin_symbols(); + reset_test_plugin_env_vars(); plugin_set = bt_plugin_create_all_from_file(minimal_path); ok(plugin_set && bt_plugin_set_get_plugin_count(plugin_set) == 1, "bt_plugin_create_all_from_file() succeeds with a valid file"); - ok(test_plugin_init_called, "plugin's initialization function is called during bt_plugin_create_all_from_file()"); + ok(check_env_var("BT_TEST_PLUGIN_INIT_CALLED") == 1, + "plugin's initialization function is called during bt_plugin_create_all_from_file()"); ok(bt_plugin_set_get_plugin_count(plugin_set) == 1, "bt_plugin_create_all_from_file() returns the expected number of plugins"); plugin = bt_plugin_set_get_plugin(plugin_set, 0); @@ -128,7 +137,8 @@ static void test_minimal(const char *plugin_dir) "bt_plugin_get_component_class_count() returns the expected value"); bt_put(plugin); bt_put(plugin_set); - ok(test_plugin_exit_called, "plugin's exit function is called when the plugin is destroyed"); + ok(check_env_var("BT_TEST_PLUGIN_EXIT_CALLED") == 1, + "plugin's exit function is called when the plugin is destroyed"); free(minimal_path); } @@ -148,8 +158,10 @@ static void test_sfs(const char *plugin_dir) struct bt_value *results; struct bt_value *object; struct bt_value *res_params; + struct bt_graph *graph; const char *object_str; - int ret; + enum bt_value_status value_ret; + enum bt_graph_status graph_ret; assert(sfs_path); diag("sfs plugin test below"); @@ -208,8 +220,8 @@ static void test_sfs(const char *plugin_dir) assert(bt_value_is_array(results) && bt_value_array_size(results) == 2); object = bt_value_array_get(results, 0); assert(object && bt_value_is_string(object)); - ret = bt_value_string_get(object, &object_str); - assert(ret == 0); + value_ret = bt_value_string_get(object, &object_str); + assert(value_ret == BT_VALUE_STATUS_OK); ok(strcmp(object_str, "get-something") == 0, "bt_component_class_query() receives the expected object name"); res_params = bt_value_array_get(results, 1); @@ -218,20 +230,35 @@ static void test_sfs(const char *plugin_dir) diag("> putting the plugin object here"); BT_PUT(plugin); - sink_component = bt_component_create(sink_comp_class, NULL, NULL); - ok(sink_component, "bt_component_create() still works after the plugin object is destroyed"); + graph = bt_graph_create(); + assert(graph); + graph_ret = bt_graph_add_component(graph, sink_comp_class, "the-sink", + NULL, &sink_component); + ok(graph_ret == BT_GRAPH_STATUS_OK && sink_component, + "bt_graph_add_component() still works after the plugin object is destroyed"); BT_PUT(sink_component); BT_PUT(source_comp_class); - sink_component = bt_component_create(sink_comp_class, NULL, NULL); - ok(sink_component, "bt_component_create() still works after the source component class object is destroyed"); + bt_put(graph); + graph = bt_graph_create(); + assert(graph); + graph_ret = bt_graph_add_component(graph, sink_comp_class, "the-sink", + NULL, &sink_component); + ok(graph_ret == BT_GRAPH_STATUS_OK && sink_component, + "bt_graph_add_component() still works after the source component class object is destroyed"); BT_PUT(sink_component); BT_PUT(filter_comp_class); - sink_component = bt_component_create(sink_comp_class, NULL, NULL); - ok(sink_component, "bt_component_create() still works after the filter component class object is destroyed"); + bt_put(graph); + graph = bt_graph_create(); + assert(graph); + graph_ret = bt_graph_add_component(graph, sink_comp_class, "the-sink", + NULL, &sink_component); + ok(graph_ret == BT_GRAPH_STATUS_OK && sink_component, + "bt_graph_add_component() still works after the filter component class object is destroyed"); BT_PUT(sink_comp_class); BT_PUT(sink_component); free(sfs_path); + bt_put(graph); bt_put(plugin_set); bt_put(object); bt_put(res_params); @@ -262,6 +289,7 @@ static void test_create_all_from_dir(const char *plugin_dir) static void test_find(const char *plugin_dir) { + int ret; struct bt_plugin *plugin; struct bt_component_class *comp_cls_sink; struct bt_component_class *comp_cls_source; @@ -271,11 +299,10 @@ static void test_find(const char *plugin_dir) "bt_plugin_find() handles NULL"); ok(!bt_plugin_find(NON_EXISTING_PATH), "bt_plugin_find() returns NULL with an unknown plugin name"); - plugin_path = malloc(PATH_MAX * 5); - assert(plugin_path); - sprintf(plugin_path, "%s:/ec1d09e5-696c-442e-b1c3-f9c6cf7f5958:::%s:8db46494-a398-466a-9649-c765ae077629:", + ret = asprintf(&plugin_path, "%s:/ec1d09e5-696c-442e-b1c3-f9c6cf7f5958:::%s:8db46494-a398-466a-9649-c765ae077629:", NON_EXISTING_PATH, plugin_dir); - setenv("BABELTRACE_PLUGIN_PATH", plugin_path, 1); + assert(ret > 0 && plugin_path); + g_setenv("BABELTRACE_PLUGIN_PATH", plugin_path, 1); plugin = bt_plugin_find("test_minimal"); ok(plugin, "bt_plugin_find() succeeds with a plugin name it can find");