From: Roland McGrath <roland@gnu.org>
Date: Thu, 6 Mar 2003 20:21:47 +0000 (+0000)
Subject: * rt/tst-aio7.c (do_test): Revert last change.  Instead, give CB1
X-Git-Tag: cvs/glibc-2_3_3~1346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=696efd11f3e7873d89365ab60cd9f1feb0fa3a63;p=thirdparty%2Fglibc.git

* rt/tst-aio7.c (do_test): Revert last change.  Instead, give CB1

	permanent extent and add a comment about testing its implicit teardown.
---

diff --git a/ChangeLog b/ChangeLog
index 0782c7ed582..20d27d6d628 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 b2ba81312a4..2925b6233cd 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;