Module Name: src
Committed By: christos
Date: Mon Nov 27 19:45:36 UTC 2023
Modified Files:
src/tests/lib/libc/locale: Makefile t_strfmon.c
Log Message:
Don't use fmtcheck for strfmon format strings. It does not work. Fix a broken
test.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/lib/libc/locale/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/locale/t_strfmon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/locale/Makefile
diff -u src/tests/lib/libc/locale/Makefile:1.13 src/tests/lib/libc/locale/Makefile:1.14
--- src/tests/lib/libc/locale/Makefile:1.13 Sun Jul 28 09:46:45 2019
+++ src/tests/lib/libc/locale/Makefile Mon Nov 27 14:45:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/07/28 13:46:45 christos Exp $
+# $NetBSD: Makefile,v 1.14 2023/11/27 19:45:36 christos Exp $
.include <bsd.own.mk>
@@ -27,5 +27,6 @@ TESTS_C+= t_strfmon
COPTS.t_wctomb.c += -Wno-stack-protector
COPTS.t_digittoint.c += -Wno-unused-variable
COPTS.t_btowc.c += -Wno-unused-variable
+COPTS.t_strfmon.c += -Wno-format-nonliteral
.include <bsd.test.mk>
Index: src/tests/lib/libc/locale/t_strfmon.c
diff -u src/tests/lib/libc/locale/t_strfmon.c:1.5 src/tests/lib/libc/locale/t_strfmon.c:1.6
--- src/tests/lib/libc/locale/t_strfmon.c:1.5 Sat Oct 14 16:19:31 2023
+++ src/tests/lib/libc/locale/t_strfmon.c Mon Nov 27 14:45:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strfmon.c,v 1.5 2023/10/14 20:19:31 christos Exp $ */
+/* $NetBSD: t_strfmon.c,v 1.6 2023/11/27 19:45:36 christos Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_strfmon.c,v 1.5 2023/10/14 20:19:31 christos Exp $");
+__RCSID("$NetBSD: t_strfmon.c,v 1.6 2023/11/27 19:45:36 christos Exp $");
#include <atf-c.h>
#include <stdio.h>
@@ -52,7 +52,7 @@ ATF_TC_BODY(strfmon_locale, tc)
const char *locale;
const char *expected;
} tests[] = {
- { "C", "[ **1234.57] [ **1234.57]" },
+ { "C", "[ **1234.57 ] [ **1234.57 ]" },
{ "de_DE.UTF-8", "[ **1234,57 €] [ **1.234,57 EUR]" },
{ "en_GB.UTF-8", "[ £**1234.57] [ GBP**1,234.57]" },
};
@@ -157,8 +157,7 @@ ATF_TC_BODY(strfmon_examples, tc)
for (i = 0; i < __arraycount(tests); ++i) {
snprintf(format, sizeof(format), "[%s] [%s] [%s]",
tests[i].format, tests[i].format, tests[i].format);
- strfmon(actual, sizeof(actual) - 1,
- fmtcheck(format, "%n %n %n"),
+ strfmon(actual, sizeof(actual) - 1, format,
123.45, -123.45, 3456.781);
ATF_CHECK_STREQ_MSG(tests[i].expected, actual,
"[%s]", tests[i].format);
