deps,test: fixed failures

Signed-off-by: Paolo Insogna <paolo@cowtech.it>

Author: ShogunPanda

deps/libffi/generate-headers.py

@@ -158,7 +158,7 @@ def render_fficonfig(os_name, target_arch):
 
 def generate_headers(output_dir, target_arch, os_name):
     base_dir = Path(__file__).resolve().parent
-    output_dir = Path(output_dir)
+    output_dir = Path(str(output_dir).strip().strip('"'))
     output_dir.mkdir(parents=True, exist_ok=True)
 
     target, target_dir = get_target(os_name, target_arch)

test/ffi/ffi-test-common.js

@@ -22,6 +22,7 @@ const libraryPath = path.join(
 const fixtureSourcePath = path.join(__dirname, 'fixture_library', 'ffi_test_library.c');
 const fixtureExportsPath = path.join(__dirname, 'fixture_library', 'ffi_test_library.def');
 const buildLockPath = `${libraryPath}.lock`;
+const tempLibraryPath = `${libraryPath}.tmp`;
 
 function sleep(ms) {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
@@ -32,13 +33,15 @@ function getCompiler(defaultCompiler) {
 }
 
 function getBuildCommand() {
+  const outputPath = tempLibraryPath;
+
   if (process.platform === 'win32') {
     return {
       command: getCompiler('cl'),
       args: [
         '/nologo',
         '/LD',
-        `/Fe:${libraryPath}`,
+        `/Fe:${outputPath}`,
         fixtureSourcePath,
         '/link',
         `/DEF:${fixtureExportsPath}`,
@@ -53,7 +56,7 @@ function getBuildCommand() {
         '-dynamiclib',
         '-fPIC',
         '-o',
-        libraryPath,
+        outputPath,
         fixtureSourcePath,
       ],
     };
@@ -65,24 +68,28 @@ function getBuildCommand() {
       '-shared',
       '-fPIC',
       '-o',
-      libraryPath,
+      outputPath,
       fixtureSourcePath,
     ],
   };
 }
 
 function buildFixtureLibrary() {
   fs.mkdirSync(fixtureBuildDir, { recursive: true });
+  fs.rmSync(tempLibraryPath, { force: true });
 
   const { command, args } = getBuildCommand();
   const { status, error, stderr } = childProcess.spawnSync(command, args, {
     stdio: ['ignore', 'ignore', 'pipe'],
   });
 
-  if (status === 0 && fs.existsSync(libraryPath)) {
+  if (status === 0 && fs.existsSync(tempLibraryPath)) {
+    fs.renameSync(tempLibraryPath, libraryPath);
     return;
   }
 
+  fs.rmSync(tempLibraryPath, { force: true });
+
   const renderedCommand = [command, ...args].join(' ');
   const details = (error?.message || stderr?.toString() || `exit code ${status}`).trim();
   throw new Error(
@@ -106,16 +113,13 @@ function ensureFixtureLibrary() {
 
     const deadline = Date.now() + 30000;
     while (Date.now() < deadline) {
-      if (fs.existsSync(libraryPath)) {
-        return;
-      }
       if (!fs.existsSync(buildLockPath)) {
         break;
       }
       sleep(50);
     }
 
-    if (fs.existsSync(libraryPath)) {
+    if (fs.existsSync(libraryPath) && !fs.existsSync(buildLockPath)) {
       return;
     }
   }