test: skip failing tests when compiled without amaro

y-okt · y-okt · commit f80ced920b31 · 2025-11-26T00:21:40.000+09:00
When compiled without amaro, this conflicts with --experimental-strip-types defaulting to true. To avoid that, we need to skip relevant failing tests. Fixes: #60640
diff --git a/test/es-module/test-esm-detect-ambiguous.mjs b/test/es-module/test-esm-detect-ambiguous.mjs
@@ -1,9 +1,14 @@
-import { spawnPromisified } from '../common/index.mjs';
+import * as common from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import { spawn } from 'node:child_process';
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+const { spawnPromisified } = common;
+
 describe('Module syntax detection', { concurrency: !process.env.TEST_PARALLEL }, () => {
   describe('string input', { concurrency: !process.env.TEST_PARALLEL }, () => {
     it('permits ESM syntax in --eval input without requiring --input-type=module', async () => {
diff --git a/test/es-module/test-esm-import-meta-main-eval.mjs b/test/es-module/test-esm-import-meta-main-eval.mjs
@@ -1,8 +1,13 @@
-import { spawnPromisified } from '../common/index.mjs';
+import * as common from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.js';
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+const { spawnPromisified } = common;
+
 function wrapScriptInEvalWorker(script) {
   return `
   import { Worker } from 'node:worker_threads';
diff --git a/test/es-module/test-esm-tla-syntax-errors-not-recognized-as-tla-error.mjs b/test/es-module/test-esm-tla-syntax-errors-not-recognized-as-tla-error.mjs
@@ -1,7 +1,12 @@
-import { spawnPromisified } from '../common/index.mjs';
+import * as common from '../common/index.mjs';
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+const { spawnPromisified } = common;
+
 describe('unusual top-level await syntax errors', () => {
   const expressions = [
     // string
diff --git a/test/parallel/test-compile-cache-typescript-commonjs.js b/test/parallel/test-compile-cache-typescript-commonjs.js
@@ -2,12 +2,16 @@
 
 // This tests NODE_COMPILE_CACHE works for CommonJS with types.
 
-require('../common');
+const common = require('../common');
 const { spawnSyncAndAssert } = require('../common/child_process');
 const assert = require('assert');
 const tmpdir = require('../common/tmpdir');
 const fixtures = require('../common/fixtures');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 // Check cache for .ts files that would be run as CommonJS.
 {
   tmpdir.refresh();
diff --git a/test/parallel/test-compile-cache-typescript-esm.js b/test/parallel/test-compile-cache-typescript-esm.js
@@ -2,12 +2,16 @@
 
 // This tests NODE_COMPILE_CACHE works for ESM with types.
 
-require('../common');
+const common = require('../common');
 const { spawnSyncAndAssert } = require('../common/child_process');
 const assert = require('assert');
 const tmpdir = require('../common/tmpdir');
 const fixtures = require('../common/fixtures');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 // Check cache for .ts files that would be run as ESM.
 {
   tmpdir.refresh();
diff --git a/test/parallel/test-compile-cache-typescript-strip-miss.js b/test/parallel/test-compile-cache-typescript-strip-miss.js
@@ -3,12 +3,16 @@
 // This tests NODE_COMPILE_CACHE can handle cache invalidation
 // between strip-only TypeScript and transformed TypeScript.
 
-require('../common');
+const common = require('../common');
 const { spawnSyncAndAssert } = require('../common/child_process');
 const assert = require('assert');
 const tmpdir = require('../common/tmpdir');
 const fixtures = require('../common/fixtures');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 tmpdir.refresh();
 const dir = tmpdir.resolve('.compile_cache_dir');
 const script = fixtures.path('typescript', 'ts', 'test-typescript.ts');
diff --git a/test/parallel/test-compile-cache-typescript-strip-sourcemaps.js b/test/parallel/test-compile-cache-typescript-strip-sourcemaps.js
@@ -3,12 +3,16 @@
 // This tests NODE_COMPILE_CACHE can be used for type stripping and ignores
 // --enable-source-maps as there's no difference in the code generated.
 
-require('../common');
+const common = require('../common');
 const { spawnSyncAndAssert } = require('../common/child_process');
 const assert = require('assert');
 const tmpdir = require('../common/tmpdir');
 const fixtures = require('../common/fixtures');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 tmpdir.refresh();
 const dir = tmpdir.resolve('.compile_cache_dir');
 const script = fixtures.path('typescript', 'ts', 'test-typescript.ts');
diff --git a/test/parallel/test-compile-cache-typescript-transform.js b/test/parallel/test-compile-cache-typescript-transform.js
@@ -2,12 +2,16 @@
 
 // This tests NODE_COMPILE_CACHE works with --experimental-transform-types.
 
-require('../common');
+const common = require('../common');
 const { spawnSyncAndAssert } = require('../common/child_process');
 const assert = require('assert');
 const tmpdir = require('../common/tmpdir');
 const fixtures = require('../common/fixtures');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 
 tmpdir.refresh();
 const dir = tmpdir.resolve('.compile_cache_dir');
diff --git a/test/parallel/test-config-file.js b/test/parallel/test-config-file.js
@@ -1,18 +1,23 @@
 'use strict';
 
+const common = require('../common');
 const {
   isWindows,
   spawnPromisified,
   skipIfSQLiteMissing,
-} = require('../common');
-skipIfSQLiteMissing();
+} = common;
 const fixtures = require('../common/fixtures');
 const tmpdir = require('../common/tmpdir');
 const assert = require('node:assert');
 const { test, it, describe } = require('node:test');
 const { chmodSync, writeFileSync, constants } = require('node:fs');
 const { join } = require('node:path');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+skipIfSQLiteMissing();
+
 test('should handle non existing json', async () => {
   const result = await spawnPromisified(process.execPath, [
     '--experimental-config-file',
diff --git a/test/parallel/test-node-output-eval.mjs b/test/parallel/test-node-output-eval.mjs
@@ -1,9 +1,13 @@
-import '../common/index.mjs';
+import * as common from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import * as snapshot from '../common/assertSnapshot.js';
 import { basename } from 'node:path';
 import { describe, it } from 'node:test';
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 describe('eval output', { concurrency: true }, () => {
   function normalize(str) {
     return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '')
diff --git a/test/parallel/test-node-output-sourcemaps.mjs b/test/parallel/test-node-output-sourcemaps.mjs
@@ -1,8 +1,12 @@
-import '../common/index.mjs';
+import * as common from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import * as snapshot from '../common/assertSnapshot.js';
 import { describe, it } from 'node:test';
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 describe('sourcemaps output', { concurrency: !process.env.TEST_PARALLEL }, () => {
   const defaultTransform = snapshot
     .transform(
diff --git a/test/parallel/test-runner-coverage-default-exclusion.mjs b/test/parallel/test-runner-coverage-default-exclusion.mjs
@@ -1,10 +1,14 @@
-import '../common/index.mjs';
+import * as common from '../common/index.mjs';
 import { before, describe, it } from 'node:test';
 import assert from 'node:assert';
 import { spawnSync } from 'node:child_process';
 import { cp } from 'node:fs/promises';
 import tmpdir from '../common/tmpdir.js';
 import fixtures from '../common/fixtures.js';
+
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
 const skipIfNoInspector = {
   skip: !process.features.inspector ? 'inspector disabled' : false
 };
diff --git a/test/parallel/test-runner-global-setup-teardown.mjs b/test/parallel/test-runner-global-setup-teardown.mjs
@@ -1,4 +1,4 @@
-import '../common/index.mjs';
+import * as common from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import { describe, it, beforeEach } from 'node:test';
 import assert from 'node:assert';
@@ -8,6 +8,10 @@ import tmpdir from '../common/tmpdir.js';
 import { once } from 'node:events';
 import { join } from 'node:path';
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 const testFixtures = fixtures.path('test-runner');
 
 async function runTest(
diff --git a/test/parallel/test-runner-run-global-hooks.mjs b/test/parallel/test-runner-run-global-hooks.mjs
@@ -1,4 +1,4 @@
-import { mustCall, mustCallAtLeast } from '../common/index.mjs';
+import { mustCall, mustCallAtLeast, skip } from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import { describe, it, beforeEach, run } from 'node:test';
 import assert from 'node:assert';
@@ -8,6 +8,10 @@ import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { once } from 'node:events';
 
+if (!process.config.variables.node_use_amaro) {
+  skip('Requires Amaro');
+}
+
 const testFixtures = fixtures.path('test-runner', 'global-setup-teardown');
 const runnerFixture = fixtures.path('test-runner', 'test-runner-global-hooks.mjs');
 
diff --git a/test/parallel/test-util-getcallsites.js b/test/parallel/test-util-getcallsites.js
@@ -1,14 +1,16 @@
 'use strict';
 
 const common = require('../common');
-
 const fixtures = require('../common/fixtures');
 const file = fixtures.path('get-call-sites.js');
-
 const { getCallSites } = require('node:util');
 const { spawnSync } = require('node:child_process');
 const assert = require('node:assert');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 {
   const callSites = getCallSites();
   assert.ok(callSites.length > 1);
diff --git a/test/parallel/test-worker-cli-options.js b/test/parallel/test-worker-cli-options.js
@@ -4,6 +4,10 @@ const common = require('../common');
 const { Worker } = require('worker_threads');
 const assert = require('assert');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 const CODE = `
 // If the --expose-internals flag does not pass to worker
 // require function will throw an error
diff --git a/test/parallel/test-worker-eval-typescript.js b/test/parallel/test-worker-eval-typescript.js
@@ -1,10 +1,14 @@
 'use strict';
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const { Worker } = require('worker_threads');
 const { test } = require('node:test');
 const { once } = require('events');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 const esmHelloWorld = `
     import worker from 'worker_threads';
     const foo: string = 'Hello, World!';
diff --git a/test/parallel/test-worker-load-file-with-extension-other-than-js.js b/test/parallel/test-worker-load-file-with-extension-other-than-js.js
@@ -1,9 +1,12 @@
 'use strict';
 const common = require('../common');
 const fixtures = require('../common/fixtures');
-
 const { Worker } = require('worker_threads');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 (common.mustCall(() => {
   new Worker(fixtures.path('worker-script.ts'));
 }))();
diff --git a/test/parallel/test-worker-syntax-error.js b/test/parallel/test-worker-syntax-error.js
@@ -3,6 +3,10 @@ const common = require('../common');
 const assert = require('assert');
 const { Worker } = require('worker_threads');
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 const w = new Worker('abc)', { eval: true });
 w.on('message', common.mustNotCall());
 w.on('error', common.mustCall((err) => {
diff --git a/test/test-runner/test-output-typescript-coverage.mjs b/test/test-runner/test-output-typescript-coverage.mjs
@@ -4,6 +4,10 @@ import * as common from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import { spawnAndAssert, defaultTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';
 
+if (!process.config.variables.node_use_amaro) {
+  common.skip('Requires Amaro');
+}
+
 if (!process.features.inspector) {
   common.skip('inspector support required');
 }
