Module Name: src
Committed By: christos
Date: Sun Oct 12 22:33:41 UTC 2014
Modified Files:
src/tests/lib/libc/gen: t_fnmatch.c
Log Message:
You need double the number of backslashes in a pattern, since \\ -> '\' in
the string which means escape. Now the tests don't fail.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/t_fnmatch.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/gen/t_fnmatch.c
diff -u src/tests/lib/libc/gen/t_fnmatch.c:1.5 src/tests/lib/libc/gen/t_fnmatch.c:1.6
--- src/tests/lib/libc/gen/t_fnmatch.c:1.5 Sun Oct 12 15:08:08 2014
+++ src/tests/lib/libc/gen/t_fnmatch.c Sun Oct 12 18:33:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fnmatch.c,v 1.5 2014/10/12 19:08:08 justin Exp $ */
+/* $NetBSD: t_fnmatch.c,v 1.6 2014/10/12 22:33:41 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_fnmatch.c,v 1.5 2014/10/12 19:08:08 justin Exp $");
+__RCSID("$NetBSD: t_fnmatch.c,v 1.6 2014/10/12 22:33:41 christos Exp $");
#include <atf-c.h>
#include <fnmatch.h>
@@ -161,8 +161,8 @@ ATF_TC_HEAD(fnmatch_initialbracket, tc)
ATF_TC_BODY(fnmatch_initialbracket, tc)
{
- ATF_CHECK(fnmatch("[[?*\\]", "\\", 0) == 0);
- ATF_CHECK(fnmatch("[]?*\\]", "]", 0) == 0);
+ ATF_CHECK(fnmatch("[[?*\\\\]", "\\", 0) == 0);
+ ATF_CHECK(fnmatch("[]?*\\\\]", "]", 0) == 0);
ATF_CHECK(fnmatch("[!]a-]", "b", 0) == 0);
ATF_CHECK(fnmatch("[]-_]", "^", 0) == 0); /* range: ']', '^', '_' */
ATF_CHECK(fnmatch("[!]-_]", "X", 0) == 0);
@@ -175,8 +175,6 @@ ATF_TC_BODY(fnmatch_initialbracket, tc)
ATF_CHECK(fnmatch("[*]/b", "a/b", 0) != 0);
ATF_CHECK(fnmatch("[?]/b", "a/b", 0) != 0);
-
- atf_tc_expect_fail("PR lib/49278");
}
ATF_TP_ADD_TCS(tp)
