Date: Sun, 12 Oct 2014 21:59:24 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273012 - head/contrib/netbsd-tests/lib/libc/regex Message-ID: <201410122159.s9CLxOAK002213@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Oct 12 21:59:23 2014 New Revision: 273012 URL: https://svnweb.freebsd.org/changeset/base/273012 Log: - Add libutil #include for fparseln - Change ATF_REQUIRE_EQ_MSG to ATF_CHECK_EQ_MSG to gather all failing results possible (currently 12 with leftassoc) - Mark leftassoc "atf_tc_expect_fail" on FreeBSD (PR coming soon after further analysis is done on the code) In collaboration with: pho Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c Modified: head/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c ============================================================================== --- head/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c Sun Oct 12 21:54:55 2014 (r273011) +++ head/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c Sun Oct 12 21:59:23 2014 (r273012) @@ -48,6 +48,9 @@ __RCSID("$NetBSD: t_regex_att.c,v 1.1 20 #include <vis.h> #include <ctype.h> #include <atf-c.h> +#if defined(__FreeBSD__) +#include <libutil.h> +#endif static const char sep[] = "\r\n\t"; static const char delim[3] = "\\\\\0"; @@ -374,7 +377,11 @@ checkmatches(const char *matches, size_t " cur=%d, max=%zu", res, l, len - off); off += l; } +#if defined(__FreeBSD__) + ATF_CHECK_STREQ_MSG(res, matches, " at line %zu", lineno); +#else ATF_REQUIRE_STREQ_MSG(res, matches, " at line %zu", lineno); +#endif free(res); } @@ -573,6 +580,9 @@ ATF_TC_BODY(leftassoc, tc) * any explation. Mark as broken here, but I don't know why. */ atf_tc_expect_fail("Reason for breakage unknown"); #endif +#if defined(__FreeBSD__) + atf_tc_expect_fail("The expected and matched groups are mismatched on FreeBSD"); +#endif att_test(tc, "leftassoc"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410122159.s9CLxOAK002213>