Don't set TIMEOUTFACTOR in sysdeps/wordsize-64/Makefile.

diff --git a/ChangeLog b/ChangeLog
index bb46639470fce4ccf2d13172a44690b85ad8f7f9..ffdcfc1eb2c42848e936f774cb9f975052b0bec3 100644 (file)
--- 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 9903f51f9a67f8f6aeeecf5c2263599beba88b84..2fa934751f04053ddb6528de5007a1f59e05fd2d 100644 (file)
--- 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 49a809cfa6712398ccb7ae43c8176eab332a1c0a..0bc2f70b64f0764db180bae3633926809ccc9e1c 100644 (file)
--- 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"