koffi 0.9.18 → 0.9.21

package/test/test.js

@@ -23,13 +23,14 @@ const util = require('util');
 const { spawn, spawnSync } = require('child_process');
 const { NodeSSH } = require('node-ssh');
 const chalk = require('chalk');
+const minimatch = require('minimatch');
 
 // Globals
 
 let script_dir = null;
 let root_dir = null;
 
-let machines = [];
+let machines = null;
 let accelerate = true;
 let ignore = new Set;
 
@@ -47,6 +48,7 @@ async function main() {
     process.chdir(script_dir);
 
     let command = test;
+    let patterns = [];
 
     // Parse options
     {
@@ -54,19 +56,13 @@ async function main() {
 
         if (process.argv.length >= 3 && process.argv[2][0] != '-') {
             switch (process.argv[2]) {
-                case 'test': { command = test; } break;
-                case 'start': { command = start; } break;
-                case 'stop': { command = stop; } break;
-                case 'info': { command = info; } break;
-                case 'ssh': { command = ssh; } break;
-                case 'reset': { command = reset; } break;
-
-                default: {
-                    throw new Error(`Unknown command '${process.argv[2]}'`);
-                } break;
+                case 'test': { command = test; i++; } break;
+                case 'start': { command = start; i++; } break;
+                case 'stop': { command = stop; i++; } break;
+                case 'info': { command = info; i++; } break;
+                case 'ssh': { command = ssh; i++; } break;
+                case 'reset': { command = reset; i++; } break;
             }
-
-            i++;
         }
 
         for (; i < process.argv.length; i++) {
@@ -102,7 +98,7 @@ async function main() {
                 if (arg.startsWith('__') || arg.match(/[\\/\.]/))
                     throw new Error(`Machine name '${arg} is not valid`);
 
-                machines.push(arg);
+                patterns.push(arg);
             }
         }
     }
@@ -138,15 +134,34 @@ async function main() {
         }
     }
 
-    if (!machines.length) {
-        for (let name in machines_map)
-            machines.push(name);
+    if (patterns.length) {
+        machines = new Set;
+
+        for (let pattern of patterns) {
+            let re = minimatch.makeRe(pattern);
+
+            for (let name in machines_map) {
+                let machine = machines_map[name];
+
+                if (name.match(re) || machine.name.match(re))
+                    machines.add(name);
+            }
+        }
+
+        if (!machines.size) {
+            console.log('Could not match any machine');
+            process.exit(1);
+        }
+    } else {
+        machines = new Set(...Object.keys(machines_map));
 
-        if (!machines.length) {
+        if (!machines.size) {
             console.error('Could not detect any machine');
             process.exit(1);
         }
     }
+
+    machines = Array.from(machines);
     machines = machines.map(name => {
         let machine = machines_map[name];
         if (machine == null) {
@@ -157,6 +172,9 @@ async function main() {
         return machine;
     });
 
+    console.log('Machines:', machines.map(machine => machine.name).join(', '));
+    console.log();
+
     try {
         let success = await command();
         process.exit(!success);
@@ -301,7 +319,7 @@ async function test() {
         await Promise.all(Object.keys(machine.tests).map(async suite => {
             let test = machine.tests[suite];
             let commands = {
-                Build: test.build,
+                ...test.build,
                 ...test.commands
             };
 
@@ -572,7 +590,8 @@ async function join(machine, tries) {
                 host: '127.0.0.1',
                 port: machine.info.ssh_port,
                 username: machine.info.username,
-                password: machine.info.password
+                password: machine.info.password,
+                tryKeyboard: true
             });
 
             break;

package/test/tests/misc.js

@@ -36,8 +36,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/misc' +
-                       (process.platform == 'win32' ? '.dll' : '.so');
+    let lib_filename = path.dirname(__filename) + '/../../build/misc' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const FillPack3 = lib.cdecl('FillPack3', 'void', ['int', 'int', 'int', koffi.out(koffi.pointer(Pack3))]);

package/test/tests/raylib.js

@@ -83,8 +83,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/raylib' +
-                       (process.platform == 'win32' ? '.dll' : '.so');
+    let lib_filename = path.dirname(__filename) + '/../../build/raylib' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const InitWindow = lib.cdecl('InitWindow', 'void', ['int', 'int', 'string']);

package/test/tests/sqlite.js

@@ -36,8 +36,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/sqlite3' +
-                       (process.platform == 'win32' ? '.dll' : '.so');
+    let lib_filename = path.dirname(__filename) + '/../../build/sqlite3' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const sqlite3_open_v2 = lib.cdecl('sqlite3_open_v2', 'int', ['string', koffi.out(koffi.pointer(sqlite3_db)), 'int', 'string']);
@@ -50,7 +49,7 @@ async function test() {
     const sqlite3_finalize = lib.cdecl('sqlite3_finalize', 'int', [sqlite3_stmt]);
     const sqlite3_close_v2 = lib.cdecl('sqlite3_close_v2', 'int', [sqlite3_db]);
 
-    let filename = create_temporary_file(path.join(os.tmpdir(), 'test_sqlite'));
+    let filename = await create_temporary_file(path.join(os.tmpdir(), 'test_sqlite'));
     let db = {};
 
     try {
@@ -78,7 +77,7 @@ async function test() {
     }
 }
 
-function create_temporary_file(prefix) {
+async function create_temporary_file(prefix) {
     let buf = Buffer.allocUnsafe(4);
 
     for (;;) {
@@ -88,7 +87,12 @@ function create_temporary_file(prefix) {
             let suffix = buf.toString('hex').padStart(8, '0');
             let filename = `${prefix}.${suffix}`;
 
-            let file = fs.createWriteStream(filename, { flags: 'wx', mode: 0o644 });
+            let file = await new Promise((resolve, reject) => {
+                let file = fs.createWriteStream(filename, { flags: 'wx', mode: 0o644 });
+
+                file.on('open', () => resolve(file));
+                file.on('error', reject);
+            });
             file.close();
 
             return filename;

package/vendor/libcc/libcc.cc

@@ -82,6 +82,7 @@
     extern char **environ;
 #endif
 #ifdef __APPLE__
+    #include <sys/random.h>
     #include <mach-o/dyld.h>
 
     #define off64_t off_t
@@ -4295,12 +4296,23 @@ bool NotifySystemd()
         return false;
     }
 
+#ifdef __APPLE__
+    int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+    if (fd < 0) {
+        LogError("Failed to create UNIX socket: %1", strerror(errno));
+        return false;
+    }
+    RG_DEFER { close(fd); };
+
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
+#else
     int fd = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
     if (fd < 0) {
         LogError("Failed to create UNIX socket: %1", strerror(errno));
         return false;
     }
     RG_DEFER { close(fd); };
+#endif
 
     struct iovec iov = {};
     struct msghdr msg = {};
@@ -4880,13 +4892,22 @@ int OpenUnixSocket(const char *path, SocketMode mode)
         case SocketMode::Messages: { flags = SOCK_SEQPACKET; } break;
     }
 
-#ifdef _WIN32
+#if defined(_WIN32)
     SOCKET fd = socket(AF_UNIX, flags, 0);
     if (fd == INVALID_SOCKET) {
         LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
         return -1;
     }
     RG_DEFER_N(err_guard) { closesocket(fd); };
+#elif defined(__APPLE__)
+    int fd = (int)socket(AF_UNIX, flags, 0);
+    if (fd < 0) {
+        LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
+        return -1;
+    }
+    RG_DEFER_N(err_guard) { close(fd); };
+
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
 #else
     flags |= SOCK_CLOEXEC;
 
@@ -4924,13 +4945,22 @@ int ConnectToUnixSocket(const char *path, SocketMode mode)
         case SocketMode::Messages: { flags = SOCK_SEQPACKET; } break;
     }
 
-#ifdef _WIN32
+#if defined(_WIN32)
     SOCKET fd = socket(AF_UNIX, flags, 0);
     if (fd == INVALID_SOCKET) {
         LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
         return -1;
     }
     RG_DEFER_N(err_guard) { closesocket(fd); };
+#elif defined(__APPLE__)
+    int fd = (int)socket(AF_UNIX, flags, 0);
+    if (fd < 0) {
+        LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
+        return -1;
+    }
+    RG_DEFER_N(err_guard) { close(fd); };
+
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
 #else
     flags |= SOCK_CLOEXEC;
 

package/vendor/libcc/libcc.hh

@@ -35,7 +35,7 @@
 #include <utility>
 #if defined(_WIN32)
     #include <intrin.h>
-#elif !defined(__linux__) || defined(__GLIBC__)
+#elif !defined(__APPLE__) && (!defined(__linux__) || defined(__GLIBC__))
     #define RG_FIBER_USE_UCONTEXT
     #include <ucontext.h>
 #else