X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=d7d2e35398ecf8b73a1de05bb3bb4c49a80f1df4;hb=7c1d2758d663ac5f119eae6849e50b56546a0c48;hp=d07e9347d2d81cc31cb6bddefda780aa4f9f4a25;hpb=ad7c9c188f0e6336577ccdc7e6e0aea409a88a9d;p=lttng-tools.git diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index d07e9347d..d7d2e3539 100644 --- a/tests/unit/test_ust_data.c +++ b/tests/unit/test_ust_data.c @@ -39,15 +39,19 @@ #define RANDOM_STRING_LEN 11 /* Number of TAP tests in this file */ -#define NUM_TESTS 10 +#define NUM_TESTS 11 /* For error.h */ int lttng_opt_quiet = 1; int lttng_opt_verbose; +int lttng_opt_mi; int ust_consumerd32_fd; int ust_consumerd64_fd; +/* Global variable required by sessiond objects being linked-in */ +struct lttng_ht *agent_apps_ht_by_sock; + static const char alphanum[] = "0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -82,7 +86,7 @@ static void test_create_one_ust_session(void) ok(usess != NULL, "Create UST session"); ok(usess->id == 42 && - usess->start_trace == 0 && + usess->active == 0 && usess->domain_global.channels != NULL && usess->uid == 0 && usess->gid == 0, @@ -124,7 +128,7 @@ static void test_create_ust_event(void) ev.type = LTTNG_EVENT_TRACEPOINT; ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; - event = trace_ust_create_event(&ev, NULL, NULL); + event = trace_ust_create_event(&ev, NULL, NULL, NULL); ok(event != NULL, "Create UST event"); @@ -156,10 +160,16 @@ static void test_create_ust_event_exclusion(void) /* set up an exclusion set */ exclusion = zmalloc(sizeof(*exclusion) + LTTNG_SYMBOL_NAME_LEN); + if (!exclusion) { + PERROR("zmalloc"); + } + + ok(exclusion != NULL, "Create UST exclusion"); + exclusion->count = 1; strncpy((char *)(exclusion->names), get_random_string(), LTTNG_SYMBOL_NAME_LEN); - event = trace_ust_create_event(&ev, NULL, exclusion); + event = trace_ust_create_event(&ev, NULL, NULL, exclusion); ok(event != NULL, "Create UST event with exclusion");