diff options
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/Makefile | 7 | ||||
| -rw-r--r-- | rt/tst-aio.c | 8 | ||||
| -rw-r--r-- | rt/tst-aio2.c | 8 | ||||
| -rw-r--r-- | rt/tst-aio3.c | 8 | ||||
| -rw-r--r-- | rt/tst-aio4.c | 8 | ||||
| -rw-r--r-- | rt/tst-aio5.c | 8 | ||||
| -rw-r--r-- | rt/tst-aio6.c | 5 | ||||
| -rw-r--r-- | rt/tst-aio64.c | 8 | ||||
| -rw-r--r-- | rt/tst-aio7.c | 8 |
9 files changed, 55 insertions, 13 deletions
diff --git a/rt/Makefile b/rt/Makefile index f14aa3b585..5ac4dd4f63 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -38,10 +38,9 @@ librt-routines = $(aio-routines) \ $(clock-routines) $(timer-routines) \ $(shm-routines) -tests := tst-shm tst-clock tst-timer -ifeq ($(have-thread-library),yes) -tests += tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 -endif +tests := tst-shm tst-clock tst-timer \ + tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ + tst-aio7 extra-libs := librt extra-libs-others := $(extra-libs) diff --git a/rt/tst-aio.c b/rt/tst-aio.c index 4d617999c5..1b24542441 100644 --- a/rt/tst-aio.c +++ b/rt/tst-aio.c @@ -1,5 +1,5 @@ /* Tests for AIO in librt. - Copyright (C) 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1998,2000,02 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -162,7 +162,11 @@ do_test (int argc, char *argv[]) /* First a simple test. */ for (cnt = 10; cnt > 0; ) - aio_write (cbp[--cnt]); + if (aio_write (cbp[--cnt]) < 0 && errno == ENOSYS) + { + error (0, 0, "no aio support in this configuration"); + return 0; + } /* Wait 'til the results are there. */ result |= do_wait (cbp, 10, 0); /* Test this. */ diff --git a/rt/tst-aio2.c b/rt/tst-aio2.c index 21e516984b..1ff92ce93b 100644 --- a/rt/tst-aio2.c +++ b/rt/tst-aio2.c @@ -1,5 +1,5 @@ /* Test for notification mechanism in lio_listio. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000,02 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <errno.h> int flag; @@ -67,6 +68,11 @@ do_test (int argc, char *argv[]) if (lio_listio (LIO_WAIT, arr, 1, NULL) < 0) { + if (errno == ENOSYS) + { + puts ("no aio support in this configuration"); + return 0; + } printf ("lio_listio failed: %m\n"); return 1; } diff --git a/rt/tst-aio3.c b/rt/tst-aio3.c index d4f8dc532f..0c0ced4501 100644 --- a/rt/tst-aio3.c +++ b/rt/tst-aio3.c @@ -1,5 +1,5 @@ /* Test for notification mechanism in lio_listio. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000,02 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 @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <errno.h> int flag; @@ -66,6 +67,11 @@ do_test (int argc, char *argv[]) if (lio_listio (LIO_NOWAIT, arr, 1, NULL) < 0) { + if (errno == ENOSYS) + { + puts ("no aio support in this configuration"); + return 0; + } printf ("lio_listio failed: %m\n"); return 1; } diff --git a/rt/tst-aio4.c b/rt/tst-aio4.c index 95efdcf7d2..847974d502 100644 --- a/rt/tst-aio4.c +++ b/rt/tst-aio4.c @@ -1,5 +1,5 @@ /* Test for completion signal handling. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000,01,02 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 @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <errno.h> /* We might need a bit longer timeout. */ #define TIMEOUT 10 /* sec */ @@ -126,6 +127,11 @@ do_test (int argc, char *argv[]) /* First use aio_write. */ if (aio_write (arr[0]) < 0) { + if (errno == ENOSYS) + { + puts ("no aio support in this configuration"); + return 0; + } printf ("aio_write failed: %m\n"); return 1; } diff --git a/rt/tst-aio5.c b/rt/tst-aio5.c index 612798a1ec..cc7152ecbd 100644 --- a/rt/tst-aio5.c +++ b/rt/tst-aio5.c @@ -1,5 +1,5 @@ /* Test for completion thread handling. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000,02 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 @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <errno.h> /* We might need a bit longer timeout. */ #define TIMEOUT 10 /* sec */ @@ -96,6 +97,11 @@ do_test (int argc, char *argv[]) /* First use aio_write. */ if (aio_write (arr[0]) < 0) { + if (errno == ENOSYS) + { + puts ("no aio support in this configuration"); + return 0; + } printf ("aio_write failed: %m\n"); return 1; } diff --git a/rt/tst-aio6.c b/rt/tst-aio6.c index b2da94233b..ac724b01f3 100644 --- a/rt/tst-aio6.c +++ b/rt/tst-aio6.c @@ -60,6 +60,11 @@ do_test (void) /* Try to read from stdin where nothing will be available. */ if (aio_read (arr[0]) < 0) { + if (errno == ENOSYS) + { + puts ("no aio support in this configuration"); + return 0; + } printf ("aio_read failed: %m\n"); return 1; } diff --git a/rt/tst-aio64.c b/rt/tst-aio64.c index 14552c9aec..4663d75562 100644 --- a/rt/tst-aio64.c +++ b/rt/tst-aio64.c @@ -1,5 +1,5 @@ /* Tests for 64bit AIO in librt. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998,99,2000,02 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -163,7 +163,11 @@ do_test (int argc, char *argv[]) /* First a simple test. */ for (cnt = 10; cnt > 0; ) - aio_write64 (cbp[--cnt]); + if (aio_write64 (cbp[--cnt]) < 0 && errno == ENOSYS) + { + error (0, 0, "no aio support in this configuration"); + return 0; + } /* Wait 'til the results are there. */ result |= do_wait (cbp, 10, 0); /* Test this. */ diff --git a/rt/tst-aio7.c b/rt/tst-aio7.c index 1b3bdeaadf..ecb45cb156 100644 --- a/rt/tst-aio7.c +++ b/rt/tst-aio7.c @@ -1,5 +1,5 @@ /* Test for AIO POSIX compliance. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001,02 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 @@ -52,6 +52,12 @@ do_test (void) /* Case one: invalid fds that match. */ if (aio_cancel (fd, &cb) != -1 || errno != EBADF) { + if (errno == ENOSYS) + { + puts ("no aio support in this configuration"); + return 0; + } + puts ("aio_cancel( -1, {-1..} ) did not return -1 or errno != EBADF"); ++result; } |