* 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.

diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 2a320194c3a5d92b4532e8d8f3774abee15afc17..353bfb00e286ed7ab223583b6df86350dc156083 100644 (file)
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-01  Corinna Vinschen  <corinna@vinschen.de>
+
+       * 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  <cgf@redhat.com>
 
        * 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 b7416fdb4c41efb514567c1f25ed68883ef2f3b5..f3fc01527e7bdd24ebc82d92ebbf9de37b167f85 100644 (file)
--- 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 523bd094b2da7ff4d7667a591b26bd3545bc97b6..3a827e149410425214d805dfd36401823eb5699f 100644 (file)
--- 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 661f6969160e82f71f71df6b1e0c0933578abbf6..e2de44bef55c65d59eebed5d1ab0051e059729f7 100644 (file)
--- 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
         */