X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_payload.cpp;h=de50ed383b5a6ec8cfc4e1160124a30385f703c2;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=1c79b8931012b8135ee4d890bd0a9b66faf0a33d;hpb=740da7d5000ca1ffdcf14bda5096bf7ccfb86bdd;p=lttng-tools.git

diff --git a/tests/unit/test_payload.cpp b/tests/unit/test_payload.cpp
index 1c79b8931..de50ed383 100644
--- a/tests/unit/test_payload.cpp
+++ b/tests/unit/test_payload.cpp
@@ -7,9 +7,9 @@
 
 #include <unistd.h>
 
-#include <common/compat/fcntl.h>
-#include <common/payload.h>
-#include <common/payload-view.h>
+#include <common/compat/fcntl.hpp>
+#include <common/payload.hpp>
+#include <common/payload-view.hpp>
 #include <tap/tap.h>
 
 static const int TEST_COUNT = 5;
@@ -107,14 +107,14 @@ static void test_fd_push_pop_imbalance(void)
 		}
 
 		handle = lttng_payload_view_pop_fd_handle(&view);
-		ok(!handle, test_description);
+		ok(!handle, "%s", test_description);
 		fd_handle_put(handle);
 	}
 
 	lttng_payload_reset(&payload);
 	return;
 fail:
-	fail(test_description);
+	fail("%s", test_description);
 	lttng_payload_reset(&payload);
 }
 
@@ -158,12 +158,12 @@ static void test_fd_pop_fd_root_views(void)
 	}
 
 	lttng_payload_reset(&payload);
-	pass(test_description);
+	pass("%s", test_description);
 	fd_handle_put(handle);
 	return;
 fail:
 	lttng_payload_reset(&payload);
-	fail(test_description);
+	fail("%s", test_description);
 	fd_handle_put(handle);
 }
 
@@ -212,7 +212,7 @@ static void test_fd_pop_fd_descendant_views(void)
 	}
 
 	lttng_payload_reset(&payload);
-	pass(test_description);
+	pass("%s", test_description);
 	fd_handle_put(handle1);
 	fd_handle_put(handle2);
 	fd_handle_put(view_handle1);
@@ -220,7 +220,7 @@ static void test_fd_pop_fd_descendant_views(void)
 	return;
 fail:
 	lttng_payload_reset(&payload);
-	fail(test_description);
+	fail("%s", test_description);
 	fd_handle_put(handle1);
 	fd_handle_put(handle2);
 	fd_handle_put(view_handle1);