adamm/nodejs20
SHA256
1
0
Fork 0
Code Pull Requests Activity

- fix_ci_tests.patch: add benchmark fix

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=78
This commit is contained in:
Adam Majer 2024-04-10 10:58:43 +00:00 committed by Git OBS Bridge
parent a314d2f006
commit 557e8b7ca6
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
fix_ci_tests.patch
View File

@ -2,10 +2,10 @@ Author: Adam Majer <amajer@suse.de>
Date: Dec 20 09:18:49 UTC 2017 Date: Dec 20 09:18:49 UTC 2017
Summary: Fix CI unit tests framework for OBS building Summary: Fix CI unit tests framework for OBS building
Index: node-v20.12.0/test/parallel/test-module-loading-globalpaths.js Index: node-v20.12.1/test/parallel/test-module-loading-globalpaths.js
=================================================================== ===================================================================
--- node-v20.12.0.orig/test/parallel/test-module-loading-globalpaths.js --- node-v20.12.1.orig/test/parallel/test-module-loading-globalpaths.js
+++ node-v20.12.0/test/parallel/test-module-loading-globalpaths.js +++ node-v20.12.1/test/parallel/test-module-loading-globalpaths.js
@@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c @@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c
addLibraryPath(process.env); addLibraryPath(process.env);
@ -16,10 +16,10 @@ Index: node-v20.12.0/test/parallel/test-module-loading-globalpaths.js
if (process.argv[2] === 'child') { if (process.argv[2] === 'child') {
console.log(require(pkgName).string); console.log(require(pkgName).string);
} else { } else {
Index: node-v20.12.0/test/parallel/test-tls-passphrase.js Index: node-v20.12.1/test/parallel/test-tls-passphrase.js
=================================================================== ===================================================================
--- node-v20.12.0.orig/test/parallel/test-tls-passphrase.js --- node-v20.12.1.orig/test/parallel/test-tls-passphrase.js
+++ node-v20.12.0/test/parallel/test-tls-passphrase.js +++ node-v20.12.1/test/parallel/test-tls-passphrase.js
@@ -223,7 +223,7 @@ server.listen(0, common.mustCall(functio @@ -223,7 +223,7 @@ server.listen(0, common.mustCall(functio
}, onSecureConnect()); }, onSecureConnect());
})).unref(); })).unref();
@ -29,10 +29,10 @@ Index: node-v20.12.0/test/parallel/test-tls-passphrase.js
// Missing passphrase // Missing passphrase
assert.throws(function() { assert.throws(function() {
Index: node-v20.12.0/test/parallel/test-repl-envvars.js Index: node-v20.12.1/test/parallel/test-repl-envvars.js
=================================================================== ===================================================================
--- node-v20.12.0.orig/test/parallel/test-repl-envvars.js --- node-v20.12.1.orig/test/parallel/test-repl-envvars.js
+++ node-v20.12.0/test/parallel/test-repl-envvars.js +++ node-v20.12.1/test/parallel/test-repl-envvars.js
@@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
// Flags: --expose-internals // Flags: --expose-internals
@ -44,10 +44,10 @@ Index: node-v20.12.0/test/parallel/test-repl-envvars.js
const stream = require('stream'); const stream = require('stream');
const { describe, test } = require('node:test'); const { describe, test } = require('node:test');
const REPL = require('internal/repl'); const REPL = require('internal/repl');
Index: node-v20.12.0/Makefile Index: node-v20.12.1/Makefile
=================================================================== ===================================================================
--- node-v20.12.0.orig/Makefile --- node-v20.12.1.orig/Makefile
+++ node-v20.12.0/Makefile +++ node-v20.12.1/Makefile
@@ -389,7 +389,6 @@ ADDONS_HEADERS_PREREQS := tools/install. @@ -389,7 +389,6 @@ ADDONS_HEADERS_PREREQS := tools/install.
$(wildcard deps/uv/include/*/*.h) \ $(wildcard deps/uv/include/*/*.h) \
$(wildcard deps/v8/include/*.h) \ $(wildcard deps/v8/include/*.h) \
@ -76,10 +76,10 @@ Index: node-v20.12.0/Makefile
echo "Skipping tools/doc/node_modules (no crypto)"; \ echo "Skipping tools/doc/node_modules (no crypto)"; \
else \ else \
cd tools/doc && $(call available-node,$(run-npm-ci)) \ cd tools/doc && $(call available-node,$(run-npm-ci)) \
Index: node-v20.12.0/tools/test.py Index: node-v20.12.1/tools/test.py
=================================================================== ===================================================================
--- node-v20.12.0.orig/tools/test.py --- node-v20.12.1.orig/tools/test.py
+++ node-v20.12.0/tools/test.py +++ node-v20.12.1/tools/test.py
@@ -1362,7 +1362,7 @@ def BuildOptions(): @@ -1362,7 +1362,7 @@ def BuildOptions():
result.add_option("-s", "--suite", help="A test suite", result.add_option("-s", "--suite", help="A test suite",
default=[], action="append") default=[], action="append")
@ -89,10 +89,10 @@ Index: node-v20.12.0/tools/test.py
result.add_option("--arch", help='The architecture to run tests for', result.add_option("--arch", help='The architecture to run tests for',
default='none') default='none')
result.add_option("--snapshot", help="Run the tests with snapshot turned on", result.add_option("--snapshot", help="Run the tests with snapshot turned on",
Index: node-v20.12.0/test/parallel/test-crypto-dh.js Index: node-v20.12.1/test/parallel/test-crypto-dh.js
=================================================================== ===================================================================
--- node-v20.12.0.orig/test/parallel/test-crypto-dh.js --- node-v20.12.1.orig/test/parallel/test-crypto-dh.js
+++ node-v20.12.0/test/parallel/test-crypto-dh.js +++ node-v20.12.1/test/parallel/test-crypto-dh.js
@@ -90,9 +90,7 @@ const crypto = require('crypto'); @@ -90,9 +90,7 @@ const crypto = require('crypto');
const hasOpenSSL3WithNewErrorMessage = (v >= 0x300000c0 && v <= 0x30100000) || (v >= 0x30100040 && v <= 0x30200000); const hasOpenSSL3WithNewErrorMessage = (v >= 0x300000c0 && v <= 0x30100000) || (v >= 0x30100040 && v <= 0x30200000);
assert.throws(() => { assert.throws(() => {
@ -104,10 +104,10 @@ Index: node-v20.12.0/test/parallel/test-crypto-dh.js
} }
} }
Index: node-v20.12.0/test/parallel/test-node-output-errors.mjs Index: node-v20.12.1/test/parallel/test-node-output-errors.mjs
=================================================================== ===================================================================
--- node-v20.12.0.orig/test/parallel/test-node-output-errors.mjs --- node-v20.12.1.orig/test/parallel/test-node-output-errors.mjs
+++ node-v20.12.0/test/parallel/test-node-output-errors.mjs +++ node-v20.12.1/test/parallel/test-node-output-errors.mjs
@@ -28,6 +28,7 @@ describe('errors output', { concurrency: @@ -28,6 +28,7 @@ describe('errors output', { concurrency:
.replaceAll(/\/(\w)/g, '*$1') .replaceAll(/\/(\w)/g, '*$1')
.replaceAll('*test*', '*') .replaceAll('*test*', '*')
@ -116,10 +116,10 @@ Index: node-v20.12.0/test/parallel/test-node-output-errors.mjs
.replaceAll('file:**', 'file:*/'); .replaceAll('file:**', 'file:*/');
} }
Index: node-v20.12.0/test/parallel/test-crypto-fips.js Index: node-v20.12.1/test/parallel/test-crypto-fips.js
=================================================================== ===================================================================
--- node-v20.12.0.orig/test/parallel/test-crypto-fips.js --- node-v20.12.1.orig/test/parallel/test-crypto-fips.js
+++ node-v20.12.0/test/parallel/test-crypto-fips.js +++ node-v20.12.1/test/parallel/test-crypto-fips.js
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
const common = require('../common'); const common = require('../common');
if (!common.hasCrypto) if (!common.hasCrypto)
@ -129,10 +129,10 @@ Index: node-v20.12.0/test/parallel/test-crypto-fips.js
const assert = require('assert'); const assert = require('assert');
const spawnSync = require('child_process').spawnSync; const spawnSync = require('child_process').spawnSync;
Index: node-v20.12.0/test/parallel/test-node-output-v8-warning.mjs Index: node-v20.12.1/test/parallel/test-node-output-v8-warning.mjs
=================================================================== ===================================================================
--- node-v20.12.0.orig/test/parallel/test-node-output-v8-warning.mjs --- node-v20.12.1.orig/test/parallel/test-node-output-v8-warning.mjs
+++ node-v20.12.0/test/parallel/test-node-output-v8-warning.mjs +++ node-v20.12.1/test/parallel/test-node-output-v8-warning.mjs
@@ -15,7 +15,7 @@ describe('v8 output', { concurrency: tru @@ -15,7 +15,7 @@ describe('v8 output', { concurrency: tru
.replaceAll('*test*', '*') .replaceAll('*test*', '*')
.replaceAll(/.*?\*fixtures\*v8\*/g, '(node:*) V8: *') // Replace entire path before fixtures/v8 .replaceAll(/.*?\*fixtures\*v8\*/g, '(node:*) V8: *') // Replace entire path before fixtures/v8
@ -142,3 +142,15 @@ Index: node-v20.12.0/test/parallel/test-node-output-v8-warning.mjs
} }
const common = snapshot const common = snapshot
.transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion); .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion);
Index: node-v20.12.1/benchmark/misc/startup-cli-version.js
===================================================================
--- node-v20.12.1.orig/benchmark/misc/startup-cli-version.js
+++ node-v20.12.1/benchmark/misc/startup-cli-version.js
@@ -11,7 +11,6 @@ const path = require('path');
// indispensible part of the CLI.
const bench = common.createBenchmark(main, {
cli: [
- 'tools/node_modules/eslint/bin/eslint.js',
'deps/npm/bin/npx-cli.js',
'deps/npm/bin/npm-cli.js',
'deps/corepack/dist/corepack.js',

1
nodejs20.changes
View File

@ -12,6 +12,7 @@ Tue Apr 9 12:30:22 UTC 2024 - Adam Majer <adam.majer@suse.de>
CVE-2024-30260, CVE-2024-30261) CVE-2024-30260, CVE-2024-30261)
- node-gyp-addon-gypi.patch: adapted for new unit test layouts - node-gyp-addon-gypi.patch: adapted for new unit test layouts
- fix_ci_tests.patch: add benchmark fix
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 2 14:39:07 UTC 2024 - Adam Majer <adam.majer@suse.de> Tue Apr 2 14:39:07 UTC 2024 - Adam Majer <adam.majer@suse.de>