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

diff --git a/tests/snprintf/prog.c b/tests/snprintf/prog.c
index dd0b04f8..8d3fd5c0 100644
--- a/tests/snprintf/prog.c
+++ b/tests/snprintf/prog.c
@@ -19,17 +19,24 @@
 #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;
 }