Author: aurel32 Date: 2008-07-08 16:27:47 +0000 (Tue, 08 Jul 2008) New Revision: 2986
Added: glibc-package/trunk/debian/patches/any/cvs-tst-regex.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: * any/cvs-tst-regex.diff: new patch from CVS to add a timeout to tst-regex. Closes: #489856. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2008-07-07 07:59:56 UTC (rev 2985) +++ glibc-package/trunk/debian/changelog 2008-07-08 16:27:47 UTC (rev 2986) @@ -7,6 +7,8 @@ initialize internal resolver structures in getaddrinfo(). Closes: #489586. * Update Romanian debconf translation, by Eddy Petrişor. Closes: #488734. + * any/cvs-tst-regex.diff: new patch from CVS to add a timeout to tst-regex. + Closes: #489856. [ Petr Salinger] * debian/sysdeps/kfreebsd.mk: also use the bsm/ directory from kernel @@ -24,7 +26,7 @@ * patches/hurd-i386/cvs-open_2.diff: New patch to implement __open_2 and __openat_2. Together with kfreebsd update closes: #489357. - -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 07 Jul 2008 06:52:43 +0200 + -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 08 Jul 2008 18:26:28 +0200 glibc (2.7-12) unstable; urgency=low Added: glibc-package/trunk/debian/patches/any/cvs-tst-regex.diff =================================================================== --- glibc-package/trunk/debian/patches/any/cvs-tst-regex.diff (rev 0) +++ glibc-package/trunk/debian/patches/any/cvs-tst-regex.diff 2008-07-08 16:27:47 UTC (rev 2986) @@ -0,0 +1,59 @@ +commit 0bc0c4cfb2c2320314228c335f38b7a9a9b84c34 +Author: Ulrich Drepper <[EMAIL PROTECTED]> +Date: Wed Jun 25 23:25:56 2008 +0000 + + (main): Rename to... + (do_test): ... this. Remove cmdline option processing. + (TIMEOUT): Define. + (TEST_FUNCTION): Define. + (CMDLINE_OPTIONS): Define. + +diff --git a/posix/tst-regex.c b/posix/tst-regex.c +index 6a71e12..a7fba69 100644 +--- a/posix/tst-regex.c ++++ b/posix/tst-regex.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001, 2003 Free Software Foundation, Inc. ++/* Copyright (C) 2001, 2003, 2008 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -55,8 +55,8 @@ static int run_test_backwards (const char *expr, const char *mem, + size_t memlen, int icase, int expected); + + +-int +-main (int argc, char *argv[]) ++static int ++do_test (void) + { + const char *file; + int fd; +@@ -66,16 +66,9 @@ main (int argc, char *argv[]) + char *outmem; + size_t inlen; + size_t outlen; +- static const struct option options[] = +- { +- {"timing",no_argument, &timing, 1 }, +- {NULL, 0, NULL, 0 } +- }; + + mtrace (); + +- while (getopt_long (argc, argv, "", options, NULL) >= 0); +- + /* Make the content of the file available in memory. */ + file = "../ChangeLog.8"; + fd = open (file, O_RDONLY); +@@ -506,3 +499,10 @@ run_test_backwards (const char *expr, const char *mem, size_t memlen, + expect. */ + return cnt != expected; + } ++ ++/* If --timing is used we will need a larger timout. */ ++#define TIMEOUT 50 ++#define CMDLINE_OPTIONS \ ++ {"timing", no_argument, &timing, 1 }, ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2008-07-07 07:59:56 UTC (rev 2985) +++ glibc-package/trunk/debian/patches/series 2008-07-08 16:27:47 UTC (rev 2986) @@ -152,6 +152,7 @@ any/cvs-rfc3484.diff -p1 any/cvs-sched_h.diff -p0 any/cvs-strtod.diff -p1 +any/cvs-tst-regex.diff -p1 any/cvs-tzfile.diff -p1 any/cvs-vfscanf.diff -p0 any/cvs-wchar_h.diff -p0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]