X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=6df66acbe6ee9e6d6f1ffe5fc083885e673893f9;hb=c710ece754dd40000d0b3646980eab1407a1b29e;hp=92f8771898b5167ffd47dc7cf32b52bc8e9a95bb;hpb=d7a72c64c5108b76f1fb524633022d621620e718;p=lttng-tools.git diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index 92f877189..6df66acbe 100644 --- a/tests/unit/test_ust_data.c +++ b/tests/unit/test_ust_data.c @@ -39,11 +39,12 @@ #define RANDOM_STRING_LEN 11 /* Number of TAP tests in this file */ -#define NUM_TESTS 10 +#define NUM_TESTS 11 -/* For lttngerr.h */ +/* For error.h */ int lttng_opt_quiet = 1; int lttng_opt_verbose; +int lttng_opt_mi; int ust_consumerd32_fd; int ust_consumerd64_fd; @@ -82,7 +83,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 +125,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 +157,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");