X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=dd00089266ad7770ce4c64e18b1340439f167c9b;hp=2f08b38c0bffe44ffd42045493f3c010a73bd6be;hb=c7e35b037773dbbfe10178c946ba44feefb226e1;hpb=41d7b959e0bdbd6ae4ced9129ecda5d961377548

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 2f08b38c0..dd0008926 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 12
+#define NUM_TESTS 10
 
-/* 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,
@@ -91,33 +92,6 @@ static void test_create_one_ust_session(void)
 	trace_ust_destroy_session(usess);
 }
 
-static void test_create_ust_metadata(void)
-{
-	struct ltt_ust_metadata *metadata;
-
-	assert(usess != NULL);
-
-	metadata = trace_ust_create_metadata(PATH1);
-	ok(metadata != NULL, "Create UST metadata");
-
-	ok(metadata->handle == -1 &&
-	   strlen(metadata->pathname) &&
-	   metadata->attr.overwrite
-			== DEFAULT_CHANNEL_OVERWRITE &&
-	   metadata->attr.subbuf_size
-			== default_get_metadata_subbuf_size() &&
-	   metadata->attr.num_subbuf
-			== DEFAULT_METADATA_SUBBUF_NUM &&
-	   metadata->attr.switch_timer_interval
-			== DEFAULT_METADATA_SWITCH_TIMER &&
-	   metadata->attr.read_timer_interval
-			== DEFAULT_METADATA_READ_TIMER &&
-	   metadata->attr.output == LTTNG_UST_MMAP,
-	   "Validate UST session metadata");
-
-	trace_ust_destroy_metadata(metadata);
-}
-
 static void test_create_ust_channel(void)
 {
 	struct ltt_ust_channel *uchan;
@@ -151,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");
 
@@ -186,7 +160,7 @@ static void test_create_ust_event_exclusion(void)
 	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");
 
@@ -199,7 +173,6 @@ static void test_create_ust_event_exclusion(void)
 	   event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
 	   "Validate UST event and exclusion");
 
-	free(exclusion);
 	trace_ust_destroy_event(event);
 }
 
@@ -226,7 +199,6 @@ int main(int argc, char **argv)
 	diag("UST data structures unit test");
 
 	test_create_one_ust_session();
-	test_create_ust_metadata();
 	test_create_ust_channel();
 	test_create_ust_event();
 	test_create_ust_context();