X-Git-Url: https://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=tests%2Flibustctl_function_tests%2Flibustctl_function_tests.c;h=0aba01c2ffea41748fba8b76e89680a17dacb314;hp=45894208cc5d7fc82f52a89f3650aceeade9047f;hb=b521931e0000388ff9080d46719936be98af54c6;hpb=ad5c7b826145e951950bd1afa6fce17ea193bb48

diff --git a/tests/libustctl_function_tests/libustctl_function_tests.c b/tests/libustctl_function_tests/libustctl_function_tests.c
index 4589420..0aba01c 100644
--- a/tests/libustctl_function_tests/libustctl_function_tests.c
+++ b/tests/libustctl_function_tests/libustctl_function_tests.c
@@ -33,7 +33,7 @@ static void ustctl_function_tests(pid_t pid)
 	int result, sock;
 	unsigned int subbuf_size, subbuf_num;
 	unsigned int new_subbuf_size, new_subbuf_num;
-	struct marker_status *marker_status, *ms_ptr;
+	struct ust_marker_status *marker_status, *ms_ptr;
 	char *old_socket_path, *new_socket_path;
 	char *tmp_ustd_socket = "/tmp/tmp_ustd_socket";
 	char *trace = "auto";
@@ -50,7 +50,7 @@ static void ustctl_function_tests(pid_t pid)
 	result = 0;
 	for (ms_ptr = marker_status; ms_ptr->channel; ms_ptr++) {
 		if (!strcmp(ms_ptr->channel, "ust") &&
-		    !strcmp(ms_ptr->marker, "bar")) {
+		    !strcmp(ms_ptr->ust_marker, "bar")) {
 			result = 1;
 		}
 	}
@@ -81,8 +81,8 @@ static void ustctl_function_tests(pid_t pid)
 	free(old_socket_path);
 
 	/* Enable, disable markers */
-	tap_ok(!ustctl_set_marker_state(sock, trace, "ust", "bar", 1),
-	       "ustctl_set_marker_state - existing marker ust bar");
+	tap_ok(!ustctl_set_ust_marker_state(sock, trace, "ust", "bar", 1),
+	       "ustctl_set_ust_marker_state - existing marker ust bar");
 
 	/* Create and allocate a trace */
 	tap_ok(!ustctl_create_trace(sock, trace), "ustctl_create_trace");
@@ -144,13 +144,13 @@ static void ustctl_function_tests(pid_t pid)
 	 * Activate a non-existent marker, this should be possible as the marker
 	 * can be loaded at a later time.
 	 */
-	tap_ok(ustctl_set_marker_state(sock, trace, "ustl", "blar", 1) == 0,
+	tap_ok(ustctl_set_ust_marker_state(sock, trace, "ustl", "blar", 1) == 0,
 	       "Enable non-existent marker ustl blar");
 
 	printf("##### Tests that definetly should work are completed #####\n");
 	printf("############## Start expected failure cases ##############\n");
 
-	tap_ok(ustctl_set_marker_state(sock, trace, "ust","bar", 1),
+	tap_ok(ustctl_set_ust_marker_state(sock, trace, "ust","bar", 1),
 	       "Enable already enabled marker ust/bar");
 
 	tap_ok(EEXIST == errno,