X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_kernel_data.c;h=79489e3d3324651d0ac766d8ad86e611db215dcb;hb=3a5f70173aa04d11ccb22694d5d31a702cad33ab;hp=322c2eb211f12b0aec827c486451c806ab3646e8;hpb=5961b0b5d776c0ae7a227bbe73831b0beee4d77a;p=lttng-tools.git

diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
index 322c2eb21..79489e3d3 100644
--- a/tests/unit/test_kernel_data.c
+++ b/tests/unit/test_kernel_data.c
@@ -5,14 +5,13 @@
  *
  */
 
-#include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
 
+#include <common/compat/errno.h>
 #include <bin/lttng-sessiond/trace-kernel.h>
 #include <common/defaults.h>
 
@@ -23,10 +22,10 @@
 /* Number of TAP tests in this file */
 #define NUM_TESTS 11
 
-/* For error.h */
-int lttng_opt_quiet = 1;
-int lttng_opt_verbose;
-int lttng_opt_mi;
+#ifdef HAVE_LIBLTTNG_UST_CTL
+#include <lttng/ust-sigbus.h>
+DEFINE_LTTNG_UST_SIGBUS_STATE();
+#endif
 
 static const char alphanum[] =
 	"0123456789"
@@ -73,7 +72,7 @@ static void test_create_one_kernel_session(void)
 
 static void test_create_kernel_metadata(void)
 {
-	assert(kern != NULL);
+	LTTNG_ASSERT(kern != NULL);
 
 	kern->metadata = trace_kernel_create_metadata();
 	ok(kern->metadata != NULL, "Create kernel metadata");
@@ -81,17 +80,17 @@ static void test_create_kernel_metadata(void)
 	ok(kern->metadata->fd == -1 &&
 	   kern->metadata->conf != NULL &&
 	   kern->metadata->conf->attr.overwrite
-			== DEFAULT_CHANNEL_OVERWRITE &&
+			== DEFAULT_METADATA_OVERWRITE &&
 	   kern->metadata->conf->attr.subbuf_size
 			== default_get_metadata_subbuf_size() &&
 	   kern->metadata->conf->attr.num_subbuf
 			== DEFAULT_METADATA_SUBBUF_NUM &&
 	   kern->metadata->conf->attr.switch_timer_interval
-			== DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER &&
+			== DEFAULT_METADATA_SWITCH_TIMER &&
 	   kern->metadata->conf->attr.read_timer_interval
-			== DEFAULT_KERNEL_CHANNEL_READ_TIMER &&
+			== DEFAULT_METADATA_READ_TIMER &&
 	   kern->metadata->conf->attr.output
-	       == DEFAULT_KERNEL_CHANNEL_OUTPUT,
+			== LTTNG_EVENT_MMAP,
 	   "Validate kernel session metadata");
 
 	trace_kernel_destroy_metadata(kern->metadata);
@@ -149,7 +148,7 @@ static void test_create_kernel_event(void)
 
 	ok(event->fd == -1 &&
 	   event->enabled == 1 &&
-	   event->event->instrumentation == LTTNG_KERNEL_TRACEPOINT &&
+	   event->event->instrumentation == LTTNG_KERNEL_ABI_TRACEPOINT &&
 	   strlen(event->event->name),
 	   "Validate kernel event");
 
@@ -191,6 +190,5 @@ int main(int argc, char **argv)
 	test_create_kernel_event();
 	test_create_kernel_stream();
 
-	/* Success */
-	return 0;
+	return exit_status();
 }