Disabled flock tests on darwin, fixed linux/darwin constant in openat

Author: otethal

graalpython/com.oracle.graal.python.cext/posix/posix.c

@@ -107,12 +107,28 @@ int32_t set_inheritable(int32_t fd, int32_t inheritable) {
 int32_t call_openat(int32_t dirFd, const char *pathname, int32_t flags, int32_t mode) {
     int fixedFlags = flags;
     // TODO remove this once we properly synchronize constants between Java and C
-    if (flags & 64) {
-        fixedFlags &= ~64;
+
+#define WRONG_O_CLOEXEC 524288
+#define WRONG_O_APPEND 1024
+#define WRONG_O_TRUNC 512
+#define WRONG_O_EXCL 128
+#define WRONG_O_CREAT 64
+
+    fixedFlags &= ~(WRONG_O_CLOEXEC | WRONG_O_APPEND | WRONG_O_TRUNC | WRONG_O_EXCL | WRONG_O_CREAT);
+
+    if (flags & WRONG_O_CREAT) {
         fixedFlags |= O_CREAT;
     }
-    if (flags & 524288) {
-        fixedFlags &= ~524288;
+    if (flags & WRONG_O_EXCL) {
+        fixedFlags |= O_EXCL;
+    }
+    if (flags & WRONG_O_TRUNC) {
+        fixedFlags |= O_TRUNC;
+    }
+    if (flags & WRONG_O_APPEND) {
+        fixedFlags |= O_APPEND;
+    }
+    if (flags & WRONG_O_CLOEXEC) {
         fixedFlags |= O_CLOEXEC;
     }
     return openat(fixDirFd(dirFd), pathname, fixedFlags, mode);

graalpython/com.oracle.graal.python.test/src/tests/test_fcntl.py

@@ -51,6 +51,7 @@ def posix_module_backend(self):
 import tempfile
 import time
 import unittest
+import sys
 
 PREFIX = 'select_graalpython_test'
 TEMP_DIR = tempfile.gettempdir()
@@ -82,18 +83,22 @@ def python_flock_blocks_sh_flock(python_flock_type, sh_flock_type):
 
 class FcntlTests(unittest.TestCase):
     @unittest.skipUnless(__graalpython__.posix_module_backend() != 'java', 'No support in Truffle API (GR-28740)')
+    @unittest.skipUnless(sys.platform != 'darwin', 'MacOSX does not have flock utility')
     def test_flock_x_and_x(self):
         python_flock_blocks_sh_flock(fcntl.LOCK_EX, 'x')
 
     @unittest.skipUnless(__graalpython__.posix_module_backend() != 'java', 'No support in Truffle API (GR-28740)')
+    @unittest.skipUnless(sys.platform != 'darwin', 'MacOSX does not have flock utility')
     def test_flock_x_and_s(self):
         python_flock_blocks_sh_flock(fcntl.LOCK_EX, 's')
 
     @unittest.skipUnless(__graalpython__.posix_module_backend() != 'java', 'No support in Truffle API (GR-28740)')
+    @unittest.skipUnless(sys.platform != 'darwin', 'MacOSX does not have flock utility')
     def test_flock_s_and_x(self):
         python_flock_blocks_sh_flock(fcntl.LOCK_SH, 'x')
 
     @unittest.skipUnless(__graalpython__.posix_module_backend() != 'java', 'No support in Truffle API (GR-28740)')
+    @unittest.skipUnless(sys.platform != 'darwin', 'MacOSX does not have flock utility')
     def test_flock_s_and_s(self):
         os.close(os.open(TEST_FILENAME_FULL_PATH, os.O_WRONLY | os.O_CREAT))
         file = os.open(TEST_FILENAME_FULL_PATH, os.O_WRONLY)
@@ -104,4 +109,4 @@ def test_flock_s_and_s(self):
             assert p.poll() == 42
         finally:
             fcntl.flock(file, fcntl.LOCK_UN)
-            os.close(file)
+            os.close(file)