aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-03-06 20:21:47 +0000
committerRoland McGrath <roland@gnu.org>2003-03-06 20:21:47 +0000
commit696efd11f3e7873d89365ab60cd9f1feb0fa3a63 (patch)
tree64c45f8a8e5a7cdc751dc31916eb440746883f98
parentf1a56a2b9572ab19d7e6a7dcbef0e7d16471cf6c (diff)
downloadglibc-696efd11f3e7873d89365ab60cd9f1feb0fa3a63.zip
glibc-696efd11f3e7873d89365ab60cd9f1feb0fa3a63.tar.gz
glibc-696efd11f3e7873d89365ab60cd9f1feb0fa3a63.tar.bz2
* rt/tst-aio7.c (do_test): Revert last change. Instead, give CB1
permanent extent and add a comment about testing its implicit teardown.
-rw-r--r--ChangeLog5
-rw-r--r--rt/tst-aio7.c13
2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 0782c7e..20d27d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-06 Roland McGrath <roland@redhat.com>
+
+ * rt/tst-aio7.c (do_test): Revert last change. Instead, give CB1
+ permanent extent and add a comment about testing its implicit teardown.
+
2003-03-06 Martin Schwidefsky <schwidefsky@de.ibm.com>
* rt/tst-aio7.c (do_test): Cancel i/o on CB1 before it's out of scope.
diff --git a/rt/tst-aio7.c b/rt/tst-aio7.c
index b2ba813..2925b62 100644
--- a/rt/tst-aio7.c
+++ b/rt/tst-aio7.c
@@ -1,5 +1,5 @@
/* Test for AIO POSIX compliance.
- Copyright (C) 2001,02 Free Software Foundation, Inc.
+ Copyright (C) 2001,02, 03 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
@@ -122,7 +122,7 @@ do_test (void)
char buff[BYTES];
char name[] = "/tmp/aio7.XXXXXX";
struct timespec timeout;
- struct aiocb cb0, cb1;
+ static struct aiocb cb0, cb1;
struct aiocb *list[ELEMS];
fd = mkstemp (name);
@@ -181,13 +181,8 @@ do_test (void)
++result;
}
- /* Cancel i/o on cb1. */
- r = aio_cancel (piped[0], &cb1);
- if (r != AIO_CANCELED)
- {
- puts ("aio_cancel did not return AIO_CANCELED");
- ++result;
- }
+ /* Note that CB1 is still pending, and so cannot be an auto variable.
+ Thus we also test that exiting with an outstanding request works. */
}
return result;