From bd16a3a8a8a1b0f2971e6bac6c896320f02208c2 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 1 Dec 2003 17:33:11 +0000 Subject: [PATCH] * winsup.api/known_bugs.tcl: Remove fcntl09 and fcntl10. These tests had a compatibility bug. * winsup.api/ltp/fcntl09.c: Don't use F_RDLCK | F_WRLCK but only F_WRLCK to set a write lock. * winsup.api/ltp/fcntl10.c: Ditto. --- winsup/testsuite/ChangeLog | 8 ++++++++ winsup/testsuite/winsup.api/known_bugs.tcl | 2 +- winsup/testsuite/winsup.api/ltp/fcntl09.c | 6 ++++++ winsup/testsuite/winsup.api/ltp/fcntl10.c | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog index 2a320194c..353bfb00e 100644 --- a/winsup/testsuite/ChangeLog +++ b/winsup/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2003-12-01 Corinna Vinschen + + * winsup.api/known_bugs.tcl: Remove fcntl09 and fcntl10. These + tests had a compatibility bug. + * winsup.api/ltp/fcntl09.c: Don't use F_RDLCK | F_WRLCK but only + F_WRLCK to set a write lock. + * winsup.api/ltp/fcntl10.c: Ditto. + 2003-11-25 Christopher Faylor * winsup.api/known_bugs.tcl: Remove lseek10 since mknod now works. diff --git a/winsup/testsuite/winsup.api/known_bugs.tcl b/winsup/testsuite/winsup.api/known_bugs.tcl index b7416fdb4..f3fc01527 100644 --- a/winsup/testsuite/winsup.api/known_bugs.tcl +++ b/winsup/testsuite/winsup.api/known_bugs.tcl @@ -1,5 +1,5 @@ set xfail_list [list dup03 dup05 \ - fcntl05 fcntl07B fcntl09 fcntl10 \ + fcntl05 fcntl07B \ lseek04 mknod01 select03 \ setgroups01 setuid02 \ ulimit01 unlink06 unlink08 \ diff --git a/winsup/testsuite/winsup.api/ltp/fcntl09.c b/winsup/testsuite/winsup.api/ltp/fcntl09.c index 523bd094b..3a827e149 100644 --- a/winsup/testsuite/winsup.api/ltp/fcntl09.c +++ b/winsup/testsuite/winsup.api/ltp/fcntl09.c @@ -161,7 +161,13 @@ main(int ac, char **av) /* reset Tst_count in case we are looping. */ Tst_count=0; +#if 0 + /* Ouch! Either read *or* write lock, but not both! + This code depends on F_RDLCK being 0. */ flocks.l_type = F_RDLCK | F_WRLCK; +#else + flocks.l_type = F_WRLCK; +#endif /* * Call fcntl(2) with F_SETLK argument on fname */ diff --git a/winsup/testsuite/winsup.api/ltp/fcntl10.c b/winsup/testsuite/winsup.api/ltp/fcntl10.c index 661f69691..e2de44bef 100644 --- a/winsup/testsuite/winsup.api/ltp/fcntl10.c +++ b/winsup/testsuite/winsup.api/ltp/fcntl10.c @@ -161,7 +161,13 @@ main(int ac, char **av) /* reset Tst_count in case we are looping. */ Tst_count=0; +#if 0 + /* Ouch! Either read *or* write lock, but not both! + This code depends on F_RDLCK being 0. */ flocks.l_type = F_RDLCK | F_WRLCK; +#else + flocks.l_type = F_WRLCK; +#endif /* * Call fcntl(2) with F_SETLKW flocks.l_type = F_UNLCK argument on fname */