From e4afc497f19e9aa26cf770f94672885a6279f6e9 Mon Sep 17 00:00:00 2001 From: Carlos Espa Date: Tue, 28 Jan 2025 22:54:53 +0100 Subject: [PATCH 1/5] test: change jenkins reporter --- tools/test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/test.py b/tools/test.py index fb9ba3c73e9960..52e4834240f59d 100755 --- a/tools/test.py +++ b/tools/test.py @@ -351,7 +351,9 @@ def Starting(self): self._done = 0 def AboutToRun(self, case): - pass + case.additional_flags = case.additional_flags.copy() if hasattr(case, 'additional_flags') else [] + case.additional_flags.append('--test-reporter=./test/common/test-error-reporter.js') + case.additional_flags.append('--test-reporter-destination=stdout') def HasRun(self, output): self._done += 1 From 5143039db0d031317c1af2fb2fb620f2aa0f450e Mon Sep 17 00:00:00 2001 From: Carlos Espa Date: Tue, 28 Jan 2025 23:03:48 +0100 Subject: [PATCH 2/5] temp: fail test to see output --- test/parallel/test-assert-fail.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js index 3211e438a3a533..44213d634edc4c 100644 --- a/test/parallel/test-assert-fail.js +++ b/test/parallel/test-assert-fail.js @@ -47,4 +47,5 @@ test('Object prototype get', () => { Object.prototype.get = () => { throw new Error('failed'); }; assert.throws(() => assert.fail(''), { code: 'ERR_ASSERTION' }); delete Object.prototype.get; + throw new Error('fail'); }); From e27210f19f5855dcf09d962bc5c9e0c4e4179bc4 Mon Sep 17 00:00:00 2001 From: Carlos Espa Date: Thu, 30 Jan 2025 10:15:24 +0100 Subject: [PATCH 3/5] fixup! test: change jenkins reporter --- tools/test.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/test.py b/tools/test.py index 52e4834240f59d..487b0fdb3c27e2 100755 --- a/tools/test.py +++ b/tools/test.py @@ -316,9 +316,7 @@ def HasRun(self, output): class ActionsAnnotationProgressIndicator(DotsProgressIndicator): def AboutToRun(self, case): - case.additional_flags = case.additional_flags.copy() if hasattr(case, 'additional_flags') else [] - case.additional_flags.append('--test-reporter=./test/common/test-error-reporter.js') - case.additional_flags.append('--test-reporter-destination=stdout') + pass def GetAnnotationInfo(self, test, output): traceback = output.stdout + output.stderr @@ -351,9 +349,7 @@ def Starting(self): self._done = 0 def AboutToRun(self, case): - case.additional_flags = case.additional_flags.copy() if hasattr(case, 'additional_flags') else [] - case.additional_flags.append('--test-reporter=./test/common/test-error-reporter.js') - case.additional_flags.append('--test-reporter-destination=stdout') + pass def HasRun(self, output): self._done += 1 @@ -1450,6 +1446,9 @@ def BuildOptions(): result.add_option("--type", help="Type of build (simple, fips, coverage)", default=None) + result.add_option("--error-reporter", + help="use error reporter", + default=True, action="store_true") return result @@ -1665,6 +1664,10 @@ def Main(): options.node_args.append("--always-turbofan") options.progress = "deopts" + if options.error_reporter: + options.node_args.append('--test-reporter=./test/common/test-error-reporter.js') + options.node_args.append('--test-reporter-destination=stdout') + if options.worker: run_worker = join(workspace, "tools", "run-worker.js") options.node_args.append(run_worker) From 7aab88f556ca12232fd692cdcf7de61722ff6906 Mon Sep 17 00:00:00 2001 From: Carlos Espa <43477095+Ceres6@users.noreply.github.com> Date: Sat, 1 Feb 2025 10:52:27 +0100 Subject: [PATCH 4/5] Update test/parallel/test-assert-fail.js Co-authored-by: Yagiz Nizipli --- test/parallel/test-assert-fail.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js index 44213d634edc4c..3211e438a3a533 100644 --- a/test/parallel/test-assert-fail.js +++ b/test/parallel/test-assert-fail.js @@ -47,5 +47,4 @@ test('Object prototype get', () => { Object.prototype.get = () => { throw new Error('failed'); }; assert.throws(() => assert.fail(''), { code: 'ERR_ASSERTION' }); delete Object.prototype.get; - throw new Error('fail'); }); From 303b95e102a3f13e9dafb992f2f61916a6892d5f Mon Sep 17 00:00:00 2001 From: Carlos Espa Date: Sun, 2 Feb 2025 21:35:35 +0100 Subject: [PATCH 5/5] fixup! test: change jenkins reporter --- test/es-module/test-esm-no-addons.mjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/es-module/test-esm-no-addons.mjs b/test/es-module/test-esm-no-addons.mjs index a61c1f3b7cb7d2..731e41ab98cb9a 100644 --- a/test/es-module/test-esm-no-addons.mjs +++ b/test/es-module/test-esm-no-addons.mjs @@ -15,8 +15,7 @@ if (isMainThread) { loadFixture('pkgexports/no-addons').then( mustCall((module) => { const message = module.default; - - if (process.execArgv.length === 0) { + if (!process.execArgv.includes('--no-addons')) { assert.strictEqual(message, 'using native addons'); } else { assert.strictEqual(message, 'not using native addons');