Author: kevans
Date: Tue Mar 26 02:21:09 2019
New Revision: 345516
URL: https://svnweb.freebsd.org/changeset/base/345516
Log:
MFV r345515: netbsd-tests: import memory bump for libc/regex/t_exhaust
MFC after: 3 days
Modified:
head/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c
Directory Properties:
head/contrib/netbsd-tests/ (props changed)
Modified: head/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c Tue Mar 26
02:13:25 2019 (r345515)
+++ head/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c Tue Mar 26
02:21:09 2019 (r345516)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_exhaust.c,v 1.8 2017/01/14 00:50:56 christos Exp $ */
+/* $NetBSD: t_exhaust.c,v 1.9 2019/03/16 21:57:15 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_exhaust.c,v 1.8 2017/01/14 00:50:56 christos Exp $");
+__RCSID("$NetBSD: t_exhaust.c,v 1.9 2019/03/16 21:57:15 christos Exp $");
#include <sys/resource.h>
#include <atf-c.h>
@@ -56,7 +56,7 @@ mkstr(const char *str, size_t len)
{
size_t slen = strlen(str);
char *p = malloc(slen * len + 1);
- ATF_REQUIRE(p != NULL);
+ ATF_REQUIRE_MSG(p != NULL, "slen=%zu, len=%zu", slen, len);
for (size_t i = 0; i < len; i++)
strcpy(&p[i * slen], str);
return p;
@@ -183,11 +183,12 @@ ATF_TC_HEAD(regcomp_too_big, tc)
ATF_TC_BODY(regcomp_too_big, tc)
{
regex_t re;
- struct rlimit limit;
int e;
+ struct rlimit limit;
- limit.rlim_cur = limit.rlim_max = 64 * 1024 * 1024;
+ limit.rlim_cur = limit.rlim_max = 256 * 1024 * 1024;
ATF_REQUIRE(setrlimit(RLIMIT_VMEM, &limit) != -1);
+
for (size_t i = 0; i < __arraycount(tests); i++) {
char *d = (*tests[i].pattern)(REGEX_MAXSIZE);
e = regcomp(&re, d, tests[i].type);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
