about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--iconvdata/tst-loading.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e15a3cf8af..6bd8a385e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-12-19  Chris Metcalf  <cmetcalf@ezchip.com>
 
+	* iconvdata/tst-loading.c (TIMEOUT): Increase timeout 10 sec.
+
 	* math/atest-exp.c (TIMEOUT): Increase timeout to 10 sec.
 	* math/atest-exp2.c (TIMEOUT): Likewise.
 	* math/atest-sincos.c (TIMEOUT): Likewise.
diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c
index eff9d784eb..11bbbf2120 100644
--- a/iconvdata/tst-loading.c
+++ b/iconvdata/tst-loading.c
@@ -181,5 +181,6 @@ do_test (void)
   return result;
 }
 
+#define TIMEOUT 10
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"