Fix: test_benchmark: do not match "CPU(s) scaling MHz:"

[lttng-ust.git] / tests / unit / snprintf / snprintf.c

diff --git a/tests/unit/snprintf/snprintf.c b/tests/unit/snprintf/snprintf.c
index ad73934245aa039246c1830f7115fc40e4fd8f40..79f31357bb6d0f370a08a2d48e3571027dbf290a 100644 (file)
--- a/tests/unit/snprintf/snprintf.c
+++ b/tests/unit/snprintf/snprintf.c
@@ -6,26 +6,21 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "ust_snprintf.h"
+#include "common/safe-snprintf.h"
 
 #include "tap.h"
 
-int main()
+int main(void)
 {
        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'";
+       const char expected_str[] = "header 9999, hello, 005, '    9'";
+       const char test_fmt_str[] = "header %d, %s, %03d, '%*d'";
 
        plan_tests(1);
 
-       expected = "header 9999, hello, 005, '    9'";
-       ust_safe_snprintf(buf, 99, test_fmt_str, 9999, "hello", 5, 9);
+       ust_safe_snprintf(buf, 99, test_fmt_str, 9999, "hello", 5, 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);
+       ok(strcmp(buf, expected_str) == 0, "Got expected output string with format string \"%s\"", test_fmt_str);
 
        return exit_status();
 }