[Commits] r20736 - in /fsf/trunk/libc: ChangeLog sysdeps/wordsize-64/Makefile sysdeps/wordsize-64/tst-writev.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Sep 19 00:01:57 2012
New Revision: 20736

Log:
Import glibc-mainline for 2012-09-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/wordsize-64/Makefile
    fsf/trunk/libc/sysdeps/wordsize-64/tst-writev.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Sep 19 00:01:57 2012
@@ -1,3 +1,9 @@
+2012-09-18  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/wordsize-64/Makefile [$(subdir) = misc]
+	(tst-writev-ENV): Remove.
+	* sysdeps/wordsize-64/tst-writev.c (TIMEOUT): Define.
+
 2012-09-17  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* crypt/md5test-giant.c (TIMEOUT): Increase to 8 minutes for tilegx.

Modified: fsf/trunk/libc/sysdeps/wordsize-64/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/Makefile (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/Makefile Wed Sep 19 00:01:57 2012
@@ -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

Modified: fsf/trunk/libc/sysdeps/wordsize-64/tst-writev.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/tst-writev.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/tst-writev.c Wed Sep 19 00:01:57 2012
@@ -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@xxxxxxxxxx>, 2011.
 
@@ -108,5 +108,8 @@
   return 0;
 }
 
+/* Time enough for a large writev syscall to complete.  */
+#define TIMEOUT 20
+
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits