This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-342-g63bbedd
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Sep 2012 15:46:10 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-342-g63bbedd
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 63bbedd4c213736a88dd863bcbfe91cfe453ce03 (commit)
from 626f8b6abbdb817db94adc96bc3437ec4fbe76a0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=63bbedd4c213736a88dd863bcbfe91cfe453ce03
commit 63bbedd4c213736a88dd863bcbfe91cfe453ce03
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Sep 18 15:45:57 2012 +0000
Don't set TIMEOUTFACTOR in sysdeps/wordsize-64/Makefile.
diff --git a/ChangeLog b/ChangeLog
index bb46639..ffdcfc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-18 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/wordsize-64/Makefile [$(subdir) = misc]
+ (tst-writev-ENV): Remove.
+ * sysdeps/wordsize-64/tst-writev.c (TIMEOUT): Define.
+
2012-09-17 Chris Metcalf <cmetcalf@tilera.com>
* crypt/md5test-giant.c (TIMEOUT): Increase to 8 minutes for tilegx.
diff --git a/sysdeps/wordsize-64/Makefile b/sysdeps/wordsize-64/Makefile
index 9903f51..2fa9347 100644
--- a/sysdeps/wordsize-64/Makefile
+++ b/sysdeps/wordsize-64/Makefile
@@ -1,6 +1,3 @@
ifeq ($(subdir),misc)
tests += tst-writev
-
-# Time enough for a large writev syscall to complete.
-tst-writev-ENV = TIMEOUTFACTOR="10"
endif
diff --git a/sysdeps/wordsize-64/tst-writev.c b/sysdeps/wordsize-64/tst-writev.c
index 49a809c..0bc2f70 100644
--- a/sysdeps/wordsize-64/tst-writev.c
+++ b/sysdeps/wordsize-64/tst-writev.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ryan S. Arnold <rsa@us.ibm.com>, 2011.
@@ -108,5 +108,8 @@ do_test (void)
return 0;
}
+/* Time enough for a large writev syscall to complete. */
+#define TIMEOUT 20
+
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/wordsize-64/Makefile | 3 ---
sysdeps/wordsize-64/tst-writev.c | 5 ++++-
3 files changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources