deps,src,test: do not require extra build step.

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

Author: ShogunPanda

Makefile

@@ -320,7 +320,7 @@ v8: ## Build deps/v8.
 		tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
 
 .PHONY: jstest
-jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests ## Run addon tests and JS tests.
+jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests ## Run addon tests and JS tests.
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
 		$(TEST_CI_ARGS) \
 		--skip-tests=$(CI_SKIP_TESTS) \
@@ -346,7 +346,6 @@ test: all ## Run default tests, linters, and build docs.
 	$(MAKE) -s build-js-native-api-tests
 	$(MAKE) -s build-node-api-tests
 	$(MAKE) -s build-sqlite-tests
-	$(MAKE) -s build-ffi-tests
 	$(MAKE) -s cctest
 	$(MAKE) -s jstest
 
@@ -356,7 +355,6 @@ test-only: all  ## Run default tests, without linters or building the docs.
 	$(MAKE) build-js-native-api-tests
 	$(MAKE) build-node-api-tests
 	$(MAKE) build-sqlite-tests
-	$(MAKE) build-ffi-tests
 	$(MAKE) cctest
 	$(MAKE) jstest
 	$(MAKE) tooltest
@@ -368,7 +366,6 @@ test-cov: all ## Run coverage tests.
 	$(MAKE) build-js-native-api-tests
 	$(MAKE) build-node-api-tests
 	$(MAKE) build-sqlite-tests
-	$(MAKE) build-ffi-tests
 	$(MAKE) cctest
 	CI_SKIP_TESTS=$(COV_SKIP_TESTS) $(MAKE) jstest
 
@@ -547,24 +544,6 @@ else
 build-sqlite-tests:
 endif
 
