This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Don't set TIMEOUTFACTOR in sysdeps/wordsize-64/Makefile
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Tue, 18 Sep 2012 00:50:50 +0000
- Subject: Don't set TIMEOUTFACTOR in sysdeps/wordsize-64/Makefile
As I noted in
<http://sourceware.org/ml/libc-alpha/2012-09/msg00469.html>,
TIMEOUTFACTOR is a hook for *users* of slower systems to set when
running the testsuite; makefiles shouldn't set it themselves because
that overrides any user setting.
This patch changes the one place where a makefile did set
TIMEOUTFACTOR to set TIMEOUT directly in the test instead. Tested
x86_64.
2012-09-17 Joseph Myers <joseph@codesourcery.com>
* sysdeps/wordsize-64/Makefile [$(subdir) = misc]
(tst-writev-ENV): Remove.
* sysdeps/wordsize-64/tst-writev.c (TIMEOUT): Define.
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"
--
Joseph S. Myers
joseph@codesourcery.com