From 91858b0866e144382b3b5423e15c1ee15945edfb Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:04:56 +0200
Subject: [PATCH 01/20] test_runner: add cwd option to run

---
 doc/api/test.md                               |  6 ++
 lib/internal/test_runner/runner.js            |  9 +--
 ...unner-no-isolation-different-cwd-watch.mjs | 57 +++++++++++++++++++
 ...test-runner-no-isolation-different-cwd.mjs | 48 ++++++++++++++++
 test/parallel/test-runner-run.mjs             | 34 +++++++++++
 5 files changed, 150 insertions(+), 4 deletions(-)
 create mode 100644 test/parallel/test-runner-no-isolation-different-cwd-watch.mjs
 create mode 100644 test/parallel/test-runner-no-isolation-different-cwd.mjs

diff --git a/doc/api/test.md b/doc/api/test.md
index e02eba7f182bf7..5527d7fac5d0c2 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -1256,6 +1256,9 @@ added:
   - v18.9.0
   - v16.19.0
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/54705
+    description: Added the `cwd` option.
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/53937
     description: Added coverage options.
@@ -1286,6 +1289,9 @@ changes:
     parallel.
     If `false`, it would only run one test file at a time.
     **Default:** `false`.
+  * `cwd`: {string} Specifies the current working directory to be used by the test runner.
+    Serves as the base path for resolving files according to the [test runner execution model][].
+    **Default:** `process.cwd()`.
   * `files`: {Array} An array containing the list of files to run.
     **Default:** matching files from [test runner execution model][].
   * `forceExit`: {boolean} Configures the test runner to exit the process once
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 2241df6b378253..0ca081a73994ff 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -56,6 +56,7 @@ const {
   validateObject,
   validateOneOf,
   validateInteger,
+  validateString,
   validateStringArray,
 } = require('internal/validators');
 const { getInspectPort, isUsingInspector, isInspectorMessage } = require('internal/util/inspector');
