deps,test: fixed failures

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

Author: ShogunPanda

deps/libffi/libffi.gyp

@@ -173,8 +173,6 @@
                 'include',
                 '--include-dir',
                 'src/x86',
-                '--include-dir',
-                '<(INTERMEDIATE_DIR)',
                 '--define',
                 'FFI_BUILDING',
                 '--define',

deps/libffi/preprocess_asm.py

@@ -36,11 +36,24 @@ def normalize_path(value):
     return str(value).strip().strip('"')
 
 
+def unique_paths(paths):
+    seen = set()
+    result = []
+    for path in paths:
+        if path in seen:
+            continue
+        seen.add(path)
+        result.append(path)
+    return result
+
+
 def preprocess(args):
     compiler = find_compiler()
     input_path = normalize_path(args.input)
     output = Path(normalize_path(args.output))
     include_dirs = [normalize_path(include_dir) for include_dir in args.include_dir]
+    include_dirs.append(str(output.parent))
+    include_dirs = unique_paths(include_dirs)
     output.parent.mkdir(parents=True, exist_ok=True)
 
     if os.name == 'nt' and Path(compiler[0]).name.lower() in ('cl.exe', 'cl', 'clang-cl.exe', 'clang-cl'):

src/ffi/data.cc

@@ -527,7 +527,6 @@ void ToString(const FunctionCallbackInfo<Value>& args) {
   Local<String> out;
   if (!String::NewFromUtf8(isolate, str, NewStringType::kNormal)
            .ToLocal(&out)) {
-    env->ThrowError("Failed to create a string from native memory");
     return;
   }
 
@@ -581,7 +580,6 @@ void ToBuffer(const FunctionCallbackInfo<Value>& args) {
   if (args.Length() < 3 || args[2]->IsUndefined() ||
       args[2]->BooleanValue(isolate)) {
     if (!Buffer::Copy(env, reinterpret_cast<char*>(ptr), len).ToLocal(&buf)) {
-      env->ThrowError("Failed to create a Buffer from native memory");
       return;
     }
   } else {
@@ -592,7 +590,6 @@ void ToBuffer(const FunctionCallbackInfo<Value>& args) {
              [](char* data, void* hint) {},
              nullptr)
              .ToLocal(&buf)) {
-      env->ThrowError("Failed to create a Buffer from native memory");
       return;
     }
   }

test/ffi/test-ffi-permissions.js

@@ -3,10 +3,11 @@
 const common = require('../common');
 const assert = require('node:assert');
 const { test } = require('node:test');
-const ffi = require('node:ffi');
 
 common.skipIfFFIMissing();
 
+const ffi = require('node:ffi');
+
 const dummyLibraryPath = 'ffi-permission-test-library';
 const denied = {
   code: 'ERR_ACCESS_DENIED',

test/parallel/test-process-env-allowed-flags-are-documented.js

@@ -49,6 +49,11 @@ if (!hasOpenSSL3) {
   documented.delete('--openssl-shared-config');
 }
 
+if(!common.hasFFI) {
+  documented.delete('--allow-ffi');
+  documented.delete('--experimental-ffi');
+}
+
 const isV8Sandboxed = process.config.variables.v8_enable_sandbox;
 
 // Filter out options that are conditionally present.