From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 18 Sep 2012 15:45:57 +0000 (+0000)
Subject: Don't set TIMEOUTFACTOR in sysdeps/wordsize-64/Makefile.
X-Git-Tag: glibc-2.17~537
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63bbedd4c213736a88dd863bcbfe91cfe453ce03;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index bb46639470f..ffdcfc1eb2c 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 9903f51f9a6..2fa934751f0 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 49a809cfa67..0bc2f70b64f 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"