X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fsnprintf%2Fprog.c;h=8d3fd5c034bbb634764c09fe009188fbf1c35b62;hb=dc5af9e3311ab28f2728f540f06e61add9d7b5eb;hp=ac888b5898fd3672044408ae97308f377b00064d;hpb=a09dac63957396890b1085cac0fee92ecc5db87a;p=lttng-ust.git

diff --git a/tests/snprintf/prog.c b/tests/snprintf/prog.c
index ac888b58..8d3fd5c0 100644
--- a/tests/snprintf/prog.c
+++ b/tests/snprintf/prog.c
@@ -17,19 +17,26 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "ust_snprintf.h"
+
+#include "tap.h"
 
 int main()
 {
 	char buf[100];
-
 	char *expected;
+	char test_fmt_str[] = "header %d, %s, %03d, '%3$*d'";
+	char escaped_test_fmt_str[] = "header %%d, %%s, %%03d, '%%3$*d'";
+
+	plan_tests(1);
 
 	expected = "header 9999, hello, 005, '    9'";
-	ust_safe_snprintf(buf, 99, "header %d, %s, %03d, '%3$*d'", 9999, "hello", 5, 9);
-	if(strcmp(buf, expected) != 0) {
-		printf("Error: expected \"%s\" and got \"%s\"\n", expected, buf);
-		return 1;
-	}
+	ust_safe_snprintf(buf, 99, test_fmt_str, 9999, "hello", 5, 9);
+
+	char test_desc_fmt_str[] = "Got expected output string with format string \"%s\"";
+	char test_desc[sizeof(escaped_test_fmt_str) + sizeof(test_desc_fmt_str) - 1];
+	sprintf(test_desc, test_desc_fmt_str, escaped_test_fmt_str);
+	ok(strcmp(buf, expected) == 0, test_desc);
 
 	return 0;
 }