about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--elf/tst-tls13.c1
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/tst-cancel9.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/elf/tst-tls13.c b/elf/tst-tls13.c
index 31b9cfbba3..55fb62e540 100644
--- a/elf/tst-tls13.c
+++ b/elf/tst-tls13.c
@@ -26,4 +26,5 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
+#define TIMEOUT 3
 #include "../test-skeleton.c"
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b079883f6b..bb7fe88cfe 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* tst-cancel9.c (cleanup): Don't print to stderr.
+
 2004-02-20  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* sysdeps/sh/jmpbuf-unwind.h (_JMPBUF_UNWINDS_ADJ): Fix variable name.
diff --git a/nptl/tst-cancel9.c b/nptl/tst-cancel9.c
index 1d59e19e0f..037ef30fd6 100644
--- a/nptl/tst-cancel9.c
+++ b/nptl/tst-cancel9.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -31,7 +31,7 @@ static pthread_barrier_t b;
 static void
 cleanup (void *arg)
 {
-  fprintf (stderr, "in cleanup\n");
+  fputs ("in cleanup\n", stdout);
 }