From 3a0f72e9000bd52dba3f4d135d3dfbe84f1dd0de Mon Sep 17 00:00:00 2001
From: p-mcgowan <mcgowanapat+git@gmail.com>
Date: Fri, 27 Jun 2025 14:14:58 +0200
Subject: [PATCH 1/2] test: add --test-files-glob flag

Overrides the default `kDefaultPattern` for test file globs to allow for
default file pattern matching, while still allowing other options or
single, targeted file names for testing.

This also might resolve issues with the defaults when using strip-types
since the defaults can, currently, only be overridden using the
positional `arguments` (see #56546).

Fixes: https://github.com/nodejs/node/issues/51384
Ref: https://github.com/nodejs/node/issues/56546
---
 doc/api/cli.md                                |  15 ++
 doc/api/test.md                               |   4 +-
 doc/node-config-schema.json                   |   8 +
 lib/internal/test_runner/runner.js            |  13 +-
 lib/internal/test_runner/utils.js             |   4 +-
 src/node_options.cc                           |   8 +
 src/node_options.h                            |   1 +
 .../custom-files-glob/index-test.cjs          |   4 +
 .../custom-files-glob/index-test.js           |   4 +
 .../custom-files-glob/index-test.mjs          |   4 +
 .../custom-files-glob/index-test.spec.cjs     |   4 +
 .../custom-files-glob/index-test.spec.js      |   4 +
 .../custom-files-glob/index-test.spec.mjs     |   4 +
 .../custom-files-glob/typescript-test.cts     |   4 +
 .../custom-files-glob/typescript-test.mts     |   4 +
 .../typescript-test.spec.cts                  |   4 +
 .../typescript-test.spec.mts                  |   4 +
 .../custom-files-glob/typescript-test.spec.ts |   4 +
 .../custom-files-glob/typescript-test.ts      |   4 +
 test/parallel/test-runner-cli.js              | 144 +++++++++++++++---
 test/parallel/test-runner-coverage.js         |  64 ++++++++
 21 files changed, 284 insertions(+), 25 deletions(-)
 create mode 100644 test/fixtures/test-runner/custom-files-glob/index-test.cjs
 create mode 100644 test/fixtures/test-runner/custom-files-glob/index-test.js
 create mode 100644 test/fixtures/test-runner/custom-files-glob/index-test.mjs
 create mode 100644 test/fixtures/test-runner/custom-files-glob/index-test.spec.cjs
 create mode 100644 test/fixtures/test-runner/custom-files-glob/index-test.spec.js
 create mode 100644 test/fixtures/test-runner/custom-files-glob/index-test.spec.mjs
 create mode 100644 test/fixtures/test-runner/custom-files-glob/typescript-test.cts
 create mode 100644 test/fixtures/test-runner/custom-files-glob/typescript-test.mts
 create mode 100644 test/fixtures/test-runner/custom-files-glob/typescript-test.spec.cts
 create mode 100644 test/fixtures/test-runner/custom-files-glob/typescript-test.spec.mts
 create mode 100644 test/fixtures/test-runner/custom-files-glob/typescript-test.spec.ts
 create mode 100644 test/fixtures/test-runner/custom-files-glob/typescript-test.ts

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 5d59844d4cbc72..e14daef8162af4 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2868,6 +2868,20 @@ added: v22.8.0
 Require a minimum percent of covered lines. If code coverage does not reach
 the threshold specified, the process will exit with code `1`.
 
+### `--test-files-glob=glob`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1.0 - Early development
+
+Override the default test file glob patterns. This option is ignored if
+positional `arguments` are provided as well.
+
+See [running tests from the command line][] for more information on the
+default patterns.
+
 ### `--test-force-exit`
 
 <!-- YAML
@@ -3902,6 +3916,7 @@ one is included in the list below.
 * `--test-coverage-functions`
 * `--test-coverage-include`
 * `--test-coverage-lines`
+* `--test-files-glob`
 * `--test-global-setup`
 * `--test-isolation`
 * `--test-name-pattern`
diff --git a/doc/api/test.md b/doc/api/test.md
index cfbb350e15842a..e60093f7939c77 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -674,7 +674,8 @@ The Node.js test runner can be invoked from the command line by passing the
 node --test
 ```
 
-By default, Node.js will run all files matching these patterns:
+Unless overridden with the [`--test-files-glob`][] flag, by default Node.js will
+run all files matching these patterns:
 
 * `**/*.test.{cjs,mjs,js}`
 * `**/*-test.{cjs,mjs,js}`
@@ -4866,6 +4867,7 @@ test.describe('my suite', (suite) => {
 [`--test-concurrency`]: cli.md#--test-concurrency
 [`--test-coverage-exclude`]: cli.md#--test-coverage-exclude
 [`--test-coverage-include`]: cli.md#--test-coverage-include
+[`--test-files-glob`]: cli.md#--test-files-globglob
 [`--test-name-pattern`]: cli.md#--test-name-pattern
 [`--test-only`]: cli.md#--test-only
 [`--test-reporter-destination`]: cli.md#--test-reporter-destination
diff --git a/doc/node-config-schema.json b/doc/node-config-schema.json
index 116f0c28681816..e3e92af66f7bf6 100644
--- a/doc/node-config-schema.json
+++ b/doc/node-config-schema.json
@@ -548,6 +548,10 @@
               "type": "number",
               "description": "the line coverage minimum threshold"
             },
+            "test-files-glob": {
+              "type": "string",
+              "description": "run test files matching this glob pattern"
+            },
             "test-global-setup": {
               "type": "string",
               "description": "specifies the path to the global setup file"
@@ -941,6 +945,10 @@
               "type": "number",
               "description": "the line coverage minimum threshold"
             },
+            "test-files-glob": {
+              "type": "string",
+              "description": "run test files matching this glob pattern"
+            },
             "test-force-exit": {
               "type": "boolean",
               "description": "force test runner to exit upon completion"
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 3bfe719ce5be76..1a311bb4579e20 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -149,10 +149,10 @@ class WorkerIdPool {
   }
 }
 
-function createTestFileList(patterns, cwd) {
+function createTestFileList(patterns, cwd, defaultPattern) {
   const hasUserSuppliedPattern = patterns != null;
   if (!patterns || patterns.length === 0) {
-    patterns = [kDefaultPattern];
+    patterns = [defaultPattern || kDefaultPattern];
   }
   const glob = new Glob(patterns, {
     __proto__: null,
@@ -633,7 +633,7 @@ function watchFiles(testFiles, opts) {
   // Watch for changes in current filtered files
   const onChanged = ({ owners, eventType }) => {
     if (!opts.hasFiles && (eventType === 'rename' || eventType === 'change')) {
-      const updatedTestFiles = createTestFileList(opts.globPatterns, opts.cwd);
+      const updatedTestFiles = createTestFileList(opts.globPatterns, opts.cwd, opts.testFilesGlob);
       const newFileName = ArrayPrototypeFind(updatedTestFiles, (x) => !ArrayPrototypeIncludes(testFiles, x));
       const previousFileName = ArrayPrototypeFind(testFiles, (x) => !ArrayPrototypeIncludes(updatedTestFiles, x));
 
@@ -722,6 +722,7 @@ function run(options = kEmptyObject) {
     globalSetupPath,
     only,
     globPatterns,
+    testFilesGlob,
     coverage = false,
     lineCoverage = 0,
     branchCoverage = 0,
@@ -806,6 +807,9 @@ function run(options = kEmptyObject) {
   if (randomize) {
     randomSeed ??= createRandomSeed();
   }
+  if (testFilesGlob != null) {
+    validateString(testFilesGlob, 'options.testFilesGlob');
+  }
 
   validateString(cwd, 'options.cwd');
 
@@ -937,7 +941,7 @@ function run(options = kEmptyObject) {
   };
 
   const root = createTestTree(rootTestOptions, globalOptions);
-  let testFiles = files ?? createTestFileList(globPatterns, cwd);
+  let testFiles = files ?? createTestFileList(globPatterns, cwd, testFilesGlob);
   const { isTestRunner } = globalOptions;
 
   if (randomize) {
@@ -980,6 +984,7 @@ function run(options = kEmptyObject) {
     testSkipPatterns,
     testTagFilters,
     testTagFilterExpressions,
+    testFilesGlob,
     hasFiles: files != null,
     globPatterns,
     only,
diff --git a/lib/internal/test_runner/utils.js b/lib/internal/test_runner/utils.js
index 9937d9592a2967..714274606774d2 100644
--- a/lib/internal/test_runner/utils.js
+++ b/lib/internal/test_runner/utils.js
@@ -255,6 +255,7 @@ function parseCommandLine() {
   const randomSeedOption = getOptionValue('--test-random-seed');
   let randomSeed;
   const rerunFailuresFilePath = getOptionValue('--test-rerun-failures');
+  const testFilesGlob = getOptionValue('--test-files-glob') || null;
   const isChildProcess = process.env.NODE_TEST_CONTEXT === 'child';
   const isChildProcessV8 = process.env.NODE_TEST_CONTEXT === 'child-v8';
   let globalSetupPath;
@@ -377,7 +378,7 @@ function parseCommandLine() {
     if (!coverageExcludeGlobs || coverageExcludeGlobs.length === 0) {
       // TODO(pmarchini): this default should follow something similar to c8 defaults
       // Default exclusions should be also exported to be used by other tools / users
-      coverageExcludeGlobs = [kDefaultPattern];
+      coverageExcludeGlobs = [testFilesGlob || kDefaultPattern];
     }
     coverageIncludeGlobs = getOptionValue('--test-coverage-include');
 
@@ -429,6 +430,7 @@ function parseCommandLine() {
     globalSetupPath,
     shard,
     sourceMaps,
+    testFilesGlob,
     testNamePatterns,
     testSkipPatterns,
     testTagFilterExpressions,
diff --git a/src/node_options.cc b/src/node_options.cc
index b9d3dd56092e35..4e8741ce661bae 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -993,6 +993,14 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::test_name_pattern,
             kAllowedInEnvvar,
             OptionNamespaces::kTestRunnerNamespace);
+  AddOption("--test-files-glob",
+            "set the default glob pattern for matching test files (default: "
+            "'**/{test,test/**/*,test-*,*[._-]test}.{<extensions>}' where "
+            "<extensions> is 'js,mjs,cjs' or 'js,mjs,cjs,ts,mts,cts' when using"
+            " --experimental-strip-types)",
+            &EnvironmentOptions::test_files_glob,
+            kAllowedInEnvvar,
+            OptionNamespaces::kTestRunnerNamespace);
   AddOption("--test-reporter",
             "report test output using the given reporter",
             &EnvironmentOptions::test_reporter,
diff --git a/src/node_options.h b/src/node_options.h
index 7d9ff9e5147d18..5819864ecd6c16 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -207,6 +207,7 @@ class EnvironmentOptions : public Options {
   bool test_runner_module_mocks = false;
   bool test_runner_update_snapshots = false;
   std::vector<std::string> test_name_pattern;
+  std::string test_files_glob;
   std::vector<std::string> test_reporter;
   std::string test_rerun_failures_path;
   std::vector<std::string> test_reporter_destination;
diff --git a/test/fixtures/test-runner/custom-files-glob/index-test.cjs b/test/fixtures/test-runner/custom-files-glob/index-test.cjs
new file mode 100644
index 00000000000000..9d876e34bc2201
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/index-test.cjs
@@ -0,0 +1,4 @@
+'use strict';
+const test = require('node:test');
+
+test('index-test.cjs should not run');
diff --git a/test/fixtures/test-runner/custom-files-glob/index-test.js b/test/fixtures/test-runner/custom-files-glob/index-test.js
new file mode 100644
index 00000000000000..53f403e6ed8942
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/index-test.js
@@ -0,0 +1,4 @@
+'use strict';
+const test = require('node:test');
+
+test('index-test.js should not run');
diff --git a/test/fixtures/test-runner/custom-files-glob/index-test.mjs b/test/fixtures/test-runner/custom-files-glob/index-test.mjs
new file mode 100644
index 00000000000000..c896627c29abd9
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/index-test.mjs
@@ -0,0 +1,4 @@
+'use strict';
+import test from 'node:test';
+
+test('index-test.mjs should not run');
diff --git a/test/fixtures/test-runner/custom-files-glob/index-test.spec.cjs b/test/fixtures/test-runner/custom-files-glob/index-test.spec.cjs
new file mode 100644
index 00000000000000..3710266f3979b2
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/index-test.spec.cjs
@@ -0,0 +1,4 @@
+'use strict';
+const test = require('node:test');
+
+test('index-test.spec.cjs this should pass');
diff --git a/test/fixtures/test-runner/custom-files-glob/index-test.spec.js b/test/fixtures/test-runner/custom-files-glob/index-test.spec.js
new file mode 100644
index 00000000000000..8420f55649073b
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/index-test.spec.js
@@ -0,0 +1,4 @@
+'use strict';
+const test = require('node:test');
+
+test('index-test.spec.js this should pass');
diff --git a/test/fixtures/test-runner/custom-files-glob/index-test.spec.mjs b/test/fixtures/test-runner/custom-files-glob/index-test.spec.mjs
new file mode 100644
index 00000000000000..13e47cd6ef4fc9
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/index-test.spec.mjs
@@ -0,0 +1,4 @@
+'use strict';
+import test from 'node:test';
+
+test('index-test.spec.mjs this should pass');
diff --git a/test/fixtures/test-runner/custom-files-glob/typescript-test.cts b/test/fixtures/test-runner/custom-files-glob/typescript-test.cts
new file mode 100644
index 00000000000000..5568971763d143
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/typescript-test.cts
@@ -0,0 +1,4 @@
+const test = require('node:test');
+
+// 'as string' ensures that type stripping actually occurs
+test('typescript-test.cts should not run' as string);
diff --git a/test/fixtures/test-runner/custom-files-glob/typescript-test.mts b/test/fixtures/test-runner/custom-files-glob/typescript-test.mts
new file mode 100644
index 00000000000000..78a4991fd14be6
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/typescript-test.mts
@@ -0,0 +1,4 @@
+import { test } from 'node:test';
+
+// 'as string' ensures that type stripping actually occurs
+test('typescript-test.mts should not run' as string);
diff --git a/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.cts b/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.cts
new file mode 100644
index 00000000000000..51db67be155b8c
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.cts
@@ -0,0 +1,4 @@
+const test = require('node:test');
+
+// 'as string' ensures that type stripping actually occurs
+test('typescript-test.spec.cts this should pass' as string);
diff --git a/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.mts b/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.mts
new file mode 100644
index 00000000000000..056e52741f8954
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.mts
@@ -0,0 +1,4 @@
+import { test } from 'node:test';
+
+// 'as string' ensures that type stripping actually occurs
+test('typescript-test.spec.mts this should pass' as string);
diff --git a/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.ts b/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.ts
new file mode 100644
index 00000000000000..647c8bcbc48bf9
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/typescript-test.spec.ts
@@ -0,0 +1,4 @@
+const test = require('node:test');
+
+// 'as string' ensures that type stripping actually occurs
+test('typescript-test.spec.ts this should pass' as string);
diff --git a/test/fixtures/test-runner/custom-files-glob/typescript-test.ts b/test/fixtures/test-runner/custom-files-glob/typescript-test.ts
new file mode 100644
index 00000000000000..50ad6e0f40fb97
--- /dev/null
+++ b/test/fixtures/test-runner/custom-files-glob/typescript-test.ts
@@ -0,0 +1,4 @@
+const test = require('node:test');
+
+// 'as string' ensures that type stripping actually occurs
+test('typescript-test.ts this should pass' as string);
diff --git a/test/parallel/test-runner-cli.js b/test/parallel/test-runner-cli.js
index f563d67d1a9a41..88d7804d5cd359 100644
--- a/test/parallel/test-runner-cli.js
+++ b/test/parallel/test-runner-cli.js
@@ -23,6 +23,21 @@ for (const isolation of ['none', 'process']) {
     assert.match(child.stderr.toString(), /^Could not find/);
   }
 
+  {
+    // File not found (--test-files-glob).
+    const args = [
+      '--test',
+      `--test-isolation=${isolation}`,
+      '--test-files-glob=a-random-file-that-does-not-exist.js',
+    ];
+    const child = spawnSync(process.execPath, args);
+
+    assert.strictEqual(child.status, 1);
+    assert.strictEqual(child.signal, null);
+    assert.strictEqual(child.stdout.toString(), '');
+    assert.match(child.stderr.toString(), /^Could not find/);
+  }
+
   {
     // Default behavior. node_modules is ignored. Files that don't match the
     // pattern are ignored except in test/ directories.
@@ -63,26 +78,99 @@ for (const isolation of ['none', 'process']) {
   }
 
   {
-    // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
-    const args = ['--test', '--test-reporter=tap', '--no-warnings',
-                  '--experimental-strip-types', `--test-isolation=${isolation}`];
-    const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'matching-patterns') });
+    // Should override default file matching (**/{test,test/**/*,test-*,*[._-]test}.{js,mjs,cjs})
+    const args = [
+      '--test',
+      '--test-reporter=tap',
+      '--test-files-glob=**/*.spec.{js,mjs,cjs}',
+      `--test-isolation=${isolation}`,
+    ];
+    const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'custom-files-glob') });
+
+    assert.strictEqual(child.status, 0);
+    assert.strictEqual(child.signal, null);
+    assert.strictEqual(child.stderr.toString(), '');
+    const stdout = child.stdout.toString();
+    process.stderr.write(stdout);
+
+    assert.match(stdout, /ok 1 - index-test\.spec\.cjs this should pass/);
+    assert.match(stdout, /ok 2 - index-test\.spec\.js this should pass/);
+    assert.match(stdout, /ok 3 - index-test\.spec\.mjs this should pass/);
+    assert.doesNotMatch(stdout, /ok 4 - /);
+  }
+
+  {
+    // Should ignore glob override when targeted file passed in
+    const args = [
+      '--test',
+      '--test-reporter=tap',
+      '--test-files-glob=**/*.spec.{js,mjs,cjs}',
+      `--test-isolation=${isolation}`,
+      'index-test.js',
+    ];
+    const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'custom-files-glob') });
 
-    if (!process.config.variables.node_use_amaro) {
-      // e.g. Compiled with `--without-amaro`.
-      assert.strictEqual(child.status, 1);
-    } else {
-      assert.strictEqual(child.stderr.toString(), '');
-      const stdout = child.stdout.toString();
-
-      assert.match(stdout, /ok 1 - this should pass/);
-      assert.match(stdout, /ok 2 - this should pass/);
-      assert.match(stdout, /ok 3 - this should pass/);
-      assert.match(stdout, /ok 4 - this should pass/);
-      assert.match(stdout, /ok 5 - this should pass/);
-      assert.match(stdout, /ok 6 - this should pass/);
-      assert.strictEqual(child.status, 0);
-      assert.strictEqual(child.signal, null);
+    assert.strictEqual(child.status, 0);
+    assert.strictEqual(child.signal, null);
+    assert.strictEqual(child.stderr.toString(), '');
+    const stdout = child.stdout.toString();
+    process.stderr.write(stdout);
+
+    assert.match(stdout, /ok 1 - index-test\.js should not run/);
+    assert.doesNotMatch(stdout, /ok 2 - /);
+  }
+
+  for (const type of ['strip', 'transform']) {
+    {
+      // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
+      const args = ['--test', '--test-reporter=tap', '--no-warnings',
+                    `--experimental-${type}-types`, `--test-isolation=${isolation}`];
+      const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'matching-patterns') });
+
+      if (!process.config.variables.node_use_amaro) {
+        // e.g. Compiled with `--without-amaro`.
+        assert.strictEqual(child.status, 1);
+      } else {
+        assert.strictEqual(child.stderr.toString(), '');
+        const stdout = child.stdout.toString();
+
+        assert.match(stdout, /ok 1 - this should pass/);
+        assert.match(stdout, /ok 2 - this should pass/);
+        assert.match(stdout, /ok 3 - this should pass/);
+        assert.match(stdout, /ok 4 - this should pass/);
+        assert.match(stdout, /ok 5 - this should pass/);
+        assert.match(stdout, /ok 6 - this should pass/);
+        assert.strictEqual(child.status, 0);
+        assert.strictEqual(child.signal, null);
+      }
+    }
+
+    {
+      // Should override default file matching (**/{test,test/**/*,test-*,*[._-]test}.{js,mjs,cjs,ts,mts,cts})
+      const args = [
+        '--test',
+        '--test-reporter=tap',
+        '--no-warnings',
+        '--test-files-glob=*.spec.{ts,mts,cts}',
+        `--experimental-${type}-types`,
+        `--test-isolation=${isolation}`,
+      ];
+      const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'custom-files-glob') });
+
+      if (!process.config.variables.node_use_amaro) {
+        // e.g. Compiled with `--without-amaro`.
+        assert.strictEqual(child.status, 1);
+      } else {
+        assert.strictEqual(child.status, 0);
+        assert.strictEqual(child.signal, null);
+        assert.strictEqual(child.stderr.toString(), '');
+        const stdout = child.stdout.toString();
+
+        assert.match(stdout, /ok 1 - typescript-test\.spec\.cts this should pass/);
+        assert.match(stdout, /ok 2 - typescript-test\.spec\.mts this should pass/);
+        assert.match(stdout, /ok 3 - typescript-test\.spec\.ts this should pass/);
+        assert.doesNotMatch(stdout, /ok 4 - /);
+      }
     }
   }
 
@@ -125,6 +213,24 @@ for (const isolation of ['none', 'process']) {
     assert.strictEqual(child.signal, null);
   }
 
+  {
+    // User specified files that don't match the --test-files-glob are still run.
+    const args = [
+      '--test',
+      '--test-reporter=tap',
+      `--test-isolation=${isolation}`,
+      '--test-files-glob=**/{test,test/**/*,test-*,*[._-]test}.{js,mjs,cjs}',
+      join(testFixtures, 'index.js'),
+    ];
+    const child = spawnSync(process.execPath, args, { cwd: testFixtures });
+
+    assert.strictEqual(child.stderr.toString(), '');
+    const stdout = child.stdout.toString();
+    assert.match(stdout, /not ok 1 - .+index\.js/);
+    assert.strictEqual(child.status, 1);
+    assert.strictEqual(child.signal, null);
+  }
+
   {
     // Searches node_modules if specified.
     const args = [
diff --git a/test/parallel/test-runner-coverage.js b/test/parallel/test-runner-coverage.js
index 542078c93d5e45..b8dcaca8ee0dd3 100644
--- a/test/parallel/test-runner-coverage.js
+++ b/test/parallel/test-runner-coverage.js
@@ -583,3 +583,67 @@ test('coverage with directory and file named "file"', skipIfNoInspector, () => {
   assert.strictEqual(result.status, 0);
   assertIncludesReport(result, 'start of coverage report');
 });
+
+test('overrides default excludes when --test-files-glob is used', skipIfNoInspector, () => {
+  const report = [
+    '# start of coverage report',
+    '# ------------------------------------------------------------------',
+    '# file              | line % | branch % | funcs % | uncovered lines',
+    '# ------------------------------------------------------------------',
+    '# test              |        |          |         | ',
+    '#  fixtures         |        |          |         | ',
+    '#   test-runner     |        |          |         | ',
+    '#    invalid-tap.js | 100.00 |   100.00 |  100.00 | ',
+    '#   v8-coverage     |        |          |         | ',
+    '#    throw.js       |  71.43 |    50.00 |  100.00 | 5-6',
+    '# ------------------------------------------------------------------',
+    '# all files         |  75.00 |    66.67 |  100.00 | ',
+    '# ------------------------------------------------------------------',
+    '# end of coverage report',
+  ].join('\n');
+
+  const args = [
+    '--test',
+    '--experimental-test-coverage',
+    '--test-files-glob=**/test-runner/coverage.js',
+    '--test-reporter=tap',
+  ];
+  const result = spawnSync(process.execPath, args);
+
+  assert.strictEqual(result.stderr.toString(), '');
+  assert(result.stdout.toString().includes(report));
+  assert.strictEqual(result.status, 0);
+});
+
+test('does not override explicit excludes when --test-files-glob is used', skipIfNoInspector, () => {
+  const report = [
+    '# start of coverage report',
+    '# --------------------------------------------------------------------------------------------',
+    '# file              | line % | branch % | funcs % | uncovered lines',
+    '# --------------------------------------------------------------------------------------------',
+    '# test              |        |          |         | ',
+    '#  fixtures         |        |          |         | ',
+    '#   test-runner     |        |          |         | ',
+    '#    coverage.js    |  78.65 |    38.46 |   60.00 | 12-13 16-22 27 39 43-44 61-62 66-67 71-72',
+    '#    invalid-tap.js | 100.00 |   100.00 |  100.00 | ',
+    '#   v8-coverage     |        |          |         | ',
+    '#    throw.js       |  71.43 |    50.00 |  100.00 | 5-6',
+    '# --------------------------------------------------------------------------------------------',
+    '# all files         |  78.35 |    43.75 |   60.00 | ',
+    '# --------------------------------------------------------------------------------------------',
+    '# end of coverage report',
+  ].join('\n');
+
+  const args = [
+    '--test',
+    '--experimental-test-coverage',
+    '--test-files-glob=**/test-runner/coverage.js',
+    '--test-coverage-exclude=!test/**',
+    '--test-reporter=tap',
+  ];
+  const result = spawnSync(process.execPath, args);
+
+  assert.strictEqual(result.stderr.toString(), '');
+  assert(result.stdout.toString().includes(report));
+  assert.strictEqual(result.status, 0);
+});

From d1d64c69aa9a5a792fa1de6d24eeaaa4779d82cf Mon Sep 17 00:00:00 2001
From: p-mcgowan <mcgowanapat+git@gmail.com>
Date: Fri, 14 Nov 2025 18:39:48 +0100
Subject: [PATCH 2/2] enh: cleanup tests

remove conosle logs, organize covereage into subtests, try to fool
codecov into realizing the tests are fine.
---
 doc/node.1                            |   4 +
 test/parallel/test-runner-cli.js      |  48 +++++++-
 test/parallel/test-runner-coverage.js | 161 +++++++++++++++++---------
 3 files changed, 153 insertions(+), 60 deletions(-)

diff --git a/doc/node.1 b/doc/node.1
index cc51fde7661ac3..b93c47d464da02 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -1404,6 +1404,10 @@ files must meet \fBboth\fR criteria to be included in the coverage report.
 Require a minimum percent of covered lines. If code coverage does not reach
 the threshold specified, the process will exit with code \fB1\fR.
 .
+.It Fl -test-files-glob
+A glob pattern that configures the test runner to only run tests whose filename
+matches the provided glob.
+.
 .It Fl -test-force-exit
 Configures the test runner to exit the process once all known tests have
 finished executing even if the event loop would otherwise remain active.
diff --git a/test/parallel/test-runner-cli.js b/test/parallel/test-runner-cli.js
index 88d7804d5cd359..d4c5a0a49c2072 100644
--- a/test/parallel/test-runner-cli.js
+++ b/test/parallel/test-runner-cli.js
@@ -91,7 +91,6 @@ for (const isolation of ['none', 'process']) {
     assert.strictEqual(child.signal, null);
     assert.strictEqual(child.stderr.toString(), '');
     const stdout = child.stdout.toString();
-    process.stderr.write(stdout);
 
     assert.match(stdout, /ok 1 - index-test\.spec\.cjs this should pass/);
     assert.match(stdout, /ok 2 - index-test\.spec\.js this should pass/);
@@ -100,7 +99,7 @@ for (const isolation of ['none', 'process']) {
   }
 
   {
-    // Should ignore glob override when targeted file passed in
+    // Should ignore test-files-glob when positionals passed in
     const args = [
       '--test',
       '--test-reporter=tap',
@@ -114,12 +113,32 @@ for (const isolation of ['none', 'process']) {
     assert.strictEqual(child.signal, null);
     assert.strictEqual(child.stderr.toString(), '');
     const stdout = child.stdout.toString();
-    process.stderr.write(stdout);
 
     assert.match(stdout, /ok 1 - index-test\.js should not run/);
     assert.doesNotMatch(stdout, /ok 2 - /);
   }
 
+  {
+    // Should fail when test-files-glob is empty
+    const args = [
+      '--test',
+      '--test-reporter=tap',
+      '--test-files-glob',
+      `--test-isolation=${isolation}`,
+    ];
+    const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'custom-files-glob') });
+
+    process.stdout.write('stdout' + '\n');
+    process.stdout.write(child.stdout.toString() + '\n');
+    process.stdout.write('stderr' + '\n');
+    process.stdout.write(child.stderr.toString() + '\n');
+
+    assert.strictEqual(child.status, 9);
+    assert.strictEqual(child.signal, null);
+    assert.strictEqual(child.stdout.toString(), '');
+    assert.match(child.stderr.toString(), /--test-files-glob requires an argument/);
+  }
+
   for (const type of ['strip', 'transform']) {
     {
       // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
@@ -172,6 +191,29 @@ for (const isolation of ['none', 'process']) {
         assert.doesNotMatch(stdout, /ok 4 - /);
       }
     }
+
+    {
+      // Should fail if --test-files-glob empty
+      const args = [
+        '--test',
+        '--test-reporter=tap',
+        '--no-warnings',
+        '--test-files-glob=',
+        `--experimental-${type}-types`,
+        `--test-isolation=${isolation}`,
+      ];
+      const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'custom-files-glob') });
+
+      if (!process.config.variables.node_use_amaro) {
+        // e.g. Compiled with `--without-amaro`.
+        assert.strictEqual(child.status, 1);
+      } else {
+        assert.strictEqual(child.status, 9);
+        assert.strictEqual(child.signal, null);
+        assert.strictEqual(child.stdout.toString(), '');
+        assert.match(child.stderr.toString(), /--test-files-glob= requires an argument/);
+      }
+    }
   }
 
   {
diff --git a/test/parallel/test-runner-coverage.js b/test/parallel/test-runner-coverage.js
index b8dcaca8ee0dd3..3835d893a753b9 100644
--- a/test/parallel/test-runner-coverage.js
+++ b/test/parallel/test-runner-coverage.js
@@ -584,66 +584,113 @@ test('coverage with directory and file named "file"', skipIfNoInspector, () => {
   assertIncludesReport(result, 'start of coverage report');
 });
 
-test('overrides default excludes when --test-files-glob is used', skipIfNoInspector, () => {
-  const report = [
-    '# start of coverage report',
-    '# ------------------------------------------------------------------',
-    '# file              | line % | branch % | funcs % | uncovered lines',
-    '# ------------------------------------------------------------------',
-    '# test              |        |          |         | ',
-    '#  fixtures         |        |          |         | ',
-    '#   test-runner     |        |          |         | ',
-    '#    invalid-tap.js | 100.00 |   100.00 |  100.00 | ',
-    '#   v8-coverage     |        |          |         | ',
-    '#    throw.js       |  71.43 |    50.00 |  100.00 | 5-6',
-    '# ------------------------------------------------------------------',
-    '# all files         |  75.00 |    66.67 |  100.00 | ',
-    '# ------------------------------------------------------------------',
-    '# end of coverage report',
-  ].join('\n');
+test('correctly prints coverage report with --test-files-glob pattern supplied', skipIfNoInspector, async (t) => {
+  await t.test('overrides default excludes when --test-files-glob is used', () => {
+    const report = [
+      '# start of coverage report',
+      '# ------------------------------------------------------------------',
+      '# file              | line % | branch % | funcs % | uncovered lines',
+      '# ------------------------------------------------------------------',
+      '# test              |        |          |         | ',
+      '#  fixtures         |        |          |         | ',
+      '#   test-runner     |        |          |         | ',
+      '#    invalid-tap.js | 100.00 |   100.00 |  100.00 | ',
+      '#   v8-coverage     |        |          |         | ',
+      '#    throw.js       |  71.43 |    50.00 |  100.00 | 5-6',
+      '# ------------------------------------------------------------------',
+      '# all files         |  75.00 |    66.67 |  100.00 | ',
+      '# ------------------------------------------------------------------',
+      '# end of coverage report',
+    ].join('\n');
+
+    if (common.isWindows) {
+      report = report.replaceAll('/', '\\');
+    }
 
-  const args = [
-    '--test',
-    '--experimental-test-coverage',
-    '--test-files-glob=**/test-runner/coverage.js',
-    '--test-reporter=tap',
-  ];
-  const result = spawnSync(process.execPath, args);
+    const args = [
+      '--test',
+      '--experimental-test-coverage',
+      '--test-files-glob=**/test-runner/coverage.js',
+      '--test-reporter=tap',
+    ];
+    const result = spawnSync(process.execPath, args);
 
-  assert.strictEqual(result.stderr.toString(), '');
-  assert(result.stdout.toString().includes(report));
-  assert.strictEqual(result.status, 0);
-});
+    assert.strictEqual(result.stderr.toString(), '');
+    assert(result.stdout.toString().includes(report));
+    assert.strictEqual(result.status, 0);
+  });
 
-test('does not override explicit excludes when --test-files-glob is used', skipIfNoInspector, () => {
-  const report = [
-    '# start of coverage report',
-    '# --------------------------------------------------------------------------------------------',
-    '# file              | line % | branch % | funcs % | uncovered lines',
-    '# --------------------------------------------------------------------------------------------',
-    '# test              |        |          |         | ',
-    '#  fixtures         |        |          |         | ',
-    '#   test-runner     |        |          |         | ',
-    '#    coverage.js    |  78.65 |    38.46 |   60.00 | 12-13 16-22 27 39 43-44 61-62 66-67 71-72',
-    '#    invalid-tap.js | 100.00 |   100.00 |  100.00 | ',
-    '#   v8-coverage     |        |          |         | ',
-    '#    throw.js       |  71.43 |    50.00 |  100.00 | 5-6',
-    '# --------------------------------------------------------------------------------------------',
-    '# all files         |  78.35 |    43.75 |   60.00 | ',
-    '# --------------------------------------------------------------------------------------------',
-    '# end of coverage report',
-  ].join('\n');
+  await t.test('does not override excludes when --test-files-glob is used and --test-coverage-exclude is empty', () => {
+    const report = [
+      '# start of coverage report',
+      '# --------------------------------------------------------------------------------------------',
+      '# file              | line % | branch % | funcs % | uncovered lines',
+      '# --------------------------------------------------------------------------------------------',
+      '# test              |        |          |         | ',
+      '#  fixtures         |        |          |         | ',
+      '#   test-runner     |        |          |         | ',
+      '#    coverage.js    |  78.65 |    38.46 |   60.00 | 12-13 16-22 27 39 43-44 61-62 66-67 71-72',
+      '#    invalid-tap.js | 100.00 |   100.00 |  100.00 | ',
+      '#   v8-coverage     |        |          |         | ',
+      '#    throw.js       |  71.43 |    50.00 |  100.00 | 5-6',
+      '# --------------------------------------------------------------------------------------------',
+      '# all files         |  78.35 |    43.75 |   60.00 | ',
+      '# --------------------------------------------------------------------------------------------',
+      '# end of coverage report',
+    ].join('\n');
+
+    if (common.isWindows) {
+      report = report.replaceAll('/', '\\');
+    }
 
-  const args = [
-    '--test',
-    '--experimental-test-coverage',
-    '--test-files-glob=**/test-runner/coverage.js',
-    '--test-coverage-exclude=!test/**',
-    '--test-reporter=tap',
-  ];
-  const result = spawnSync(process.execPath, args);
+    const args = [
+      '--test',
+      '--experimental-test-coverage',
+      '--test-files-glob=**/test-runner/coverage.js',
+      '--test-coverage-exclude=""',
+      '--test-reporter=tap',
+    ];
+    const result = spawnSync(process.execPath, args);
 
-  assert.strictEqual(result.stderr.toString(), '');
-  assert(result.stdout.toString().includes(report));
-  assert.strictEqual(result.status, 0);
+    assert.strictEqual(result.stderr.toString(), '');
+    assert(result.stdout.toString().includes(report));
+    assert.strictEqual(result.status, 0);
+  });
+
+  await t.test('does not override excludes when --test-files-glob and --test-coverage-exclude are used', () => {
+    const report = [
+      '# start of coverage report',
+      '# --------------------------------------------------------------------------------------------',
+      '# file              | line % | branch % | funcs % | uncovered lines',
+      '# --------------------------------------------------------------------------------------------',
+      '# test              |        |          |         | ',
+      '#  fixtures         |        |          |         | ',
+      '#   test-runner     |        |          |         | ',
+      '#    coverage.js    |  78.65 |    38.46 |   60.00 | 12-13 16-22 27 39 43-44 61-62 66-67 71-72',
+      '#    invalid-tap.js | 100.00 |   100.00 |  100.00 | ',
+      '#   v8-coverage     |        |          |         | ',
+      '#    throw.js       |  71.43 |    50.00 |  100.00 | 5-6',
+      '# --------------------------------------------------------------------------------------------',
+      '# all files         |  78.35 |    43.75 |   60.00 | ',
+      '# --------------------------------------------------------------------------------------------',
+      '# end of coverage report',
+    ].join('\n');
+
+    if (common.isWindows) {
+      report = report.replaceAll('/', '\\');
+    }
+
+    const args = [
+      '--test',
+      '--experimental-test-coverage',
+      '--test-files-glob=**/test-runner/coverage.js',
+      '--test-coverage-exclude=!test/**',
+      '--test-reporter=tap',
+    ];
+    const result = spawnSync(process.execPath, args);
+
+    assert.strictEqual(result.stderr.toString(), '');
+    assert(result.stdout.toString().includes(report));
+    assert.strictEqual(result.status, 0);
+  });
 });