Commit f90258a7 authored by Jérémy Lal's avatar Jérémy Lal

Refresh patches

parent 3cfdaf01
......@@ -39,7 +39,7 @@ Last-Update: 2013-03-16
fs.writeFileSync(pkgPath, `exports.string = '${expectedString}';`);
--- a/lib/module.js
+++ b/lib/module.js
@@ -625,7 +625,7 @@
@@ -630,7 +630,7 @@
} else {
prefixDir = path.resolve(process.execPath, '..', '..');
}
......
......@@ -2,9 +2,9 @@ Description: use configuration directive to set mips fpu mode
Author: YunQiang Su <wzssyqa@gmail.com>
Forwarded: https://github.com/paul99/v8m-rb/issues/192
Last-Update: 2015-09-29
--- nodejs-4.1.0~dfsg.orig/deps/v8/src/base/cpu.cc
+++ nodejs-4.1.0~dfsg/deps/v8/src/base/cpu.cc
@@ -137,22 +137,11 @@ static uint32_t ReadELFHWCaps() {
--- a/deps/v8/src/base/cpu.cc
+++ b/deps/v8/src/base/cpu.cc
@@ -138,22 +138,11 @@
#if V8_HOST_ARCH_MIPS
int __detect_fp64_mode(void) {
......
......@@ -24,7 +24,7 @@ Forwarded: not-needed
if (added) {
--- a/tools/doc/html.js
+++ b/tools/doc/html.js
@@ -383,10 +383,7 @@
@@ -434,10 +434,7 @@
}
if (tok.type !== 'heading') return;
......@@ -38,7 +38,7 @@ Forwarded: not-needed
const realFilename = path.basename(realFilenames[0], '.md');
--- a/tools/doc/json.js
+++ b/tools/doc/json.js
@@ -43,8 +43,7 @@
@@ -64,8 +64,7 @@
if (type === 'heading' &&
!text.trim().match(/^example/i)) {
if (tok.depth - depth > 1) {
......@@ -50,7 +50,7 @@ Forwarded: not-needed
// Sometimes we have two headings with a single
--- a/Makefile
+++ b/Makefile
@@ -356,26 +356,12 @@
@@ -491,26 +491,12 @@
# check if ./node is actually set, else use user pre-installed binary
gen-json = tools/doc/generate.js --format=json $< > $@
out/doc/api/%.json: doc/api/%.md
......
......@@ -5,9 +5,9 @@ Last-Update: 2017-08-16
Author: Jérémy Lal <kapouer@melix.org>
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -7,6 +7,8 @@
@@ -6,6 +6,8 @@
[true] # This section applies to all platforms
test-fs-read-buffer-tostring-fail : PASS,FLAKY
+test-tls-alert: SKIP
+
......@@ -16,7 +16,7 @@ Author: Jérémy Lal <kapouer@melix.org>
[$system==linux]
--- a/test/parallel/test-tls-session-cache.js
+++ b/test/parallel/test-tls-session-cache.js
@@ -70,7 +70,6 @@
@@ -105,7 +105,6 @@
server.listen(0, function() {
const args = [
's_client',
......
openssl/s_client_1.1.patch
openssl/s_client_tls12.patch
use_system_node_gyp.patch
privacy_breach.patch
......
......@@ -4,12 +4,14 @@ Last-Update: 2015-09-09
Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@
@@ -80,8 +80,8 @@
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
+out/Makefile: common.gypi deps/http_parser/http_parser.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \
+ deps/v8/gypfiles/toolchain.gypi \
deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \
config.gypi
$(PYTHON) tools/gyp_node.py -f make
config.gypi: configure
......@@ -19,18 +19,18 @@ Last-Update: 2016-03-09
Author: Jérémy Lal <kapouer@melix.org>
--- a/Makefile
+++ b/Makefile
@@ -205,8 +205,8 @@
@@ -325,8 +325,8 @@
test-all-valgrind: test-build
$(PYTHON) tools/test.py --mode=debug,release --valgrind
-CI_NATIVE_SUITES := addons
-CI_JS_SUITES := doctool inspector known_issues message parallel pseudo-tty sequential
+CI_NATIVE_SUITES ?= addons
+CI_JS_SUITES ?= doctool inspector known_issues message parallel pseudo-tty sequential
-CI_NATIVE_SUITES := addons addons-napi
-CI_JS_SUITES := async-hooks doctool inspector known_issues message parallel pseudo-tty sequential
+CI_NATIVE_SUITES ?= addons addons-napi
+CI_JS_SUITES ?= async-hooks doctool inspector known_issues message parallel pseudo-tty sequential
# Build and test addons without building anything else
test-ci-native: LOGLEVEL := info
@@ -217,7 +217,7 @@
@@ -337,7 +337,7 @@
# This target should not use a native compiler at all
test-ci-js: | clear-stalled
......@@ -41,9 +41,9 @@ Author: Jérémy Lal <kapouer@melix.org>
# Clean up any leftover processes, error if found.
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -7,6 +7,22 @@
@@ -6,6 +6,22 @@
[true] # This section applies to all platforms
test-fs-read-buffer-tostring-fail : PASS,FLAKY
+test-process-config : PASS,FLAKY
+test-regress-GH-746 : PASS,FLAKY
......@@ -64,17 +64,14 @@ Author: Jérémy Lal <kapouer@melix.org>
test-tls-alert: SKIP
[$system==win32]
@@ -26,4 +42,8 @@
[$system==aix]
#covered by https://github.com/nodejs/node/issues/3796
# but more frequent on AIX ?
-test-debug-signal-cluster : PASS, FLAKY
\ No newline at end of file
+test-debug-signal-cluster : PASS, FLAKY
+
@@ -21,3 +37,7 @@
[$system==freebsd]
+[$arch==mips64el]
+# the debug flag is for hacking v8 internals
+test-debug-args: PASS,FLAKY
+
--- a/test/sequential/sequential.status
+++ b/test/sequential/sequential.status
@@ -5,6 +5,8 @@
......@@ -88,8 +85,8 @@ Author: Jérémy Lal <kapouer@melix.org>
--- a/tools/test.py
+++ b/tools/test.py
@@ -857,10 +857,7 @@
self.abort_on_timeout = abort_on_timeout
@@ -898,10 +898,7 @@
self.v8_enable_inspector = v8_enable_inspector
def GetVm(self, arch, mode):
- if arch == 'none':
......@@ -102,7 +99,7 @@ Author: Jérémy Lal <kapouer@melix.org>
# http://code.google.com/p/gyp/issues/detail?id=40
--- a/test/parallel/test-dgram-membership.js
+++ b/test/parallel/test-dgram-membership.js
@@ -58,30 +58,30 @@
@@ -78,30 +78,30 @@
}
// addMembership() with valid socket and multicast address should not throw
......@@ -158,14 +155,17 @@ Author: Jérémy Lal <kapouer@melix.org>
+// }
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -282,24 +282,7 @@
@@ -319,27 +319,7 @@
};
exports.platformTimeout = function(ms) {
- if (process.config.target_defaults.default_configuration === 'Debug')
- ms = 2 * ms;
-
- if (exports.isAix)
- if (global.__coverage__)
- ms = 4 * ms;
-
- if (exports.isAIX)
- return 2 * ms; // default localhost speed is slower on AIX
-
- if (process.arch !== 'arm')
......
......@@ -4,16 +4,24 @@ Last-Update: 2015-09-09
Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@
$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
@@ -214,7 +214,7 @@
# it always triggers a rebuild due to it being a .PHONY rule. See the comment
# near the build-addons rule for more background.
test/gc/build/Release/binding.node: test/gc/binding.cc test/gc/binding.gyp
- $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
+ node-gyp rebuild \
--python="$(PYTHON)" \
--directory="$(shell pwd)/test/gc/node_modules/weak" \
--directory="$(shell pwd)/test/gc" \
--nodedir="$(shell pwd)"
@@ -170,7 +170,7 @@
@@ -243,7 +243,6 @@
# Depends on node-gyp package.json so that build-addons is (re)executed when
# node-gyp is updated as part of an npm update.
test/addons/.buildstamp: config.gypi \
- deps/npm/node_modules/node-gyp/package.json \
$(ADDONS_BINDING_GYPS) $(ADDONS_BINDING_SOURCES) \
deps/uv/include/*.h deps/v8/include/*.h \
src/node.h src/node_buffer.h src/node_object_wrap.h src/node_version.h \
@@ -252,7 +251,7 @@
# embedded addons have been generated from the documentation.
@for dirname in test/addons/*/; do \
printf "\nBuilding addon $$PWD/$$dirname\n" ; \
......@@ -22,3 +30,20 @@ Forwarded: not-needed
--loglevel=$(LOGLEVEL) rebuild \
--python="$(PYTHON)" \
--directory="$$PWD/$$dirname" \
@@ -278,7 +277,6 @@
# Implicitly depends on $(NODE_EXE), see the build-addons-napi rule for rationale.
test/addons-napi/.buildstamp: config.gypi \
- deps/npm/node_modules/node-gyp/package.json \
$(ADDONS_NAPI_BINDING_GYPS) $(ADDONS_NAPI_BINDING_SOURCES) \
deps/uv/include/*.h deps/v8/include/*.h \
src/node.h src/node_buffer.h src/node_object_wrap.h src/node_version.h \
@@ -287,7 +285,7 @@
# embedded addons have been generated from the documentation.
@for dirname in test/addons-napi/*/; do \
printf "\nBuilding addon $$PWD/$$dirname\n" ; \
- env MAKEFLAGS="-j1" $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp \
+ env MAKEFLAGS="-j1" $(NODE) node-gyp \
--loglevel=$(LOGLEVEL) rebuild \
--python="$(PYTHON)" \
--directory="$$PWD/$$dirname" \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment