git: 0efb22eebbbb - stable/12 - MFC r356352, r368272

[Alan Somers]

The branch stable/12 has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=0efb22eebbbbd5f164cab39dca72a78cce82afe3

commit 0efb22eebbbbd5f164cab39dca72a78cce82afe3
Author:     Alan Somers <asomers at FreeBSD.org>
AuthorDate: 2020-01-04 18:59:46 +0000
Commit:     Alan Somers <asomers at FreeBSD.org>
CommitDate: 2020-12-30 03:02:47 +0000

    MFC r356352, r368272
    
    lio_listio_empty_nowait_thread sometimes does *not* hang.
    
    The other tests consistently do hang though.
    
    Sponsored by:   DellEMC
    
    (cherry picked from commit 0cb4586a0be3b1b5909b73b24798032ddf2f4002)
    
    AIO tests: update expected failure messages after r368265
    
    PR:             220398, 251515
    
    (cherry picked from commit 23693bd8f3e36b4721d7b59d52154d3e3f49e3cd)
---
 tests/sys/aio/lio_test.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/sys/aio/lio_test.c b/tests/sys/aio/lio_test.c
index 383d80bc0c3f..b6965cc9a4ee 100644
--- a/tests/sys/aio/lio_test.c
+++ b/tests/sys/aio/lio_test.c
@@ -143,8 +143,8 @@ ATF_TC_BODY(lio_listio_empty_nowait_kevent, tc)
 	int kq, result;
 	void *udata = (void*)0xdeadbeefdeadbeef;
 
-	atf_tc_expect_timeout("Bug 220398 - lio_listio(2) never sends"
-			" asynchronous notification if nent==0");
+	atf_tc_expect_timeout("Bug 251515 - lio_listio(2) never sends"
+			" kevent if nent==0");
 	kq = kqueue();
 	ATF_REQUIRE(kq > 0);
 	sev.sigev_notify = SIGEV_KEVENT;
@@ -168,8 +168,6 @@ ATF_TC_BODY(lio_listio_empty_nowait_signal, tc)
 	struct aiocb *list = NULL;
 	struct sigevent sev;
 
-	atf_tc_expect_timeout("Bug 220398 - lio_listio(2) never sends"
-	    " asynchronous notification if nent==0");
 	ATF_REQUIRE_EQ(0, sem_init(&completions, false, 0));
 	sev.sigev_notify = SIGEV_SIGNAL;
 	sev.sigev_signo = SIGUSR1;
@@ -189,8 +187,6 @@ ATF_TC_BODY(lio_listio_empty_nowait_thread, tc)
 	struct aiocb *list = NULL;
 	struct sigevent sev;
 
-	atf_tc_expect_timeout("Bug 220398 - lio_listio(2) never sends"
-	    " asynchronous notification if nent==0");
 	ATF_REQUIRE_EQ(0, sem_init(&completions, false, 0));
 	bzero(&sev, sizeof(sev));
 	sev.sigev_notify = SIGEV_THREAD;