@@ -562,6 +563,7 @@ function run(options = kEmptyObject) {
     functionCoverage = 0,
     execArgv = [],
     argv = [],
+    cwd = process.cwd(),
   } = options;
 
   if (files != null) {
@@ -586,6 +588,8 @@ function run(options = kEmptyObject) {
     validateArray(globPatterns, 'options.globPatterns');
   }
 
+  validateString(cwd, 'options.cwd');
+
   if (globPatterns?.length > 0 && files?.length > 0) {
     throw new ERR_INVALID_ARG_VALUE(
       'options.globPatterns', globPatterns, 'is not supported when specifying \'options.files\'',
@@ -676,9 +680,6 @@ function run(options = kEmptyObject) {
   };
   const root = createTestTree(rootTestOptions, globalOptions);
 
-  // This const should be replaced by a run option in the future.
-  const cwd = process.cwd();
-
   let testFiles = files ?? createTestFileList(globPatterns, cwd);
 
   if (shard) {
@@ -756,7 +757,7 @@ function run(options = kEmptyObject) {
           }
 
           for (let i = 0; i < testFiles.length; ++i) {
-            const testFile = testFiles[i];
+            const testFile = resolve(cwd, testFiles[i]);
             const fileURL = pathToFileURL(testFile);
             const parent = i === 0 ? undefined : parentURL;
             let threw = false;
diff --git a/test/parallel/test-runner-no-isolation-different-cwd-watch.mjs b/test/parallel/test-runner-no-isolation-different-cwd-watch.mjs
new file mode 100644
index 00000000000000..232b9af8286184
--- /dev/null
+++ b/test/parallel/test-runner-no-isolation-different-cwd-watch.mjs
@@ -0,0 +1,57 @@
+import { allowGlobals, mustCall, mustNotCall } from '../common/index.mjs';
+import * as fixtures from '../common/fixtures.mjs';
+import { deepStrictEqual } from 'node:assert';
+import { run } from 'node:test';
+
+try {
+  const controller = new AbortController();
+  const stream = run({
+    cwd: fixtures.path('test-runner', 'no-isolation'),
+    isolation: 'none',
+    watch: true,
+    signal: controller.signal,
+  });
+
+  stream.on('test:fail', () => mustNotCall());
+  stream.on('test:pass', mustCall(5));
+  stream.on('data', function({ type }) {
+    if (type === 'test:watch:drained') {
+      controller.abort();
+    }
+  });
+  // eslint-disable-next-line no-unused-vars
+  for await (const _ of stream);
+  allowGlobals(globalThis.GLOBAL_ORDER);
+  deepStrictEqual(globalThis.GLOBAL_ORDER, [
+    'before one: <root>',
+    'suite one',
+    'before two: <root>',
+    'suite two',
+
+    'beforeEach one: suite one - test',
+    'beforeEach two: suite one - test',
+    'suite one - test',
+    'afterEach one: suite one - test',
+    'afterEach two: suite one - test',
+
+    'beforeEach one: test one',
+    'beforeEach two: test one',
+    'test one',
+    'afterEach one: test one',
+    'afterEach two: test one',
+
+    'before suite two: suite two',
+
+    'beforeEach one: suite two - test',
+    'beforeEach two: suite two - test',
+    'suite two - test',
+    'afterEach one: suite two - test',
+    'afterEach two: suite two - test',
+
+    'after one: <root>',
+    'after two: <root>',
+  ]);
+} catch (err) {
+  console.error(err);
+  process.exit(1);
+}
diff --git a/test/parallel/test-runner-no-isolation-different-cwd.mjs b/test/parallel/test-runner-no-isolation-different-cwd.mjs
new file mode 100644
index 00000000000000..6a15cc4f2b6b32
--- /dev/null
+++ b/test/parallel/test-runner-no-isolation-different-cwd.mjs
@@ -0,0 +1,48 @@
+import { allowGlobals, mustCall } from '../common/index.mjs';
+import * as fixtures from '../common/fixtures.mjs';
+import { strictEqual } from 'node:assert';
+import { run } from 'node:test';
+
+const stream = run({
+  cwd: fixtures.path('test-runner', 'no-isolation'),
+  isolation: 'none',
+});
+
+let errors = 0;
+stream.on('test:fail', () => {
+  errors++;
+});
+stream.on('test:pass', mustCall(5));
+// eslint-disable-next-line no-unused-vars
+for await (const _ of stream);
+strictEqual(errors, 0);
+allowGlobals(globalThis.GLOBAL_ORDER);
+strictEqual(globalThis.GLOBAL_ORDER, [
+  'before one: <root>',
+  'suite one',
+  'before two: <root>',
+  'suite two',
+
+  'beforeEach one: suite one - test',
+  'beforeEach two: suite one - test',
+  'suite one - test',
+  'afterEach one: suite one - test',
+  'afterEach two: suite one - test',
+
+  'beforeEach one: test one',
+  'beforeEach two: test one',
+  'test one',
+  'afterEach one: test one',
+  'afterEach two: test one',
+
+  'before suite two: suite two',
+
+  'beforeEach one: suite two - test',
+  'beforeEach two: suite two - test',
+  'suite two - test',
+  'afterEach one: suite two - test',
+  'afterEach two: suite two - test',
+
+  'after one: <root>',
+  'after two: <root>',
+]);
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 1460ef15ed8dea..61eed7b94b9a52 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -496,6 +496,13 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       });
     });
 
+    it('should only allow a string in options.cwd', async () => {
+      [Symbol(), {}, [], () => {}, 0, 1, 0n, 1n, true, false]
+        .forEach((cwd) => assert.throws(() => run({ cwd }), {
+          code: 'ERR_INVALID_ARG_TYPE'
+        }));
+    });
+
     it('should only allow object as options', () => {
       [Symbol(), [], () => {}, 0, 1, 0n, 1n, '', '1', true, false]
         .forEach((options) => assert.throws(() => run(options), {
@@ -528,6 +535,33 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
     for await (const _ of stream);
     assert.match(stderr, /Warning: node:test run\(\) is being called recursively/);
   });
+
+  it('should run with different cwd', async () => {
+    const stream = run({
+      cwd: fixtures.path('test-runner', 'cwd')
+    });
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+  });
+
+  it('should run with different cwd while in watch mode', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: fixtures.path('test-runner', 'cwd'),
+      watch: true,
+      signal: controller.signal,
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+  });
 });
 
 describe('forceExit', () => {

From 85e7dbb139a933eba0fa8053322e65e0cb45605f Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:29 +0200
Subject: [PATCH 02/20] test_runner: add --experimental-test-cwd option to test
 runner

---
 doc/api/cli.md                                | 12 ++++++++++++
 lib/internal/test_runner/coverage.js          |  2 +-
 lib/internal/test_runner/harness.js           |  8 ++++----
 lib/internal/test_runner/runner.js            | 19 ++++++++++---------
 lib/internal/test_runner/utils.js             |  2 ++
 src/node_options.cc                           |  3 +++
 src/node_options.h                            |  1 +
 ...test-runner-no-isolation-different-cwd.mjs | 10 +++-------
 8 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 588c9cc8640ab7..837e9c8a2280d7 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1137,6 +1137,18 @@ generated as part of the test runner output. If no tests are run, a coverage
 report is not generated. See the documentation on
 [collecting code coverage from tests][] for more details.
 
+### `--experimental-test-cwd=directory`
+
+<!-- YAML
+added: CHANGEME
+-->
+
+> Stability: 1.0 - Early development
+
+Set the current working directory for the test runner.
+If not specified, the current working directory is used.
+This flag is particularly useful when running tests from a different directory.
+
 ### `--experimental-test-isolation=mode`
 
 <!-- YAML
diff --git a/lib/internal/test_runner/coverage.js b/lib/internal/test_runner/coverage.js
index 1b5ba7912dcb7d..15a69bb82248f8 100644
--- a/lib/internal/test_runner/coverage.js
+++ b/lib/internal/test_runner/coverage.js
@@ -487,7 +487,7 @@ function sortCoverageFiles(a, b) {
 
 function setupCoverage(options) {
   let originalCoverageDirectory = process.env.NODE_V8_COVERAGE;
-  const cwd = process.cwd();
+  const cwd = options.testCwd;
 
   if (originalCoverageDirectory) {
     // NODE_V8_COVERAGE was already specified. Convert it to an absolute path
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 718e15cf024745..8a00036ef6540d 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -90,7 +90,7 @@ function createTestTree(rootTestOptions, globalOptions) {
   return globalRoot;
 }
 
-function createProcessEventHandler(eventName, rootTest) {
+function createProcessEventHandler(eventName, rootTest, cwd) {
   return (err) => {
     if (rootTest.harness.bootstrapPromise) {
       // Something went wrong during the asynchronous portion of bootstrapping
@@ -116,7 +116,7 @@ function createProcessEventHandler(eventName, rootTest) {
         const name = test.hookType ? `Test hook "${test.hookType}"` : `Test "${test.name}"`;
         let locInfo = '';
         if (test.loc) {
-          const relPath = relative(process.cwd(), test.loc.file);
+          const relPath = relative(cwd, test.loc.file);
           locInfo = ` at ${relPath}:${test.loc.line}:${test.loc.column}`;
         }
 
@@ -208,9 +208,9 @@ function setupProcessState(root, globalOptions) {
   hook.enable();
 
   const exceptionHandler =
-    createProcessEventHandler('uncaughtException', root);
+    createProcessEventHandler('uncaughtException', root, globalOptions.testCwd);
   const rejectionHandler =
-    createProcessEventHandler('unhandledRejection', root);
+    createProcessEventHandler('unhandledRejection', root, globalOptions.testCwd);
   const coverage = configureCoverage(root, globalOptions);
   const exitHandler = async () => {
     if (root.subtests.length === 0 && (root.hooks.before.length > 0 || root.hooks.after.length > 0)) {
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 0ca081a73994ff..d3ed8460b927b3 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -33,7 +33,7 @@ const {
 
 const { spawn } = require('child_process');
 const { finished } = require('internal/streams/end-of-stream');
-const { resolve } = require('path');
+const { resolve, sep, isAbsolute } = require('path');
 const { DefaultDeserializer, DefaultSerializer } = require('v8');
 const { getOptionValue } = require('internal/options');
 const { Interface } = require('internal/readline/interface');
@@ -64,7 +64,6 @@ const { isRegExp } = require('internal/util/types');
 const { pathToFileURL } = require('internal/url');
 const {
   createDeferredPromise,
-  getCWDURL,
   kEmptyObject,
 } = require('internal/util');
 const { kEmitMessage } = require('internal/test_runner/tests_stream');
@@ -98,7 +97,7 @@ let debug = require('internal/util/debuglog').debuglog('test_runner', (fn) => {
 });
 
 const kIsolatedProcessName = Symbol('kIsolatedProcessName');
-const kFilterArgs = ['--test', '--experimental-test-coverage', '--watch'];
+const kFilterArgs = ['--test', '--experimental-test-coverage', '--watch', '--experimental-test-cwd'];
 const kFilterArgValues = ['--test-reporter', '--test-reporter-destination'];
 const kDiagnosticsFilterArgs = ['tests', 'suites', 'pass', 'fail', 'cancelled', 'skipped', 'todo', 'duration_ms'];
 
@@ -138,7 +137,8 @@ function getRunArgs(path, { forceExit,
                             testSkipPatterns,
                             only,
                             argv: suppliedArgs,
-                            execArgv }) {
+                            execArgv,
+                            cwd }) {
   const argv = ArrayPrototypeFilter(process.execArgv, filterExecArgv);
   if (forceExit === true) {
     ArrayPrototypePush(argv, '--test-force-exit');
@@ -679,7 +679,6 @@ function run(options = kEmptyObject) {
     functionCoverage: functionCoverage,
   };
   const root = createTestTree(rootTestOptions, globalOptions);
-
   let testFiles = files ?? createTestFileList(globPatterns, cwd);
 
   if (shard) {
@@ -732,7 +731,9 @@ function run(options = kEmptyObject) {
     };
   } else if (isolation === 'none') {
     if (watch) {
-      filesWatcher = watchFiles(testFiles, opts);
+      // TODO 
+      const absoluteTestFiles = ArrayPrototypeMap(testFiles, (file) => isAbsolute(file) ? file : resolve(cwd, file));
+      filesWatcher = watchFiles(absoluteTestFiles, opts);
       runFiles = async () => {
         root.harness.bootstrapPromise = null;
         root.harness.buildPromise = null;
@@ -745,7 +746,7 @@ function run(options = kEmptyObject) {
         const { promise, resolve: finishBootstrap } = createDeferredPromise();
 
         await root.runInAsyncScope(async () => {
-          const parentURL = getCWDURL().href;
+          const parentURL = pathToFileURL(cwd + sep).href;
           const cascadedLoader = esmLoader.getOrInitializeCascadedLoader();
           let topLevelTestCount = 0;
 
@@ -757,8 +758,8 @@ function run(options = kEmptyObject) {
           }
 
           for (let i = 0; i < testFiles.length; ++i) {
-            const testFile = resolve(cwd, testFiles[i]);
-            const fileURL = pathToFileURL(testFile);
+            const testFile = testFiles[i];
+            const fileURL = pathToFileURL(resolve(cwd, testFile));
             const parent = i === 0 ? undefined : parentURL;
             let threw = false;
             let importError;
diff --git a/lib/internal/test_runner/utils.js b/lib/internal/test_runner/utils.js
index 91d0ad8f5e9af3..386fe8860bb065 100644
--- a/lib/internal/test_runner/utils.js
+++ b/lib/internal/test_runner/utils.js
@@ -206,6 +206,7 @@ function parseCommandLine() {
   let functionCoverage;
   let destinations;
   let isolation;
+  let testCwd = getOptionValue('--experimental-test-cwd') || process.cwd()
   let only = getOptionValue('--test-only');
   let reporters;
   let shard;
@@ -319,6 +320,7 @@ function parseCommandLine() {
     destinations,
     forceExit,
     isolation,
+    testCwd,
     branchCoverage,
     functionCoverage,
     lineCoverage,
diff --git a/src/node_options.cc b/src/node_options.cc
index 3bfab2759b18f4..ff04fe49c881f8 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -680,6 +680,9 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::test_coverage_lines,
             kAllowedInEnvvar);
 
+  AddOption("--experimental-test-cwd", 
+            "specify the working directory for the test runner",
+            &EnvironmentOptions::test_runner_cwd);
   AddOption("--experimental-test-isolation",
             "configures the type of test isolation used in the test runner",
             &EnvironmentOptions::test_isolation);
diff --git a/src/node_options.h b/src/node_options.h
index ed89f08f3b4140..c4de23b1eab524 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -197,6 +197,7 @@ class EnvironmentOptions : public Options {
   bool test_only = false;
   bool test_udp_no_try_send = false;
   std::string test_isolation = "process";
+  std::string test_runner_cwd;
   std::string test_shard;
   std::vector<std::string> test_skip_pattern;
   std::vector<std::string> coverage_include_pattern;
diff --git a/test/parallel/test-runner-no-isolation-different-cwd.mjs b/test/parallel/test-runner-no-isolation-different-cwd.mjs
index 6a15cc4f2b6b32..777322bce88da8 100644
--- a/test/parallel/test-runner-no-isolation-different-cwd.mjs
+++ b/test/parallel/test-runner-no-isolation-different-cwd.mjs
@@ -1,6 +1,6 @@
 import { allowGlobals, mustCall } from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
-import { strictEqual } from 'node:assert';
+import { deepStrictEqual } from 'node:assert';
 import { run } from 'node:test';
 
 const stream = run({
@@ -8,16 +8,12 @@ const stream = run({
   isolation: 'none',
 });
 
-let errors = 0;
-stream.on('test:fail', () => {
-  errors++;
-});
+
 stream.on('test:pass', mustCall(5));
 // eslint-disable-next-line no-unused-vars
 for await (const _ of stream);
-strictEqual(errors, 0);
 allowGlobals(globalThis.GLOBAL_ORDER);
-strictEqual(globalThis.GLOBAL_ORDER, [
+deepStrictEqual(globalThis.GLOBAL_ORDER, [
   'before one: <root>',
   'suite one',
   'before two: <root>',

From e35b227f649ad5eecf41ce3edad4fd7f170e1123 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:29 +0200
Subject: [PATCH 03/20] Update doc/api/cli.md

Co-authored-by: Aviv Keller <telavivkeller@gmail.com>
---
 doc/api/cli.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 837e9c8a2280d7..231d55bd2c928e 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1145,9 +1145,8 @@ added: CHANGEME
 
 > Stability: 1.0 - Early development
 
-Set the current working directory for the test runner.
-If not specified, the current working directory is used.
-This flag is particularly useful when running tests from a different directory.
+Set the current working directory for the test runner. If not specified, the current
+working directory is used.
 
 ### `--experimental-test-isolation=mode`
 

From 7d34799e5b4b62c5d39a73d0d4ed6cb43cbecf71 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 04/20] test_runner: refactor cwd handling in test runner

---
 doc/api/cli.md                       | 11 -----------
 lib/internal/test_runner/coverage.js |  2 +-
 lib/internal/test_runner/harness.js  |  6 ++++--
 lib/internal/test_runner/runner.js   |  6 +++---
 lib/internal/test_runner/utils.js    |  2 --
 src/node_options.cc                  |  4 ----
 src/node_options.h                   |  1 -
 7 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 231d55bd2c928e..588c9cc8640ab7 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1137,17 +1137,6 @@ generated as part of the test runner output. If no tests are run, a coverage
 report is not generated. See the documentation on
 [collecting code coverage from tests][] for more details.
 
-### `--experimental-test-cwd=directory`
-
-<!-- YAML
-added: CHANGEME
--->
-
-> Stability: 1.0 - Early development
-
-Set the current working directory for the test runner. If not specified, the current
-working directory is used.
-
 ### `--experimental-test-isolation=mode`
 
 <!-- YAML
diff --git a/lib/internal/test_runner/coverage.js b/lib/internal/test_runner/coverage.js
index 15a69bb82248f8..37a2738631f2be 100644
--- a/lib/internal/test_runner/coverage.js
+++ b/lib/internal/test_runner/coverage.js
@@ -487,7 +487,7 @@ function sortCoverageFiles(a, b) {
 
 function setupCoverage(options) {
   let originalCoverageDirectory = process.env.NODE_V8_COVERAGE;
-  const cwd = options.testCwd;
+  const cwd = options.cwd ?? process.cwd();
 
   if (originalCoverageDirectory) {
     // NODE_V8_COVERAGE was already specified. Convert it to an absolute path
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 8a00036ef6540d..8d0feab8ea4451 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -207,10 +207,12 @@ function setupProcessState(root, globalOptions) {
 
   hook.enable();
 
+  const cwd = globalOptions.cwd || process.cwd();
+
   const exceptionHandler =
-    createProcessEventHandler('uncaughtException', root, globalOptions.testCwd);
+    createProcessEventHandler('uncaughtException', root, cwd);
   const rejectionHandler =
-    createProcessEventHandler('unhandledRejection', root, globalOptions.testCwd);
+    createProcessEventHandler('unhandledRejection', root, cwd);
   const coverage = configureCoverage(root, globalOptions);
   const exitHandler = async () => {
     if (root.subtests.length === 0 && (root.hooks.before.length > 0 || root.hooks.after.length > 0)) {
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index d3ed8460b927b3..6557d6db284d8e 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -97,7 +97,7 @@ let debug = require('internal/util/debuglog').debuglog('test_runner', (fn) => {
 });
 
 const kIsolatedProcessName = Symbol('kIsolatedProcessName');
-const kFilterArgs = ['--test', '--experimental-test-coverage', '--watch', '--experimental-test-cwd'];
+const kFilterArgs = ['--test', '--experimental-test-coverage', '--watch'];
 const kFilterArgValues = ['--test-reporter', '--test-reporter-destination'];
 const kDiagnosticsFilterArgs = ['tests', 'suites', 'pass', 'fail', 'cancelled', 'skipped', 'todo', 'duration_ms'];
 
@@ -677,6 +677,7 @@ function run(options = kEmptyObject) {
     lineCoverage: lineCoverage,
     branchCoverage: branchCoverage,
     functionCoverage: functionCoverage,
+    cwd,
   };
   const root = createTestTree(rootTestOptions, globalOptions);
   let testFiles = files ?? createTestFileList(globPatterns, cwd);
@@ -731,8 +732,7 @@ function run(options = kEmptyObject) {
     };
   } else if (isolation === 'none') {
     if (watch) {
-      // TODO 
-      const absoluteTestFiles = ArrayPrototypeMap(testFiles, (file) => isAbsolute(file) ? file : resolve(cwd, file));
+      const absoluteTestFiles = ArrayPrototypeMap(testFiles, (file) => (isAbsolute(file) ? file : resolve(cwd, file)));
       filesWatcher = watchFiles(absoluteTestFiles, opts);
       runFiles = async () => {
         root.harness.bootstrapPromise = null;
diff --git a/lib/internal/test_runner/utils.js b/lib/internal/test_runner/utils.js
index 386fe8860bb065..91d0ad8f5e9af3 100644
--- a/lib/internal/test_runner/utils.js
+++ b/lib/internal/test_runner/utils.js
@@ -206,7 +206,6 @@ function parseCommandLine() {
   let functionCoverage;
   let destinations;
   let isolation;
-  let testCwd = getOptionValue('--experimental-test-cwd') || process.cwd()
   let only = getOptionValue('--test-only');
   let reporters;
   let shard;
@@ -320,7 +319,6 @@ function parseCommandLine() {
     destinations,
     forceExit,
     isolation,
-    testCwd,
     branchCoverage,
     functionCoverage,
     lineCoverage,
diff --git a/src/node_options.cc b/src/node_options.cc
index ff04fe49c881f8..66e86db0d390be 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -679,10 +679,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "the line coverage minimum threshold",
             &EnvironmentOptions::test_coverage_lines,
             kAllowedInEnvvar);
-
-  AddOption("--experimental-test-cwd", 
-            "specify the working directory for the test runner",
-            &EnvironmentOptions::test_runner_cwd);
   AddOption("--experimental-test-isolation",
             "configures the type of test isolation used in the test runner",
             &EnvironmentOptions::test_isolation);
diff --git a/src/node_options.h b/src/node_options.h
index c4de23b1eab524..ed89f08f3b4140 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -197,7 +197,6 @@ class EnvironmentOptions : public Options {
   bool test_only = false;
   bool test_udp_no_try_send = false;
   std::string test_isolation = "process";
-  std::string test_runner_cwd;
   std::string test_shard;
   std::vector<std::string> test_skip_pattern;
   std::vector<std::string> coverage_include_pattern;

From 18138e974f9f5108d357a693cd07003bed31368a Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 05/20] test: add isolation test cases to test runner run watch

---
 test/fixtures/test-runner-watch.mjs     | 20 +++++++-
 test/parallel/test-runner-run-watch.mjs | 65 +++++++++++++++++++++++--
 2 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/test/fixtures/test-runner-watch.mjs b/test/fixtures/test-runner-watch.mjs
index 6780b31c541690..69b727fc55e3e4 100644
--- a/test/fixtures/test-runner-watch.mjs
+++ b/test/fixtures/test-runner-watch.mjs
@@ -6,6 +6,12 @@ const options = {
   file: {
     type: 'string',
   },
+  cwd: {
+    type: 'string',
+  },
+  isolation: {
+    type: 'string',
+  },
 };
 const {
   values,
@@ -13,12 +19,24 @@ const {
 } = parseArgs({ args: process.argv.slice(2), options });
 
 let files;
+let cwd;
+let isolation;
 
 if (values.file) {
   files = [values.file];
 }
 
+if (values.cwd) {
+  cwd = values.cwd;
+}
+
+if (values.isolation) {
+  isolation = values.isolation;
+}
+
 run({
   files,
-  watch: true
+  watch: true,
+  ...(cwd ? { cwd } : {}),
+  ...(isolation ? { isolation } : {}),
 }).compose(tap).pipe(process.stdout);
diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
index 1bc4e95aa90e3d..86d4d48b386e0d 100644
--- a/test/parallel/test-runner-run-watch.mjs
+++ b/test/parallel/test-runner-run-watch.mjs
@@ -41,11 +41,23 @@ function refresh() {
 
 const runner = join(import.meta.dirname, '..', 'fixtures', 'test-runner-watch.mjs');
 
-async function testWatch({ fileToUpdate, file, action = 'update', cwd = tmpdir.path, fileToCreate }) {
+async function testWatch(
+  {
+    fileToUpdate,
+    file,
+    action = 'update',
+    cwd = tmpdir.path,
+    fileToCreate,
+    runnerCwd,
+    isolation
+  }
+) {
   const ran1 = util.createDeferredPromise();
   const ran2 = util.createDeferredPromise();
   const args = [runner];
   if (file) args.push('--file', file);
+  if (runnerCwd) args.push('--cwd', runnerCwd);
+  if (isolation) args.push('--isolation', isolation);
   const child = spawn(process.execPath,
                       args,
                       { encoding: 'utf8', stdio: 'pipe', cwd });
@@ -221,7 +233,52 @@ describe('test runner watch mode', () => {
     });
   });
 
-  it('should run new tests when a new file is created in the watched directory', async () => {
-    await testWatch({ action: 'create', fileToCreate: 'new-test-file.test.js' });
-  });
+  it(
+    'should run new tests when a new file is created in the watched directory',
+    async () => {
+      await testWatch({ action: 'create', fileToCreate: 'new-test-file.test.js' });
+    });
+
+  it(
+    'should execute run using a different cwd for the runner than the process cwd',
+    async () => {
+      await testWatch(
+        {
+          fileToUpdate: 'test.js',
+          action: 'rename',
+          cwd: import.meta.dirname,
+          runnerCwd: tmpdir.path
+        }
+      );
+    });
+
+  it(
+    'should execute run using a different cwd for the runner than the process cwd with isolation process',
+    async () => {
+      await testWatch(
+        {
+          fileToUpdate: 'test.js',
+          action: 'rename',
+          cwd: import.meta.dirname,
+          runnerCwd: tmpdir.path,
+          isolation: 'process'
+        }
+      );
+    });
+
+  // TODO: fix this case
+  // it(
+  //   'should execute run using a different cwd for the runner than the process cwd with isolation none',
+  //   async () => {
+  //     await testWatch(
+  //       {
+  //         fileToUpdate: 'test.js',
+  //         action: 'rename',
+  //         cwd: import.meta.dirname,
+  //         runnerCwd: tmpdir.path,
+  //         isolation: 'none'
+  //       }
+  //     );
+  //   }
+  // );
 });

From 8fac04143eb1e59cc787934d9fa13b35316e74bd Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 06/20] test: add test cases

---
 ...unner-no-isolation-different-cwd-watch.mjs | 57 -------------------
 test/parallel/test-runner-run-watch.mjs       | 16 ------
 test/parallel/test-runner-run.mjs             | 34 +++++++++++
 3 files changed, 34 insertions(+), 73 deletions(-)
 delete mode 100644 test/parallel/test-runner-no-isolation-different-cwd-watch.mjs

diff --git a/test/parallel/test-runner-no-isolation-different-cwd-watch.mjs b/test/parallel/test-runner-no-isolation-different-cwd-watch.mjs
deleted file mode 100644
index 232b9af8286184..00000000000000
--- a/test/parallel/test-runner-no-isolation-different-cwd-watch.mjs
+++ /dev/null
@@ -1,57 +0,0 @@
-import { allowGlobals, mustCall, mustNotCall } from '../common/index.mjs';
-import * as fixtures from '../common/fixtures.mjs';
-import { deepStrictEqual } from 'node:assert';
-import { run } from 'node:test';
-
-try {
-  const controller = new AbortController();
-  const stream = run({
-    cwd: fixtures.path('test-runner', 'no-isolation'),
-    isolation: 'none',
-    watch: true,
-    signal: controller.signal,
-  });
-
-  stream.on('test:fail', () => mustNotCall());
-  stream.on('test:pass', mustCall(5));
-  stream.on('data', function({ type }) {
-    if (type === 'test:watch:drained') {
-      controller.abort();
-    }
-  });
-  // eslint-disable-next-line no-unused-vars
-  for await (const _ of stream);
-  allowGlobals(globalThis.GLOBAL_ORDER);
-  deepStrictEqual(globalThis.GLOBAL_ORDER, [
-    'before one: <root>',
-    'suite one',
-    'before two: <root>',
-    'suite two',
-
-    'beforeEach one: suite one - test',
-    'beforeEach two: suite one - test',
-    'suite one - test',
-    'afterEach one: suite one - test',
-    'afterEach two: suite one - test',
-
-    'beforeEach one: test one',
-    'beforeEach two: test one',
-    'test one',
-    'afterEach one: test one',
-    'afterEach two: test one',
-
-    'before suite two: suite two',
-
-    'beforeEach one: suite two - test',
-    'beforeEach two: suite two - test',
-    'suite two - test',
-    'afterEach one: suite two - test',
-    'afterEach two: suite two - test',
-
-    'after one: <root>',
-    'after two: <root>',
-  ]);
-} catch (err) {
-  console.error(err);
-  process.exit(1);
-}
diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
index 86d4d48b386e0d..c3ef9692e9b211 100644
--- a/test/parallel/test-runner-run-watch.mjs
+++ b/test/parallel/test-runner-run-watch.mjs
@@ -265,20 +265,4 @@ describe('test runner watch mode', () => {
         }
       );
     });
-
-  // TODO: fix this case
-  // it(
-  //   'should execute run using a different cwd for the runner than the process cwd with isolation none',
-  //   async () => {
-  //     await testWatch(
-  //       {
-  //         fileToUpdate: 'test.js',
-  //         action: 'rename',
-  //         cwd: import.meta.dirname,
-  //         runnerCwd: tmpdir.path,
-  //         isolation: 'none'
-  //       }
-  //     );
-  //   }
-  // );
 });
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 61eed7b94b9a52..7111e48dc72b23 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -562,6 +562,40 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
     stream.on('test:fail', common.mustNotCall());
     stream.on('test:pass', common.mustCall(1));
   });
+
+  it('should run with different cwd while in watch mode and isolation "none"', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: fixtures.path('test-runner', 'cwd'),
+      watch: true,
+      signal: controller.signal,
+      isolation: 'none',
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+  });
+
+  it('should run with different cwd while in watch mode and isolation "process"', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: fixtures.path('test-runner', 'cwd'),
+      watch: true,
+      signal: controller.signal,
+      isolation: 'process',
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+  });
 });
 
 describe('forceExit', () => {

From 0e9d10d4685762974d8450016ddec19fe5a23eda Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 07/20] test_runner: add validation for run cwd option

---
 lib/internal/test_runner/runner.js |  7 +++++++
 test/parallel/test-runner-run.mjs  | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 6557d6db284d8e..ff553c0b5367a7 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -88,6 +88,7 @@ const {
 } = require('internal/test_runner/utils');
 const { Glob } = require('internal/fs/glob');
 const { once } = require('events');
+const { existsSync, lstatSync } = require('fs');
 const {
   triggerUncaughtException,
   exitCodes: { kGenericUserError },
@@ -590,6 +591,12 @@ function run(options = kEmptyObject) {
 
   validateString(cwd, 'options.cwd');
 
+  if (existsSync(cwd) === false) {
+    throw new ERR_INVALID_ARG_VALUE('options.cwd', cwd, 'expects an existing directory');
+  } else if (!lstatSync(cwd).isDirectory()) {
+    throw new ERR_INVALID_ARG_VALUE('options.cwd', cwd, 'expects a directory, a file was provided');
+  }
+
   if (globPatterns?.length > 0 && files?.length > 0) {
     throw new ERR_INVALID_ARG_VALUE(
       'options.globPatterns', globPatterns, 'is not supported when specifying \'options.files\'',
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 7111e48dc72b23..5f145797baf508 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -547,6 +547,24 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
     for await (const _ of stream);
   });
 
+  it('should throw if an invalid cwd is provided', async () => {
+    assert.throws(() => run({
+      cwd: fixtures.path('test-runner', 'cwd', 'non-existing')
+    }), {
+      code: 'ERR_INVALID_ARG_VALUE',
+      message: /expects an existing directory/
+    });
+  });
+
+  it('should throw if a file is provided as cwd', async () => {
+    assert.throws(() => run({
+      cwd: fixtures.path('test-runner', 'default-behavior', 'test', 'random.cjs')
+    }), {
+      code: 'ERR_INVALID_ARG_VALUE',
+      message: /expects a directory, a file was provided/
+    });
+  });
+
   it('should run with different cwd while in watch mode', async () => {
     const controller = new AbortController();
     const stream = run({

From e6e83292d673688ac13c095b8c9c9d87c6648674 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 08/20] test_runner: remove cwd path validation

---
 lib/internal/test_runner/runner.js |  7 ----
 test/parallel/test-runner-run.mjs  | 58 ++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index ff553c0b5367a7..6557d6db284d8e 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -88,7 +88,6 @@ const {
 } = require('internal/test_runner/utils');
 const { Glob } = require('internal/fs/glob');
 const { once } = require('events');
-const { existsSync, lstatSync } = require('fs');
 const {
   triggerUncaughtException,
   exitCodes: { kGenericUserError },
@@ -591,12 +590,6 @@ function run(options = kEmptyObject) {
 
   validateString(cwd, 'options.cwd');
 
-  if (existsSync(cwd) === false) {
-    throw new ERR_INVALID_ARG_VALUE('options.cwd', cwd, 'expects an existing directory');
-  } else if (!lstatSync(cwd).isDirectory()) {
-    throw new ERR_INVALID_ARG_VALUE('options.cwd', cwd, 'expects a directory, a file was provided');
-  }
-
   if (globPatterns?.length > 0 && files?.length > 0) {
     throw new ERR_INVALID_ARG_VALUE(
       'options.globPatterns', globPatterns, 'is not supported when specifying \'options.files\'',
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 5f145797baf508..e40b072547f329 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -547,22 +547,60 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
     for await (const _ of stream);
   });
 
-  it('should throw if an invalid cwd is provided', async () => {
-    assert.throws(() => run({
+  it('should handle a non-existent directory being provided as cwd', async () => {
+    const diagnostics = [];
+    const stream = run({
       cwd: fixtures.path('test-runner', 'cwd', 'non-existing')
-    }), {
-      code: 'ERR_INVALID_ARG_VALUE',
-      message: /expects an existing directory/
     });
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustNotCall());
+    stream.on('test:stderr', common.mustNotCall());
+    stream.on('test:diagnostic', ({ message }) => {
+      diagnostics.push(message);
+    });
+
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+    for (const entry of [
+      'tests 0',
+      'suites 0',
+      'pass 0',
+      'fail 0',
+      'cancelled 0',
+      'skipped 0',
+      'todo 0',
+    ]
+    ) {
+      assert.strictEqual(diagnostics.includes(entry), true);
+    }
   });
 
-  it('should throw if a file is provided as cwd', async () => {
-    assert.throws(() => run({
+  it('should handle a non-existent file being provided as cwd', async () => {
+    const diagnostics = [];
+    const stream = run({
       cwd: fixtures.path('test-runner', 'default-behavior', 'test', 'random.cjs')
-    }), {
-      code: 'ERR_INVALID_ARG_VALUE',
-      message: /expects a directory, a file was provided/
     });
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustNotCall());
+    stream.on('test:stderr', common.mustNotCall());
+    stream.on('test:diagnostic', ({ message }) => {
+      diagnostics.push(message);
+    });
+
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+    for (const entry of [
+      'tests 0',
+      'suites 0',
+      'pass 0',
+      'fail 0',
+      'cancelled 0',
+      'skipped 0',
+      'todo 0',
+    ]
+    ) {
+      assert.strictEqual(diagnostics.includes(entry), true);
+    }
   });
 
   it('should run with different cwd while in watch mode', async () => {

From 69acadf8701d7e51cb16de0b635e4531c7959f2f Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 09/20] test: update test case

---
 .../test-runner-no-isolation-different-cwd.mjs       | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/test/parallel/test-runner-no-isolation-different-cwd.mjs b/test/parallel/test-runner-no-isolation-different-cwd.mjs
index 777322bce88da8..bdddd368d19f12 100644
--- a/test/parallel/test-runner-no-isolation-different-cwd.mjs
+++ b/test/parallel/test-runner-no-isolation-different-cwd.mjs
@@ -9,7 +9,7 @@ const stream = run({
 });
 
 
-stream.on('test:pass', mustCall(5));
+stream.on('test:pass', mustCall(4));
 // eslint-disable-next-line no-unused-vars
 for await (const _ of stream);
 allowGlobals(globalThis.GLOBAL_ORDER);
@@ -18,27 +18,17 @@ deepStrictEqual(globalThis.GLOBAL_ORDER, [
   'suite one',
   'before two: <root>',
   'suite two',
-
   'beforeEach one: suite one - test',
   'beforeEach two: suite one - test',
   'suite one - test',
   'afterEach one: suite one - test',
   'afterEach two: suite one - test',
-
-  'beforeEach one: test one',
-  'beforeEach two: test one',
-  'test one',
-  'afterEach one: test one',
-  'afterEach two: test one',
-
   'before suite two: suite two',
-
   'beforeEach one: suite two - test',
   'beforeEach two: suite two - test',
   'suite two - test',
   'afterEach one: suite two - test',
   'afterEach two: suite two - test',
-
   'after one: <root>',
   'after two: <root>',
 ]);

From b600ddaf41fba1eeeceabd32ebbd7a3dbf12c06c Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 10/20] test_runner: revert new line

---
 src/node_options.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node_options.cc b/src/node_options.cc
index 66e86db0d390be..3bfab2759b18f4 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -679,6 +679,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "the line coverage minimum threshold",
             &EnvironmentOptions::test_coverage_lines,
             kAllowedInEnvvar);
+
   AddOption("--experimental-test-isolation",
             "configures the type of test isolation used in the test runner",
             &EnvironmentOptions::test_isolation);

From 912099980be5966c7518f3b1593ff142b0b36a67 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 11/20] test_runner: remove cwd fallback

---
 lib/internal/test_runner/coverage.js |  5 ++---
 lib/internal/test_runner/harness.js  | 12 +++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/internal/test_runner/coverage.js b/lib/internal/test_runner/coverage.js
index 37a2738631f2be..e7997f4f646aa3 100644
--- a/lib/internal/test_runner/coverage.js
+++ b/lib/internal/test_runner/coverage.js
@@ -487,7 +487,6 @@ function sortCoverageFiles(a, b) {
 
 function setupCoverage(options) {
   let originalCoverageDirectory = process.env.NODE_V8_COVERAGE;
-  const cwd = options.cwd ?? process.cwd();
 
   if (originalCoverageDirectory) {
     // NODE_V8_COVERAGE was already specified. Convert it to an absolute path
@@ -495,7 +494,7 @@ function setupCoverage(options) {
     // so that no preexisting coverage files interfere with the results of the
     // coverage report. Then, once the coverage is computed, move the coverage
     // files back to the original NODE_V8_COVERAGE directory.
-    originalCoverageDirectory = resolve(cwd, originalCoverageDirectory);
+    originalCoverageDirectory = resolve(options.cwd, originalCoverageDirectory);
   }
 
   const coverageDirectory = mkdtempSync(join(tmpdir(), 'node-coverage-'));
@@ -512,7 +511,7 @@ function setupCoverage(options) {
   return new TestCoverage(
     coverageDirectory,
     originalCoverageDirectory,
-    cwd,
+    options.cwd,
     options.coverageExcludeGlobs,
     options.coverageIncludeGlobs,
     {
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 8d0feab8ea4451..a6c1473e0b68a7 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -207,12 +207,10 @@ function setupProcessState(root, globalOptions) {
 
   hook.enable();
 
-  const cwd = globalOptions.cwd || process.cwd();
-
   const exceptionHandler =
-    createProcessEventHandler('uncaughtException', root, cwd);
+    createProcessEventHandler('uncaughtException', root, globalOptions.cwd);
   const rejectionHandler =
-    createProcessEventHandler('unhandledRejection', root, cwd);
+    createProcessEventHandler('unhandledRejection', root, globalOptions.cwd);
   const coverage = configureCoverage(root, globalOptions);
   const exitHandler = async () => {
     if (root.subtests.length === 0 && (root.hooks.before.length > 0 || root.hooks.after.length > 0)) {
@@ -261,7 +259,11 @@ function lazyBootstrapRoot() {
       entryFile,
       loc: entryFile ? [1, 1, entryFile] : undefined,
     };
-    const globalOptions = parseCommandLine();
+    const globalOptions = {
+      __proto__: null,
+      ...parseCommandLine(),
+      cwd: process.cwd(),
+    };
     createTestTree(rootTestOptions, globalOptions);
     globalRoot.reporter.on('test:summary', (data) => {
       if (!data.success) {

From 37014ccfd42640bdd84157b95112c83311e53831 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 12/20] test_runner: remove additional param

---
 lib/internal/test_runner/harness.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index a6c1473e0b68a7..150d11733ad4e8 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -90,7 +90,7 @@ function createTestTree(rootTestOptions, globalOptions) {
   return globalRoot;
 }
 
-function createProcessEventHandler(eventName, rootTest, cwd) {
+function createProcessEventHandler(eventName, rootTest) {
   return (err) => {
     if (rootTest.harness.bootstrapPromise) {
       // Something went wrong during the asynchronous portion of bootstrapping
@@ -116,7 +116,7 @@ function createProcessEventHandler(eventName, rootTest, cwd) {
         const name = test.hookType ? `Test hook "${test.hookType}"` : `Test "${test.name}"`;
         let locInfo = '';
         if (test.loc) {
-          const relPath = relative(cwd, test.loc.file);
+          const relPath = relative(rootTest.config.cwd, test.loc.file);
           locInfo = ` at ${relPath}:${test.loc.line}:${test.loc.column}`;
         }
 
@@ -208,9 +208,9 @@ function setupProcessState(root, globalOptions) {
   hook.enable();
 
   const exceptionHandler =
-    createProcessEventHandler('uncaughtException', root, globalOptions.cwd);
+    createProcessEventHandler('uncaughtException', root);
   const rejectionHandler =
-    createProcessEventHandler('unhandledRejection', root, globalOptions.cwd);
+    createProcessEventHandler('unhandledRejection', root);
   const coverage = configureCoverage(root, globalOptions);
   const exitHandler = async () => {
     if (root.subtests.length === 0 && (root.hooks.before.length > 0 || root.hooks.after.length > 0)) {

From 565a938f4f066168d95abf56684a7514cfbd17ea Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 13/20] test_runner: fix unix failures

---
 lib/internal/test_runner/runner.js       |  3 ++-
 test/parallel/test-runner-run-watch.mjs  | 24 ++++++++++++++----------
 test/parallel/test-runner-watch-mode.mjs | 10 ++++++----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 6557d6db284d8e..18940ffdbe8b58 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -495,7 +495,8 @@ function watchFiles(testFiles, opts) {
       // When file renamed (created / deleted) we need to update the watcher
       if (newFileName) {
         owners = new SafeSet().add(newFileName);
-        watcher.filterFile(resolve(newFileName), owners);
+        const resolveFileName = isAbsolute(newFileName) ? newFileName : resolve(opts.cwd, newFileName);
+        watcher.filterFile(resolveFileName, owners);
       }
 
       if (!newFileName && previousFileName) {
diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
index c3ef9692e9b211..9ad9eaf1b60e4b 100644
--- a/test/parallel/test-runner-run-watch.mjs
+++ b/test/parallel/test-runner-run-watch.mjs
@@ -59,8 +59,8 @@ async function testWatch(
   if (runnerCwd) args.push('--cwd', runnerCwd);
   if (isolation) args.push('--isolation', isolation);
   const child = spawn(process.execPath,
-                      args,
-                      { encoding: 'utf8', stdio: 'pipe', cwd });
+    args,
+    { encoding: 'utf8', stdio: 'pipe', cwd });
   let stdout = '';
   let currentRun = '';
   const runs = [];
@@ -103,10 +103,12 @@ async function testWatch(
     currentRun = '';
     const fileToRenamePath = tmpdir.resolve(fileToUpdate);
     const newFileNamePath = tmpdir.resolve(`test-renamed-${fileToUpdate}`);
-    const interval = setInterval(() => renameSync(fileToRenamePath, newFileNamePath), common.platformTimeout(1000));
+    const interval = setInterval(() => {
+      renameSync(fileToRenamePath, newFileNamePath), common.platformTimeout(1000)
+      clearInterval(interval);
+    });
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 
@@ -141,11 +143,11 @@ async function testWatch(
         unlinkSync(fileToDeletePath);
       } else {
         ran2.resolve();
+        clearInterval(interval);
       }
     }, common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 
@@ -162,15 +164,17 @@ async function testWatch(
     currentRun = '';
     const newFilePath = tmpdir.resolve(fileToCreate);
     const interval = setInterval(
-      () => writeFileSync(
-        newFilePath,
-        'module.exports = {};'
-      ),
+      () => {
+        writeFileSync(
+          newFilePath,
+          'module.exports = {};'
+        );
+        clearInterval(interval);
+      },
       common.platformTimeout(1000)
     );
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 
diff --git a/test/parallel/test-runner-watch-mode.mjs b/test/parallel/test-runner-watch-mode.mjs
index b6fa0a2fe0f131..9dbac7faa6dd9c 100644
--- a/test/parallel/test-runner-watch-mode.mjs
+++ b/test/parallel/test-runner-watch-mode.mjs
@@ -92,10 +92,12 @@ async function testWatch({
     currentRun = '';
     const fileToRenamePath = tmpdir.resolve(fileToUpdate);
     const newFileNamePath = tmpdir.resolve(`test-renamed-${fileToUpdate}`);
-    const interval = setInterval(() => renameSync(fileToRenamePath, newFileNamePath), common.platformTimeout(1000));
+    const interval = setInterval(() => {
+      renameSync(fileToRenamePath, newFileNamePath)
+      clearInterval(interval);
+    }, common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 
@@ -119,11 +121,11 @@ async function testWatch({
         unlinkSync(fileToDeletePath);
       } else {
         ran2.resolve();
+        clearInterval(interval);
       }
-    }, common.platformTimeout(1000));
+    }, common.platformTimeout(2000));
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 

From 9aea826a6d847abd073384223c21b001364854b7 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 14/20] test: lint

---
 test/parallel/test-runner-run-watch.mjs  | 8 ++++----
 test/parallel/test-runner-watch-mode.mjs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
index 9ad9eaf1b60e4b..8ccc4646de2a26 100644
--- a/test/parallel/test-runner-run-watch.mjs
+++ b/test/parallel/test-runner-run-watch.mjs
@@ -59,8 +59,8 @@ async function testWatch(
   if (runnerCwd) args.push('--cwd', runnerCwd);
   if (isolation) args.push('--isolation', isolation);
   const child = spawn(process.execPath,
-    args,
-    { encoding: 'utf8', stdio: 'pipe', cwd });
+                      args,
+                      { encoding: 'utf8', stdio: 'pipe', cwd });
   let stdout = '';
   let currentRun = '';
   const runs = [];
@@ -104,9 +104,9 @@ async function testWatch(
     const fileToRenamePath = tmpdir.resolve(fileToUpdate);
     const newFileNamePath = tmpdir.resolve(`test-renamed-${fileToUpdate}`);
     const interval = setInterval(() => {
-      renameSync(fileToRenamePath, newFileNamePath), common.platformTimeout(1000)
+      renameSync(fileToRenamePath, newFileNamePath);
       clearInterval(interval);
-    });
+    }, common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
     child.kill();
diff --git a/test/parallel/test-runner-watch-mode.mjs b/test/parallel/test-runner-watch-mode.mjs
index 9dbac7faa6dd9c..26862fceb96c78 100644
--- a/test/parallel/test-runner-watch-mode.mjs
+++ b/test/parallel/test-runner-watch-mode.mjs
@@ -93,7 +93,7 @@ async function testWatch({
     const fileToRenamePath = tmpdir.resolve(fileToUpdate);
     const newFileNamePath = tmpdir.resolve(`test-renamed-${fileToUpdate}`);
     const interval = setInterval(() => {
-      renameSync(fileToRenamePath, newFileNamePath)
+      renameSync(fileToRenamePath, newFileNamePath);
       clearInterval(interval);
     }, common.platformTimeout(1000));
     await ran2.promise;

From c9288af27007bd034d11294b87cfe8fecdce35f7 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 15/20] test: remove setInterval

---
 test/parallel/test-runner-watch-mode.mjs | 38 +++++++++---------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/test/parallel/test-runner-watch-mode.mjs b/test/parallel/test-runner-watch-mode.mjs
index 26862fceb96c78..4230f8eb72b644 100644
--- a/test/parallel/test-runner-watch-mode.mjs
+++ b/test/parallel/test-runner-watch-mode.mjs
@@ -4,7 +4,7 @@ import { describe, it, beforeEach } from 'node:test';
 import { once } from 'node:events';
 import assert from 'node:assert';
 import { spawn } from 'node:child_process';
-import { writeFileSync, renameSync, unlinkSync, existsSync } from 'node:fs';
+import { writeFileSync, renameSync, unlinkSync } from 'node:fs';
 import util from 'internal/util';
 import tmpdir from '../common/tmpdir.js';
 
@@ -29,6 +29,10 @@ import('data:text/javascript,');
 test('test has ran');`,
 };
 
+function wait(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 function refresh() {
   tmpdir.refresh();
   fixturePaths = Object.keys(fixtureContent)
@@ -69,10 +73,10 @@ async function testWatch({
     currentRun = '';
     const content = fixtureContent[fileToUpdate];
     const path = fixturePaths[fileToUpdate];
-    const interval = setInterval(() => writeFileSync(path, content), common.platformTimeout(1000));
+    writeFileSync(path, content);
+    await wait(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 
@@ -92,10 +96,8 @@ async function testWatch({
     currentRun = '';
     const fileToRenamePath = tmpdir.resolve(fileToUpdate);
     const newFileNamePath = tmpdir.resolve(`test-renamed-${fileToUpdate}`);
-    const interval = setInterval(() => {
-      renameSync(fileToRenamePath, newFileNamePath);
-      clearInterval(interval);
-    }, common.platformTimeout(1000));
+    renameSync(fileToRenamePath, newFileNamePath);
+    await wait(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
     child.kill();
@@ -116,15 +118,9 @@ async function testWatch({
     runs.push(currentRun);
     currentRun = '';
     const fileToDeletePath = tmpdir.resolve(fileToUpdate);
-    const interval = setInterval(() => {
-      if (existsSync(fileToDeletePath)) {
-        unlinkSync(fileToDeletePath);
-      } else {
-        ran2.resolve();
-        clearInterval(interval);
-      }
-    }, common.platformTimeout(2000));
-    await ran2.promise;
+    unlinkSync(fileToDeletePath);
+    await wait(common.platformTimeout(2000));
+    ran2.resolve();
     runs.push(currentRun);
     child.kill();
     await once(child, 'exit');
@@ -141,16 +137,10 @@ async function testWatch({
     runs.push(currentRun);
     currentRun = '';
     const newFilePath = tmpdir.resolve(fileToCreate);
-    const interval = setInterval(
-      () => writeFileSync(
-        newFilePath,
-        'module.exports = {};'
-      ),
-      common.platformTimeout(1000)
-    );
+    writeFileSync(newFilePath, 'module.exports = {};');
+    await wait(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 

From 71ea33d947d886431cdd1c04e0df00e54d84f107 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 16/20] test: apply suggestions

---
 test/fixtures/test-runner-watch.mjs      |  4 ++--
 test/parallel/test-runner-watch-mode.mjs | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/test/fixtures/test-runner-watch.mjs b/test/fixtures/test-runner-watch.mjs
index 69b727fc55e3e4..72b0a111d46723 100644
--- a/test/fixtures/test-runner-watch.mjs
+++ b/test/fixtures/test-runner-watch.mjs
@@ -37,6 +37,6 @@ if (values.isolation) {
 run({
   files,
   watch: true,
-  ...(cwd ? { cwd } : {}),
-  ...(isolation ? { isolation } : {}),
+  cwd,
+  isolation,
 }).compose(tap).pipe(process.stdout);
diff --git a/test/parallel/test-runner-watch-mode.mjs b/test/parallel/test-runner-watch-mode.mjs
index 4230f8eb72b644..0c56e4c20e5b37 100644
--- a/test/parallel/test-runner-watch-mode.mjs
+++ b/test/parallel/test-runner-watch-mode.mjs
@@ -5,6 +5,7 @@ import { once } from 'node:events';
 import assert from 'node:assert';
 import { spawn } from 'node:child_process';
 import { writeFileSync, renameSync, unlinkSync } from 'node:fs';
+import { setTimeout } from 'node:timers/promises';
 import util from 'internal/util';
 import tmpdir from '../common/tmpdir.js';
 
@@ -29,10 +30,6 @@ import('data:text/javascript,');
 test('test has ran');`,
 };
 
-function wait(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 function refresh() {
   tmpdir.refresh();
   fixturePaths = Object.keys(fixtureContent)
@@ -74,7 +71,7 @@ async function testWatch({
     const content = fixtureContent[fileToUpdate];
     const path = fixturePaths[fileToUpdate];
     writeFileSync(path, content);
-    await wait(common.platformTimeout(1000));
+    await setTimeout(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
     child.kill();
@@ -97,7 +94,7 @@ async function testWatch({
     const fileToRenamePath = tmpdir.resolve(fileToUpdate);
     const newFileNamePath = tmpdir.resolve(`test-renamed-${fileToUpdate}`);
     renameSync(fileToRenamePath, newFileNamePath);
-    await wait(common.platformTimeout(1000));
+    await setTimeout(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
     child.kill();
@@ -119,7 +116,7 @@ async function testWatch({
     currentRun = '';
     const fileToDeletePath = tmpdir.resolve(fileToUpdate);
     unlinkSync(fileToDeletePath);
-    await wait(common.platformTimeout(2000));
+    await setTimeout(common.platformTimeout(2000));
     ran2.resolve();
     runs.push(currentRun);
     child.kill();
@@ -138,7 +135,7 @@ async function testWatch({
     currentRun = '';
     const newFilePath = tmpdir.resolve(fileToCreate);
     writeFileSync(newFilePath, 'module.exports = {};');
-    await wait(common.platformTimeout(1000));
+    await setTimeout(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
     child.kill();

From e995bec6bcd768a0011cef2d024930d10b8738ed Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 17/20] test_runner: avoid spread operation

---
 lib/internal/test_runner/harness.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 150d11733ad4e8..9109495fef03f3 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -259,11 +259,8 @@ function lazyBootstrapRoot() {
       entryFile,
       loc: entryFile ? [1, 1, entryFile] : undefined,
     };
-    const globalOptions = {
-      __proto__: null,
-      ...parseCommandLine(),
-      cwd: process.cwd(),
-    };
+    const globalOptions = parseCommandLine();
+    globalOptions.cwd = process.cwd();
     createTestTree(rootTestOptions, globalOptions);
     globalRoot.reporter.on('test:summary', (data) => {
       if (!data.success) {

From c6d0cece9006f1b07ae458c623c3d36bad42fcf8 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Tue, 1 Oct 2024 18:05:30 +0200
Subject: [PATCH 18/20] test: refactor watch cwd tests

---
 test/parallel/test-runner-run-watch.mjs | 58 ++++++++++++++++++++++++-
 test/parallel/test-runner-run.mjs       | 50 ---------------------
 2 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
index 8ccc4646de2a26..5069011c0271d9 100644
--- a/test/parallel/test-runner-run-watch.mjs
+++ b/test/parallel/test-runner-run-watch.mjs
@@ -1,6 +1,6 @@
 // Flags: --expose-internals
 import * as common from '../common/index.mjs';
-import { describe, it, beforeEach } from 'node:test';
+import { describe, it, beforeEach, run } from 'node:test';
 import assert from 'node:assert';
 import { spawn } from 'node:child_process';
 import { once } from 'node:events';
@@ -269,4 +269,60 @@ describe('test runner watch mode', () => {
         }
       );
     });
+
+  it('should run with different cwd while in watch mode', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: tmpdir.path,
+      watch: true,
+      signal: controller.signal,
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+  });
+
+  it('should run with different cwd while in watch mode and isolation "none"', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: tmpdir.path,
+      watch: true,
+      signal: controller.signal,
+      isolation: 'none',
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+  });
+
+  it('should run with different cwd while in watch mode and isolation "process"', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: tmpdir.path,
+      watch: true,
+      signal: controller.signal,
+      isolation: 'process',
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+  });
 });
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index e40b072547f329..9f13e1a1e56420 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -602,56 +602,6 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       assert.strictEqual(diagnostics.includes(entry), true);
     }
   });
-
-  it('should run with different cwd while in watch mode', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: fixtures.path('test-runner', 'cwd'),
-      watch: true,
-      signal: controller.signal,
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
-    });
-
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-  });
-
-  it('should run with different cwd while in watch mode and isolation "none"', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: fixtures.path('test-runner', 'cwd'),
-      watch: true,
-      signal: controller.signal,
-      isolation: 'none',
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
-    });
-
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-  });
-
-  it('should run with different cwd while in watch mode and isolation "process"', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: fixtures.path('test-runner', 'cwd'),
-      watch: true,
-      signal: controller.signal,
-      isolation: 'process',
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
-    });
-
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-  });
 });
 
 describe('forceExit', () => {

From e0b7a487987bd2a12102521639e1e0d44ffe25ad Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Wed, 2 Oct 2024 10:08:02 +0200
Subject: [PATCH 19/20] test: divide test cases

---
 test/parallel/test-runner-run-watch.mjs | 146 ++++++++++++------------
 1 file changed, 74 insertions(+), 72 deletions(-)

diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
index 5069011c0271d9..1c5a2f74c48795 100644
--- a/test/parallel/test-runner-run-watch.mjs
+++ b/test/parallel/test-runner-run-watch.mjs
@@ -243,86 +243,88 @@ describe('test runner watch mode', () => {
       await testWatch({ action: 'create', fileToCreate: 'new-test-file.test.js' });
     });
 
-  it(
-    'should execute run using a different cwd for the runner than the process cwd',
-    async () => {
-      await testWatch(
-        {
-          fileToUpdate: 'test.js',
-          action: 'rename',
-          cwd: import.meta.dirname,
-          runnerCwd: tmpdir.path
-        }
-      );
-    });
-
-  it(
-    'should execute run using a different cwd for the runner than the process cwd with isolation process',
-    async () => {
-      await testWatch(
-        {
-          fileToUpdate: 'test.js',
-          action: 'rename',
-          cwd: import.meta.dirname,
-          runnerCwd: tmpdir.path,
-          isolation: 'process'
+  describe('test runner watch mode with different cwd', () => {
+    it(
+      'should execute run using a different cwd for the runner than the process cwd',
+      async () => {
+        await testWatch(
+          {
+            fileToUpdate: 'test.js',
+            action: 'rename',
+            cwd: import.meta.dirname,
+            runnerCwd: tmpdir.path
+          }
+        );
+      });
+
+    it(
+      'should execute run using a different cwd for the runner than the process cwd with isolation process',
+      async () => {
+        await testWatch(
+          {
+            fileToUpdate: 'test.js',
+            action: 'rename',
+            cwd: import.meta.dirname,
+            runnerCwd: tmpdir.path,
+            isolation: 'process'
+          }
+        );
+      });
+
+    it('should run with different cwd while in watch mode', async () => {
+      const controller = new AbortController();
+      const stream = run({
+        cwd: tmpdir.path,
+        watch: true,
+        signal: controller.signal,
+      }).on('data', function({ type }) {
+        if (type === 'test:watch:drained') {
+          controller.abort();
         }
-      );
-    });
+      });
 
-  it('should run with different cwd while in watch mode', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: tmpdir.path,
-      watch: true,
-      signal: controller.signal,
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
+      stream.on('test:fail', common.mustNotCall());
+      stream.on('test:pass', common.mustCall(1));
+      // eslint-disable-next-line no-unused-vars
+      for await (const _ of stream);
     });
 
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-    // eslint-disable-next-line no-unused-vars
-    for await (const _ of stream);
-  });
+    it('should run with different cwd while in watch mode and isolation "none"', async () => {
+      const controller = new AbortController();
+      const stream = run({
+        cwd: tmpdir.path,
+        watch: true,
+        signal: controller.signal,
+        isolation: 'none',
+      }).on('data', function({ type }) {
+        if (type === 'test:watch:drained') {
+          controller.abort();
+        }
+      });
 
-  it('should run with different cwd while in watch mode and isolation "none"', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: tmpdir.path,
-      watch: true,
-      signal: controller.signal,
-      isolation: 'none',
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
+      stream.on('test:fail', common.mustNotCall());
+      stream.on('test:pass', common.mustCall(1));
+      // eslint-disable-next-line no-unused-vars
+      for await (const _ of stream);
     });
 
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-    // eslint-disable-next-line no-unused-vars
-    for await (const _ of stream);
-  });
+    it('should run with different cwd while in watch mode and isolation "process"', async () => {
+      const controller = new AbortController();
+      const stream = run({
+        cwd: tmpdir.path,
+        watch: true,
+        signal: controller.signal,
+        isolation: 'process',
+      }).on('data', function({ type }) {
+        if (type === 'test:watch:drained') {
+          controller.abort();
+        }
+      });
 
-  it('should run with different cwd while in watch mode and isolation "process"', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: tmpdir.path,
-      watch: true,
-      signal: controller.signal,
-      isolation: 'process',
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
+      stream.on('test:fail', common.mustNotCall());
+      stream.on('test:pass', common.mustCall(1));
+      // eslint-disable-next-line no-unused-vars
+      for await (const _ of stream);
     });
-
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-    // eslint-disable-next-line no-unused-vars
-    for await (const _ of stream);
   });
 });

From a162f2dd2aac3c81f0f3108d46e184739fa84750 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Thu, 3 Oct 2024 10:35:56 +0200
Subject: [PATCH 20/20] test: remove event listeners before abort

---
 test/parallel/test-runner-run-watch.mjs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
index 1c5a2f74c48795..fca8b492bc3ad0 100644
--- a/test/parallel/test-runner-run-watch.mjs
+++ b/test/parallel/test-runner-run-watch.mjs
@@ -279,6 +279,8 @@ describe('test runner watch mode', () => {
         signal: controller.signal,
       }).on('data', function({ type }) {
         if (type === 'test:watch:drained') {
+          stream.removeAllListeners('test:fail');
+          stream.removeAllListeners('test:pass');
           controller.abort();
         }
       });
@@ -298,6 +300,8 @@ describe('test runner watch mode', () => {
         isolation: 'none',
       }).on('data', function({ type }) {
         if (type === 'test:watch:drained') {
+          stream.removeAllListeners('test:fail');
+          stream.removeAllListeners('test:pass');
           controller.abort();
         }
       });
@@ -317,6 +321,8 @@ describe('test runner watch mode', () => {
         isolation: 'process',
       }).on('data', function({ type }) {
         if (type === 'test:watch:drained') {
+          stream.removeAllListeners('test:fail');
+          stream.removeAllListeners('test:pass');
           controller.abort();
         }
       });