-FFI_BINDING_GYPS := $(wildcard test/ffi/*/binding.gyp)
-
-FFI_BINDING_SOURCES := \
-	$(wildcard test/ffi/*/*.c) \
-	$(wildcard test/ffi/*/*.def)
-
-# Implicitly depends on $(NODE_EXE), see the build-ffi-tests rule for rationale.
-test/ffi/.buildstamp: $(ADDONS_PREREQS) \
-	$(FFI_BINDING_GYPS) $(FFI_BINDING_SOURCES)
-	@$(call run_build_addons,"$$PWD/test/ffi",$@)
-
-.PHONY: build-ffi-tests
-# .buildstamp needs $(NODE_EXE) but cannot depend on it
-# directly because it calls make recursively.  The parent make cannot know
-# if the subprocess touched anything so it pessimistically assumes that
-# .buildstamp is out of date and need a rebuild.
-build-ffi-tests: | $(NODE_EXE) test/ffi/.buildstamp ## Build FFI tests.
-
 .PHONY: clear-stalled
 clear-stalled: ## Clear any stalled processes.
 	$(info Clean up any leftover processes but don't error if found.)
@@ -575,7 +554,7 @@ clear-stalled: ## Clear any stalled processes.
 	fi
 
 .PHONY: test-build
-test-build: | all build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests ## Build all tests.
+test-build: | all build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests ## Build all tests.
 
 .PHONY: test-build-js-native-api
 test-build-js-native-api: all build-js-native-api-tests ## Build JS Native-API tests.
@@ -637,7 +616,7 @@ test-ci-js: | clear-stalled ## Build and test JavaScript with building anything
 .PHONY: test-ci
 # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
 test-ci: LOGLEVEL := info ## Build and test everything (CI).
-test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests doc-only
+test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests doc-only
 	out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
 		--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \

deps/libffi/generate-headers.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 import argparse
+import os
+import platform
 import sys
 from pathlib import Path
 
@@ -175,15 +177,62 @@ def generate_headers(output_dir, target_arch, os_name):
         encoding='utf-8')
 
 
+def detect_os_name():
+    if sys.platform.startswith('win'):
+        return 'win'
+    if sys.platform == 'darwin':
+        return 'mac'
+    if sys.platform.startswith('linux'):
+        return 'linux'
+    if sys.platform.startswith('freebsd'):
+        return 'freebsd'
+    raise ValueError(f'Unsupported host platform {sys.platform!r}')
+
+
+def detect_target_arch():
+    candidates = [
+        os.environ.get('TARGET_ARCH'),
+        os.environ.get('npm_config_arch'),
+        os.environ.get('VSCMD_ARG_TGT_ARCH'),
+        os.environ.get('Platform'),
+        os.environ.get('PROCESSOR_ARCHITECTURE'),
+        platform.machine(),
+    ]
+
+    aliases = {
+        'amd64': 'x64',
+        'x86_64': 'x64',
+        'x64': 'x64',
+        'win32': 'x64',
+        'i386': 'x86',
+        'i686': 'x86',
+        'x86': 'x86',
+        'arm64': 'arm64',
+        'aarch64': 'arm64',
+        'arm': 'arm',
+    }
+
+    for candidate in candidates:
+        if not candidate:
+            continue
+        normalized = aliases.get(candidate.lower())
+        if normalized is not None:
+            return normalized
+
+    raise ValueError('Unable to determine target architecture for libffi headers')
+
+
 def main(argv=None):
     parser = argparse.ArgumentParser(description='Generate libffi headers')
     parser.add_argument('--output-dir', required=True)
-    parser.add_argument('--target-arch', required=True)
-    parser.add_argument('--os', required=True)
+    parser.add_argument('--target-arch')
+    parser.add_argument('--os')
     args = parser.parse_args(argv)
 
     try:
-        generate_headers(args.output_dir, args.target_arch, args.os)
+        generate_headers(args.output_dir,
+                         args.target_arch or detect_target_arch(),
+                         args.os or detect_os_name())
     except Exception as exc:  # pylint: disable=broad-except
         print(exc, file=sys.stderr)
         return 1

test/ffi/ffi-test-common.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const common = require('../common');
+const childProcess = require('node:child_process');
 const fs = require('node:fs');
 const path = require('node:path');
 
@@ -18,14 +19,111 @@ const libraryPath = path.join(
     process.platform === 'darwin' ? 'ffi_test_library.dylib' :
       'ffi_test_library.so',
 );
+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`;
+
+function sleep(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function getBuildCommand() {
+  if (process.platform === 'win32') {
+    return {
+      command: process.env.CC || 'cl',
+      args: [
+        '/nologo',
+        '/LD',
+        `/Fe:${libraryPath}`,
+        fixtureSourcePath,
+        '/link',
+        `/DEF:${fixtureExportsPath}`,
+      ],
+    };
+  }
+
+  if (process.platform === 'darwin') {
+    return {
+      command: process.env.CC || 'cc',
+      args: [
+        '-dynamiclib',
+        '-fPIC',
+        '-o',
+        libraryPath,
+        fixtureSourcePath,
+      ],
+    };
+  }
+
+  return {
+    command: process.env.CC || 'cc',
+    args: [
+      '-shared',
+      '-fPIC',
+      '-o',
+      libraryPath,
+      fixtureSourcePath,
+    ],
+  };
+}
+
+function buildFixtureLibrary() {
+  fs.mkdirSync(fixtureBuildDir, { recursive: true });
+
+  const { command, args } = getBuildCommand();
+  const { status, error, stderr } = childProcess.spawnSync(command, args, {
+    stdio: ['ignore', 'ignore', 'pipe'],
+  });
+
+  if (status === 0 && fs.existsSync(libraryPath)) {
+    return;
+  }
+
+  const renderedCommand = [command, ...args].join(' ');
+  const details = (error?.message || stderr?.toString() || `exit code ${status}`).trim();
+  throw new Error(
+    `Unable to build FFI test fixture library with \`${renderedCommand}\`: ${details}`,
+  );
+}
 
 function ensureFixtureLibrary() {
+  if (fs.existsSync(libraryPath)) {
+    return;
+  }
+
+  fs.mkdirSync(path.dirname(buildLockPath), { recursive: true });
+
+  try {
+    fs.mkdirSync(buildLockPath);
+  } catch (error) {
+    if (error.code !== 'EEXIST') {
+      throw error;
+    }
+
+    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)) {
+      return;
+    }
+  }
+
+  try {
+    buildFixtureLibrary();
+  } finally {
+    fs.rmSync(buildLockPath, { recursive: true, force: true });
+  }
+
   if (!fs.existsSync(libraryPath)) {
-    throw new Error(
-      `Missing FFI test fixture library: ${libraryPath}. ` +
-      'Build it first with `make build-ffi-tests`, `vcbuild.bat build-ffi-tests`, ' +
-      'or the equivalent test build step.',
-    );
+    throw new Error(`Missing FFI test fixture library: ${libraryPath}.`);
   }
 }
 

test/ffi/ffi.status

@@ -2,9 +2,5 @@
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import testpy
 
-class FFITestConfiguration(testpy.ParallelTestConfiguration):
-  def GetBuildRequirements(self):
-    return ['build-ffi-tests']
-
 def GetConfiguration(context, root):
-  return FFITestConfiguration(context, root, 'ffi')
+  return testpy.ParallelTestConfiguration(context, root, 'ffi')

test/ffi/fixture_library/binding.gyp

@@ -10,7 +10,6 @@
   inherit (pkgs)
     ada
     brotli
-    libffi
     gtest
     libuv
     merve
@@ -21,7 +20,7 @@
     zlib
     zstd
     ;
-  ffi = libffi;
+  ffi = pkgs.libffi;
   cares = pkgs.c-ares;
   hdr-histogram = pkgs.hdrhistogram_c;
   http-parser = pkgs.llhttp;

test/ffi/testcfg.py

@@ -961,7 +961,6 @@ def RunBuildRequirements(root, paths, context, modes):
   for path in paths:
     requirements += root.GetBuildRequirements(path, context)
 
-  requirements = [r for r in requirements if r == 'build-ffi-tests']
   requirements = list(dict.fromkeys(requirements))
   modes = list(dict.fromkeys(modes))
 

tools/nix/sharedLibDeps.nix

@@ -108,12 +108,11 @@ if /i "%1"=="v8temporal"    set v8temporal=1&goto arg-ok
 if /i "%1"=="v8windbg"      set v8windbg=1&goto arg-ok
 if /i "%1"=="licensertf"    set licensertf=1&goto arg-ok
 if /i "%1"=="test"          set test_args=%test_args% %common_test_suites%&set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok
-if /i "%1"=="test-ci-native" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1&set build_ffi_tests=1&set cctest_args=%cctest_args% --gtest_output=xml:cctest.junit.xml&goto arg-ok
+if /i "%1"=="test-ci-native" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1&set cctest_args=%cctest_args% --gtest_output=xml:cctest.junit.xml&goto arg-ok
 if /i "%1"=="test-ci-js"    set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %CI_JS_SUITES%&set no_cctest=1&goto arg-ok
 if /i "%1"=="build-addons"   set build_addons=1&goto arg-ok
 if /i "%1"=="build-js-native-api-tests"   set build_js_native_api_tests=1&goto arg-ok
 if /i "%1"=="build-node-api-tests"   set build_node_api_tests=1&goto arg-ok
-if /i "%1"=="build-ffi-tests"   set build_ffi_tests=1&goto arg-ok
 if /i "%1"=="test-addons"   set test_args=%test_args% addons&set build_addons=1&goto arg-ok
 if /i "%1"=="test-doc"      set test_args=%test_args% %CI_DOC%&set doc=1&&set lint_js=1&set lint_md=1&goto arg-ok
 if /i "%1"=="test-js-native-api"   set test_args=%test_args% js-native-api&set build_js_native_api_tests=1&goto arg-ok
@@ -718,10 +717,10 @@ endlocal
 goto build-node-api-tests
 
 :build-node-api-tests
-if not defined build_node_api_tests goto build-ffi-tests
+if not defined build_node_api_tests goto run-tests
 if not exist "%node_exe%" (
   echo Failed to find node.exe
-  goto build-ffi-tests
+  goto run-tests
 )
 echo Building node-api
 :: clear
@@ -733,19 +732,6 @@ setlocal
 python "%~dp0tools\build_addons.py" "%~dp0test\node-api" --config %config%
 if errorlevel 1 exit /b 1
 endlocal
-goto build-ffi-tests
-
-:build-ffi-tests
-if not defined build_ffi_tests goto run-tests
-if not exist "%node_exe%" (
-  echo Failed to find node.exe
-  goto run-tests
-)
-echo Building ffi tests
-setlocal
-python "%~dp0tools\build_addons.py" "%~dp0test\ffi" --config %config%
-if errorlevel 1 exit /b 1
-endlocal
 goto run-tests
 
 :run-tests
@@ -879,14 +865,13 @@ set exit_code=1
 goto exit
 
 :help
-echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-internet/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [clang-cl] [ccache path-to-ccache] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [ltcg] [licensetf] [sign] [x64/arm64] [vs2022/vs2026] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [format-md] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm] [build-ffi-tests] [without-ffi/shared-ffi/shared-ffi-includes path/shared-ffi-libname name/shared-ffi-libpath path]
+echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-internet/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [clang-cl] [ccache path-to-ccache] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [ltcg] [licensetf] [sign] [x64/arm64] [vs2022/vs2026] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [format-md] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm] [without-ffi/shared-ffi/shared-ffi-includes path/shared-ffi-libname name/shared-ffi-libpath path]
 echo Examples:
 echo   vcbuild.bat                          : builds release build
 echo   vcbuild.bat debug                    : builds debug build
 echo   vcbuild.bat release msi              : builds release build and MSI installer package
 echo   vcbuild.bat test                     : builds debug build and runs tests
 echo   vcbuild.bat build-release            : builds the release distribution as used by nodejs.org
-echo   vcbuild.bat build-ffi-tests          : builds the FFI fixture library used by test/ffi
 echo   vcbuild.bat enable-vtune             : builds Node.js with Intel VTune profiling support to profile JavaScript
 echo   vcbuild.bat link-module my_module.js : bundles my_module as built-in module
 echo   vcbuild.bat lint                     : runs the C++, documentation and JavaScript linter