test: include passing tests from skip list

some tests are skipped although they aren't relevant to amaro.

Fixes: #60815

Author: y-okt

test/es-module/test-esm-detect-ambiguous.mjs

@@ -4,8 +4,6 @@ import { spawn } from 'node:child_process';
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
-const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
-
 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 () => {
@@ -265,9 +263,7 @@ describe('Module syntax detection', { concurrency: !process.env.TEST_PARALLEL },
       assert.strictEqual(signal, null);
     });
 
-    it('still throws on `await` in an ordinary sync function',
-       onlyWithAmaro,
-       async () => {
+    it('still throws on `await` in an ordinary sync function', async () => {
          const { stdout, stderr, code, signal } = await spawnPromisified(process.execPath, [
            '--eval',
            'function fn() { await Promise.resolve(); } fn();',
@@ -318,9 +314,7 @@ describe('Module syntax detection', { concurrency: !process.env.TEST_PARALLEL },
       assert.strictEqual(signal, null);
     });
 
-    it('still throws on double `const` declaration not at the top level',
-       onlyWithAmaro,
-       async () => {
+    it('still throws on double `const` declaration not at the top level', async () => {
          const { stdout, stderr, code, signal } = await spawnPromisified(process.execPath, [
            '--eval',
            'function fn() { const require = 1; const require = 2; } fn();',

test/es-module/test-esm-resolve-type.mjs

@@ -198,6 +198,10 @@ try {
       subdirPackageType,
       expectedResolvedFormat,
       mainSuffix = '' ] = testVariant;
+    const skip = mainImportScript.endsWith('.ts') && !process.config.variables.node_use_amaro;
+    if (skip) {
+      return;
+    }
 
     const mDir = rel(`node_modules/${moduleName}`);
     const subDir = rel(`node_modules/${moduleName}/subdir`);

test/es-module/test-esm-tla-syntax-errors-not-recognized-as-tla-error.mjs

@@ -2,8 +2,6 @@ import { spawnPromisified } from '../common/index.mjs';
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
-const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
-
 describe('unusual top-level await syntax errors', () => {
   const expressions = [
     // string
@@ -51,9 +49,7 @@ describe('unusual top-level await syntax errors', () => {
     }
   });
 
-  it('should throw the error for unrelated syntax errors',
-     onlyWithAmaro,
-     async () => {
+  it('should throw the error for unrelated syntax errors', async () => {
        const expression = 'foo bar';
        const wrapperExpressions = [
          [`function callSyntaxError() {}; callSyntaxError(${expression});`, /missing \) after argument list/],

test/parallel/test-cli-node-options-docs.js

@@ -64,7 +64,7 @@ for (const [, envVar, config] of nodeOptionsCC.matchAll(addOptionRE)) {
   }
 
   // Exception for HAVE_AMARO conditional default (defaults to true when Amaro is available)
-  if (process.config.variables.node_use_amaro) {
+  if (config.includes('HAVE_AMARO')) {
     hasTrueAsDefaultValue = true;
   }
 

test/parallel/test-compile-cache-typescript-commonjs.js

@@ -12,7 +12,7 @@ const tmpdir = require('../common/tmpdir');
 const fixtures = require('../common/fixtures');
 
 // Check cache for .ts files that would be run as CommonJS.
-{
+if (process.config.variables.node_use_amaro) {
   tmpdir.refresh();
   const dir = tmpdir.resolve('.compile_cache_dir');
   const script = fixtures.path('typescript', 'ts', 'test-commonjs-parsing.ts');

test/parallel/test-compile-cache-typescript-esm.js

@@ -12,7 +12,7 @@ const tmpdir = require('../common/tmpdir');
 const fixtures = require('../common/fixtures');
 
 // Check cache for .ts files that would be run as ESM.
-{
+if (process.config.variables.node_use_amaro) {
   tmpdir.refresh();
   const dir = tmpdir.resolve('.compile_cache_dir');
   const script = fixtures.path('typescript', 'ts', 'test-module-typescript.ts');

test/parallel/test-config-file.js

@@ -85,7 +85,6 @@ test('should throw an error when a flag is declared twice', async () => {
   assert.strictEqual(result.code, 9);
 });
 
-
 test('should override env-file', onlyWithAmaro, async () => {
   const result = await spawnPromisified(process.execPath, [
     '--no-warnings',

test/parallel/test-runner-coverage-default-exclusion.mjs

@@ -16,8 +16,6 @@ async function setupFixtures() {
   await cp(fixtureDir, tmpdir.path, { recursive: true });
 }
 
-const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
-
 describe('test runner coverage default exclusion', skipIfNoInspector, () => {
   before(async () => {
     await setupFixtures();
@@ -88,7 +86,7 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
     assert.strictEqual(result.status, 0);
   });
 
-  it('should exclude ts test files', onlyWithAmaro, async () => {
+  it('should exclude ts test files', async () => {
     const report = [
       '# start of coverage report',
       '# --------------------------------------------------------------',

test/parallel/test-worker-cli-options.js

@@ -1,9 +1,6 @@
 // Flags: --expose-internals --expose-gc
 'use strict';
 const common = require('../common');
-if (!process.config.variables.node_use_amaro) {
-  common.skip('Requires Amaro');
-}
 const { Worker } = require('worker_threads');
 const assert = require('assert');
 

test/parallel/test-worker-load-file-with-extension-other-than-js.js

@@ -1,8 +1,5 @@
 'use strict';
 const common = require('../common');
-if (!process.config.variables.node_use_amaro) {
-  common.skip('Requires Amaro');
-}
 const fixtures = require('../common/fixtures');
 const { Worker } = require('worker_threads');