Hello community, here is the log from the commit of package nodejs12 for openSUSE:Factory checked in at 2019-11-11 13:00:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs12 (Old) and /work/SRC/openSUSE:Factory/.nodejs12.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs12" Mon Nov 11 13:00:47 2019 rev:6 rq:745497 version:12.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs12/nodejs12.changes 2019-10-23 15:53:06.390840934 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs12.new.2990/nodejs12.changes 2019-11-11 13:00:47.381715692 +0100 @@ -1,0 +2,6 @@ +Tue Nov 5 08:27:58 UTC 2019 - Adam Majer <[email protected]> + +- skip_no_console.patch: skip tests with dumb console +- versioned.patch: fix symlinks + +------------------------------------------------------------------- New: ---- skip_no_console.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs12.spec ++++++ --- /var/tmp/diff_new_pack.rm6Ea8/_old 2019-11-11 13:00:49.093717504 +0100 +++ /var/tmp/diff_new_pack.rm6Ea8/_new 2019-11-11 13:00:49.101717513 +0100 @@ -135,6 +135,7 @@ # PATCH-FIX-OPENSUSE -- install user global npm packages to /usr/local # instead of /usr Patch104: npm_search_paths.patch +Patch106: skip_no_console.patch Patch120: flaky_test_rerun.patch @@ -145,6 +146,8 @@ BuildRequires: binutils-gold %endif +BuildRequires: pkg-config + # Node.js 4/6/7 requires GCC 4.8.5+. # # For Node.js 8.x, upstream requires GCC 4.9.4+, as GCC 4.8 may have @@ -325,9 +328,13 @@ %patch103 -p1 %endif %patch104 -p1 +%patch106 -p1 %patch120 -p1 %patch200 -p1 +# remove backup files, if any +find -name \*~ -print0 -delete + # abnormalities from patching find \( -name \*.js.orig -or -name \*.md.orig \) -delete ++++++ skip_no_console.patch ++++++ Index: node-v12.13.0/test/parallel/test-console-clear.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-console-clear.js +++ node-v12.13.0/test/parallel/test-console-clear.js @@ -18,5 +18,6 @@ function doTest(isTTY, check) { } // Fake TTY -doTest(true, check); +if (process.env.TERM !== 'dumb') + doTest(true, check); doTest(false, ''); Index: node-v12.13.0/test/parallel/test-readline-position.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-readline-position.js +++ node-v12.13.0/test/parallel/test-readline-position.js @@ -1,6 +1,6 @@ // Flags: --expose-internals 'use strict'; -require('../common'); +const common = require('../common'); const { internalBinding } = require('internal/test/binding'); const { PassThrough } = require('stream'); const readline = require('readline'); @@ -8,6 +8,12 @@ const assert = require('assert'); const ctrlU = { ctrl: true, name: 'u' }; +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + { const input = new PassThrough(); const rl = readline.createInterface({ Index: node-v12.13.0/test/parallel/test-readline-interface.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-readline-interface.js +++ node-v12.13.0/test/parallel/test-readline-interface.js @@ -29,6 +29,12 @@ const internalReadline = require('intern const EventEmitter = require('events').EventEmitter; const { Writable, Readable } = require('stream'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + class FakeInput extends EventEmitter { resume() {} pause() {} Index: node-v12.13.0/test/parallel/test-readline-undefined-columns.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-readline-undefined-columns.js +++ node-v12.13.0/test/parallel/test-readline-undefined-columns.js @@ -11,6 +11,12 @@ const readline = require('readline'); const iStream = new PassThrough(); const oStream = new PassThrough(); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + readline.createInterface({ terminal: true, input: iStream, Index: node-v12.13.0/test/parallel/test-readline.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-readline.js +++ node-v12.13.0/test/parallel/test-readline.js @@ -4,6 +4,13 @@ const { PassThrough } = require('stream' const readline = require('readline'); const assert = require('assert'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + + { const input = new PassThrough(); const rl = readline.createInterface({ Index: node-v12.13.0/test/parallel/test-repl-editor.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-repl-editor.js +++ node-v12.13.0/test/parallel/test-repl-editor.js @@ -1,6 +1,6 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const repl = require('repl'); const ArrayStream = require('../common/arraystream'); @@ -11,6 +11,12 @@ const ArrayStream = require('../common/a const terminalCode = '\u001b[1G\u001b[0J> \u001b[3G'; const terminalCodeRegex = new RegExp(terminalCode.replace(/\[/g, '\\['), 'g'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + function run({ input, output, event, checkTerminalCodes = true }) { const stream = new ArrayStream(); let found = ''; Index: node-v12.13.0/test/parallel/test-repl-eval-scope.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-repl-eval-scope.js +++ node-v12.13.0/test/parallel/test-repl-eval-scope.js @@ -4,6 +4,12 @@ const ArrayStream = require('../common/a const assert = require('assert'); const repl = require('repl'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + { const stream = new ArrayStream(); const options = { Index: node-v12.13.0/test/parallel/test-repl-history-navigation.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-repl-history-navigation.js +++ node-v12.13.0/test/parallel/test-repl-history-navigation.js @@ -9,6 +9,12 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); Index: node-v12.13.0/test/parallel/test-repl-load-multiline.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-repl-load-multiline.js +++ node-v12.13.0/test/parallel/test-repl-load-multiline.js @@ -1,10 +1,16 @@ 'use strict'; -require('../common'); +const common = require('../common'); const ArrayStream = require('../common/arraystream'); const fixtures = require('../common/fixtures'); const assert = require('assert'); const repl = require('repl'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + const command = `.load ${fixtures.path('repl-load-multiline.js')}`; const terminalCode = '\u001b[1G\u001b[0J \u001b[1G'; const terminalCodeRegex = new RegExp(terminalCode.replace(/\[/g, '\\['), 'g'); Index: node-v12.13.0/test/parallel/test-repl-persistent-history.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-repl-persistent-history.js +++ node-v12.13.0/test/parallel/test-repl-persistent-history.js @@ -11,6 +11,12 @@ const fs = require('fs'); const path = require('path'); const os = require('os'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); Index: node-v12.13.0/test/parallel/test-repl-programmatic-history.js =================================================================== --- node-v12.13.0.orig/test/parallel/test-repl-programmatic-history.js +++ node-v12.13.0/test/parallel/test-repl-programmatic-history.js @@ -9,6 +9,12 @@ const fs = require('fs'); const path = require('path'); const os = require('os'); +if (process.env.TERM == 'dumb') +{ + common.skip('Skipping test - dumb console'); + return; +} + const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); ++++++ versioned.patch ++++++ --- /var/tmp/diff_new_pack.rm6Ea8/_old 2019-11-11 13:00:49.213717632 +0100 +++ /var/tmp/diff_new_pack.rm6Ea8/_new 2019-11-11 13:00:49.213717632 +0100 @@ -25,17 +25,25 @@ =================================================================== --- node-v12.13.0.orig/tools/install.py +++ node-v12.13.0/tools/install.py -@@ -81,7 +81,7 @@ def uninstall(paths, dst): +@@ -81,34 +81,34 @@ def uninstall(paths, dst): try_remove(path, dst) def npm_files(action): - target_path = sysconfig.get_config_var("LIB") + '/node_modules/npm/' -+ target_path = sysconfig.get_config_var("LIB") + '/node_modules/npm12/' ++ target_path = sysconfig.get_config_var("LIBDIR") + '/node_modules/npm12/' # don't install npm if the target path is a symlink, it probably means # that a dev version of npm is installed there -@@ -95,20 +95,20 @@ def npm_files(action): - action(paths, target_path + dirname[9:] + '/') +- if os.path.islink(abspath(install_path, target_path)): return ++ if os.path.islink(abspath(install_path, '..', target_path)): return + + # npm has a *lot* of files and it'd be a pain to maintain a fixed list here + # so we walk its source directory instead... + for dirname, subdirs, basenames in os.walk('deps/npm', topdown=True): + subdirs[:] = [subdir for subdir in subdirs if subdir != 'test'] + paths = [os.path.join(dirname, basename) for basename in basenames] +- action(paths, target_path + dirname[9:] + '/') ++ action(paths, install_path + '/..' + target_path + dirname[9:] + '/') # create/remove symlink - link_path = abspath(install_path, 'bin/npm') @@ -45,7 +53,7 @@ + action([link_path], 'bin/npm12') elif action == install: - try_symlink("../" + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npm-cli.js',link_path) -+ try_symlink("../" + sysconfig.get_config_var("LIB") + '/node_modules/npm12/bin/npm-cli.js',link_path) ++ try_symlink(sysconfig.get_config_var("LIBDIR") + '/node_modules/npm12/bin/npm-cli.js',link_path) else: assert 0 # unhandled action type @@ -57,7 +65,7 @@ + action([link_path], 'bin/npx12') elif action == install: - try_symlink('../' + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npx-cli.js', link_path) -+ try_symlink('../' + sysconfig.get_config_var("LIB") + '/node_modules/npm12/bin/npx-cli.js', link_path) ++ try_symlink(sysconfig.get_config_var("LIBDIR") + '/node_modules/npm12/bin/npx-cli.js', link_path) else: assert 0 # unhandled action type @@ -70,8 +78,12 @@ output_prefix = 'out/Release/' if 'false' == variables.get('node_shared'): -@@ -147,7 +147,7 @@ def files(action): - action(['out/Release/node.d'], sysconfig.get_config_var("LIB") + '/dtrace/node.d') +@@ -144,10 +144,10 @@ def files(action): + action([output_prefix + output_file], 'lib/' + output_file) + + if 'true' == variables.get('node_use_dtrace'): +- action(['out/Release/node.d'], sysconfig.get_config_var("LIB") + '/dtrace/node.d') ++ action(['out/Release/node.d'], sysconfig.get_config_var("LIBDIR") + '/dtrace/node.d') # behave similarly for systemtap - action(['src/node.stp'], 'share/systemtap/tapset/')
