aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--linuxthreads/ChangeLog4
-rw-r--r--linuxthreads/sysdeps/pthread/Makefile6
-rw-r--r--rt/Makefile2
-rw-r--r--sysdeps/generic/tst-timer.c33
5 files changed, 42 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index af6a7d394f..82edce48f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-06-13 Ulrich Drepper <drepper@redhat.com>
+ * rt/Makefile (tests): Add tst-timer.
+ * sysdeps/generic/tst-timer.c: New file.
+
* Makerules (sources): Don't add BP sources here.
* login/Makefile (distribute): Remove xtmp.h.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 3d2d81811f..ac107ad551 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-13 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/pthread/Makefile: Remove tests definition.
+
2000-06-12 Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Yutaka Niibe <gniibe@chroot.org>
diff --git a/linuxthreads/sysdeps/pthread/Makefile b/linuxthreads/sysdeps/pthread/Makefile
index e896cadf43..a0d3315235 100644
--- a/linuxthreads/sysdeps/pthread/Makefile
+++ b/linuxthreads/sysdeps/pthread/Makefile
@@ -1,9 +1,5 @@
ifeq ($(subdir),rt)
-librt-routines += timer_routines
-
-ifeq ($(have-thread-library),yes)
-tests += tst-timer
-endif
+librt-sysdep_routines += timer_routines
ifeq (yes,$(build-shared))
$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
diff --git a/rt/Makefile b/rt/Makefile
index 038636c497..c4dce69c84 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -39,7 +39,7 @@ include ../Makeconfig
ifeq ($(have-thread-library),yes)
-tests := tst-aio tst-aio64 tst-clock tst-shm
+tests := tst-aio tst-aio64 tst-clock tst-shm tst-timer
extra-libs := librt
extra-libs-others := $(extra-libs)
diff --git a/sysdeps/generic/tst-timer.c b/sysdeps/generic/tst-timer.c
new file mode 100644
index 0000000000..1154d3c387
--- /dev/null
+++ b/sysdeps/generic/tst-timer.c
@@ -0,0 +1,33 @@
+/* Tests for POSIX timer implementation. Dummy version.
+ Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <unistd.h>
+
+/* This file is only used if there is no other implementation and it should
+ means that there is no implementation of POSIX timers. */
+int
+main (void)
+{
+#ifdef _POSIX_TIMERS
+ /* There should be a test. */
+ return 1;
+#else
+ return 0;
+#endif
+}