Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Merge nodejs/master to xplat #236

Merged
merged 232 commits into from
May 5, 2017
Merged

Merge nodejs/master to xplat #236

merged 232 commits into from
May 5, 2017

Conversation

kunalspathak
Copy link
Member

@kunalspathak kunalspathak commented May 4, 2017 •
edited
Loading

Merge e8f3163 as of 2017-04-25.

Only commit to review is 7fc3f3b where i fixed some unit test and marked some of the failing ones as FLAKY. This is to align with @joaocgreis work in #233.

Here are the details for unit test that are marked FLAKY.

  • test-buffer-bindingobj-no-zerofill : This test is going to infinite loop
    and timing out. It expects the allocateUnsafe should return non-zero filled
    memory but node-chakracore always return buffer with zero filled.

  • test-regress-GH-12371 : This one crashing with
    jsrt::Fatal("v8::ToLocalChecked: %s", "Empty MaybeLocal.");.

  • test-util : Expecting isNativeError() returns false for
    Object.create(Error.prototype)

  • test-zlib-convenience-methods : Getting this assert
    Assertion Buffer::IsWithinBounds(in_off, in_len, Buffer::Length(in_buf))' failed

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

core, test

danbev and others added 30 commits April 10, 2017 07:18
@danbev
src: only block SIGUSR1 when HAVE_INSPECTOR
65a6e05 
I'm currently seeing a timeout error for test-signal-handler.js on
macosx when using the following configuration:

./configure --debug --without-ssl && make -j8 test

--without-ssl implies that there will be no inspector but the signal
SIGUSR1 is blocked in PlatformInit just the same. But in this case
never unblocked which is causing the signal to never be delivered to
the handlers in test-signal-handler.js and it loops until it times out.

Not sure if this is the best way of fixing this but hopefully more eyes
on this will help.

PR-URL: nodejs/node#12266
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@danbev
src: use std::list for at_exit_functions
fe016c6 
This change was suggested by bnoordhuis in the following comment:
nodejs/node#9163 (comment)

Not including any tests as this is covered by test/addons/at-exit.

PR-URL: nodejs/node#12255
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@vsemozhetbyt
doc: fix confusing example in process.md
b2a12ee 
PR-URL: nodejs/node#12282
Fixes: nodejs/node#12280
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@Qantas94Heavy @addaleax
test: check curve algorithm is supported
2555780 
parallel/test-crypto-dh.js assumes particular curve algorithms
(e.g. Oakley-EC2N-3) are supported, though this may not necessarily be
the case if Node.js was built with a system version of OpenSSL.

PR-URL: nodejs/node#12265
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@sam-github @addaleax
src: use a std::vector for preload_modules
cecdf7c 
A dynamically allocated array was being used, simplify the memory
management by using std::vector.

PR-URL: nodejs/node#12241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@tniessen @addaleax
crypto: handle exceptions in hmac/hash.digest
88351a2 
Forced conversion of the encoding parameter to a string within
crypto.js, fixing segmentation faults in node_crypto.cc.

Fixes: nodejs/node#9819
PR-URL: nodejs/node#12164
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
@watilde
url: trim leading slashes of file URL paths
b470a85 
It should trim the slashes after the colon into three for file URL.

PR-URL: nodejs/node#12203
Refs: web-platform-tests/wpt#5195
Fixes: nodejs/node#11188
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@boingoing @addaleax
n-api: change napi_callback to return napi_value
ca786c3 
Change `napi_callback` to return `napi_value` directly instead of
requiring `napi_set_return_value`.

When we invoke the callback, we will check the return value and
call `SetReturnValue` ourselves. If the callback returns `NULL`,
we don't set the return value in v8 which would have the same
effect as previously if the callback didn't call
`napi_set_return_value`. Seems to be a more natural way
to handle return values from callbacks. As a consequence,
remove `napi_set_return_value`.

Add a `napi_value` to `napi_property_descriptor` to support string
values which couldn't be passed in the `utf8name` parameter or
symbols as property names. Class names, however, cannot be symbols
so this `napi_value` must be a string type in that case.

Remove all of the `napi_callback_info` helpers except for
`napi_get_cb_info` and make all the parameters to
`napi_get_cb_info` optional except for argc.

Update all the test collateral according to these changes.
Also add `test/addons-napi/common.h` to house some common macros
for wrapping N-API calls and error handling.

PR-URL: nodejs/node#12248
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@boingoing @addaleax
n-api: implement async helper methods
9decfb1 
Based on the async methods we had in abi-stable-node before the napi
feature landed in node/master. Changed this set of APIs to handle
error cases and removed a lot of the extra methods we had for setting
all the pieces of napi_work opting instead to pass all of those as
arguments to napi_create_async_work as none of those parameters are
optional except for the complete callback, anyway.

Renamed the napi_work struct to napi_async_work and replace the
struct itself with a class which can better encapsulate the object
lifetime and uv_work_t that we're trying to wrap anyway.

Added a napi_async_callback type for the async helper callbacks
instead of taking raw function pointers and make this callback take a
napi_env parameter as well as the void* data it was already taking.

Call the complete handler for the async work item with a napi_status
code translated from the uvlib error code.

The execute callback is required for napi_create_async_work, though
complete callback is still optional.

Also added some async unit tests for addons-napi based on the
addons/async_hello_world test.

PR-URL: nodejs/node#12250
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Hitesh Kanwathirtha <hiteshk@microsoft.com>
@joyeecheung
build: sort phony rules
c694633 
Sort phony rules and place them one per line for the ease of
updating and backporting

PR-URL: nodejs/node#12059
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@joyeecheung
build: add test-gc-clean and test-gc PHONY rules
baa2602 
PR-URL: nodejs/node#12059
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@Trott
test: remove disabled tls_server.js
569f988 
Remove tls_server.js that has been disabled for about 6 years. It
appears to have worked in concert with some other file which has since
been removed. It seems to create a server and set up a bunch of
listeners, but it does not appear to have code that connects to the
server and triggers any of those listeners.

PR-URL: nodejs/node#12275
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@silverwind @jasnell
doc: add link on logo to README
71704fb 
This is to override GitHub's default behaviour that links to the
image's source file, which isn't very helpful in our case.

PR-URL: nodejs/node#12307
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@vsemozhetbyt @jasnell
doc: update os.uptime() and process.uptime() info
9b6376a 
PR-URL: nodejs/node#12294
Fixes: nodejs/node#12291
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@Qantas94Heavy @jasnell
test: fix allocUnsafe uninitialized buffer check
eb49d59 
Fixes parallel/test-buffer-bindingobj-no-zerofill to properly check
that buffers created with `Buffer.allocUnsafe()` are not zero-filled.

The test introduced in #11706 passes even if the buffer has been
zero-filled and fails if none of the buffer values are zero.

Refs: nodejs/node#11706
PR-URL: nodejs/node#12290
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@joaocgreis
build,win: limit maxcpucount to 2 for MSBuild
6cfedf0 
MSBuild invokes cl.exe with /MP (set in common.gypi), making it
compile sources in parallel using a number of internal processes
equal to the number of effective processors. MSBuild /m uses a
similar mechanism, so the number of compiler processes can grow to
the number of effective processors squared.

This limits MSBuild to 2 processes, to still use some parallelization
while requiring less memory. Cl.exe is still invoked with /MP, thus
the maximum number of processes is limited to twice the number of
effective processors.

PR-URL: nodejs/node#12184
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@joaocgreis
deps,win: increase msvs_shard in gyp for V8
c1670b6 
Increase the number of shards to divide v8_base into. This increases
the number of calls to cl.exe but decreases the number of files
compiled each time.

Fixes: nodejs/v8#4
PR-URL: nodejs/node#12184
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@bnoordhuis
n-api: fix -Wmismatched-tags compiler warning
affe0f2 
`napi_env__` was declared as a struct in one place and a class in
another.

PR-URL: nodejs/node#12333
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@italoacasas
2017-04-11, Version 7.9.0 (Current)
b8f4160 
Notable changes:

* util: console is now closer to what is supported in all major browsers
(Roman Reiss) [#10308](nodejs/node#10308)

PR-URL: nodejs/node#12319
inspector: fix Coverity defects
42be835 
PR-URL: nodejs/node#12272
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@vsemozhetbyt
doc: modernize and fix code examples in path.md
a912425 
Unify spaces, quotes, and semicolons. Update output examples.

PR-URL: nodejs/node#12296
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@ofrobots
deps: cherry-pick node-inspect#43
b7608ac 
Node 8.x no longer has --debug-brk.

Ref: nodejs/node-inspect#43
PR-URL: nodejs/node#11441
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: joshgav - Josh Gavant <josh.gavant@outlook.com>
Reviewed-By: cjihrig - Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: targos - Michaël Zasso <mic.besace@gmail.com>
@ofrobots
src,test: debug is now an alias for inspect
a235ccd 
`node debug` is now an alias of `node inspect`. This is intended to be
a minimal change – it does not get rid of the the debugger code. That
can be done in a follow-on.

PR-URL: nodejs/node#11441
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: joshgav - Josh Gavant <josh.gavant@outlook.com>
Reviewed-By: cjihrig - Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: targos - Michaël Zasso <mic.besace@gmail.com>
@danbev
src: guard default_inspector_port
f9bc835 
When configuring and building --without-ssl the following warning is
reported:
../src/node_debug_options.cc:12:11: warning: unused variable
'default_inspector_port' [-Wunused-const-variable]
const int default_inspector_port = 9229;

The commit adds a HAVE_INSPECTOR guard to this constant.

PR-URL: nodejs/node#12303
Reviewed-By: cjihrig - Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@danbev
src: guard bundled_ca/openssl_ca with HAVE_OPENSSL
de168b4 
Currently, the following warning will be reported when configuring
without-ssl:

../src/node.cc:3653:8: warning: unused variable 'use_bundled_ca'
[-Wunused-variable]
  bool use_bundled_ca = false;
       ^
../src/node.cc:3654:8: warning: unused variable 'use_openssl_ca'
[-Wunused-variable]
  bool use_openssl_ca = false;
       ^

I missed this when working on
commit 8a7db9d ("src: add
--use-bundled-ca --use-openssl-ca check").

Refs: nodejs/node#12087
PR-URL: nodejs/node#12302
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@danbev
src: make AtExit callback's per Environment
ec53921 
This commit attempts to address one of the TODOs in
nodejs/node#4641 regarding making the
AtExit callback's per environment, instead of the current global.

bnoordhuis provided a few options for solving this, and one was to
use a thread-local which is what this commit attempts to do.

PR-URL: nodejs/node#9163
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
@TimothyGu
src: allow ArrayBufferView as instance of Buffer
faa447b 
PR-URL: nodejs/node#12223
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@TimothyGu
test: add common.getArrayBufferViews(buf)
0c539fa 
PR-URL: nodejs/node#12223
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@TimothyGu
crypto: support all ArrayBufferView types
a8f460f 
PR-URL: nodejs/node#12223
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@TimothyGu
zlib: support all ArrayBufferView types
2ced07c 
PR-URL: nodejs/node#12223
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
TimothyGu and others added 20 commits April 24, 2017 16:42
@TimothyGu
url: use internal/util's getConstructorOf
061c5da 
PR-URL: nodejs/node#12526
Reviewed-By: James M Snell <jasnell@gmail.com>
@iarna @Fishrock123
deps: upgrade npm to 4.5.0
0084260 
PR-URL: nodejs/node#12480
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
@cjihrig
tools: enable no-useless-return eslint rule
7a4d383 
PR-URL: nodejs/node#12577
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@aashil @jasnell
meta: update authors list
9d3c06c 
PR-URL: nodejs/node#11533
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@cjihrig
src: expose V8's IsNativeError() in util bindings
e522bcd 
Refs: nodejs/node#12400
PR-URL: nodejs/node#12546
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@sam-github
src: allow CLI args in env with NODE_OPTIONS
f2282bb 
Not all CLI options are supported, those that are problematic from a
security or implementation point of view are disallowed, as are ones
that are inappropriate (for example, -e, -p, --i), or that only make
sense when changed with code changes (such as options that change the
javascript syntax or add new APIs).

PR-URL: nodejs/node#12028
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Bradley Farias <bradley.meck@gmail.com>
@addaleax
n-api: tighten null-checking and clean up last error
ba7bac5 
We left out null-checks for many of the parameters passed to our APIs.
In particular, arguments of type `napi_value` were often accepted
without a null-check, even though they should never be null.

Additionally, many APIs simply returned `napi_ok` on success. This
leaves in place an error that may have occurred in a previous N-API
call. Others (those which perform `NAPI_PREAMBLE(env)` at the top)
OTOH explicitly clear the last error before proceeding. With this
modification all APIs explicitly clear the last error on success.

Fixes: nodejs/abi-stable-node#227
PR-URL: nodejs/node#12539
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@cjihrig
src: remove invalid comment
a334c5b 
PR-URL: nodejs/node#12645
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
@vsemozhetbyt
doc: fix an unclear wording in readline.md
2098775 
PR-URL: nodejs/node#12605
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@vsemozhetbyt
tools: use no-useless-concat ESLint rule
71abfa9 
* Add `no-useless-concat: error` to .eslintrc.yaml.
* Apply no-useless-concat rule to tests.

PR-URL: nodejs/node#12613
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
@vsemozhetbyt
doc, tools: add doc linting to CI
42dca99 
PR-URL: nodejs/node#12640
Fixes: nodejs/node#12635
Refs: nodejs/node#12563
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@jasongin @addaleax
n-api: Enable scope and ref APIs during exception
b7a341d 
N-API is somewhat strict about blocking calls to many APIs while there
is a pending exception. The NAPI_PREAMBLE macro at the beginning of
many API implementations checks for a pending exception. However, a
subset of the APIs (which don't call back into JavaScript) still need
to work while in a pending-exception state. This changes the reference
APIs (equivalent to v8::Persistent) and handle scope APIs so that they
can be used for cleanup up while an exception is pending.

We may decide to similarly enable a few other APIs later, (which would
be a non-breaking change) but we know at least these are needed now
to unblock some specific scenarios.

Fixes: nodejs/abi-stable-node#122
Fixes: nodejs/abi-stable-node#228
PR-URL: nodejs/node#12524
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Gabriel Schulhof <gabriel.schulhof@intel.com>
@TimothyGu
url: port WHATWG URL API to internal/errors
d457a98 
Also slightly revises grammar.

PR-URL: nodejs/node#12574
Refs: nodejs/node#11273
Refs: nodejs/node#11299
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
@ChatbotSchool @Trott
test: add mustCall in test-timers-clearImmediate
c405497 
PR-URL: nodejs/node#12598
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@RobotMermaid @Trott
test: cleanup test-fs-watch.js
b65d5e4 
Reversed "actual" and "expected" arguments for assert.strictEqual().

Replaced constructor with regular expression for assert.throws().

PR-URL: nodejs/node#12595
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Bryan English <bryan@bryanenglish.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@Trott
test: improved type checking with regex
e8004db 
Replaced TypeError with a regular expression of the actual error.

PR-URL: nodejs/node#12591
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@QueueHefner @Trott
test: improve test-process-kill-pid
60db588 
PR-URL: nodejs/node#12588
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@targos
test: support unreleased V8 versions
d1d9ecf 
Change the RegExp in test-process-versions so that the test can pass
with V8 versions that have no patch number.

PR-URL: nodejs/node#12619
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@targos
test: make tests pass when built without inspector
c8c5a52 
PR-URL: nodejs/node#12622
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@Fishrock123
deps: remove **/node_modules/form-data/README.md
e8f3163 
Having multiple files with the same name but different casings causes
problems on lots of OS-s.

Refs: nodejs/node#12624
Refs: nodejs/node#11085
Refs: nodejs/node#11020

PR-URL: nodejs/node#12643
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
@kunalspathak
Copy link
Member Author

kunalspathak commented May 4, 2017 •
edited
Loading

cc: @nodejs/node-chakracore

CI : https://ci.nodejs.org/view/All/job/chakracore-test-pull-request/14/

@jasongin
Copy link
Member

jasongin commented May 4, 2017

Merge nodejs/master to xplat

Is this merging from the master branch or v8.x branch of nodejs/node?

@kunalspathak
Copy link
Member Author

@jasongin - From master branch of nodejs/node and that's why is targeted for xplat.

kfarnung
kfarnung approved these changes May 4, 2017
View reviewed changes
Copy link
Contributor

@kfarnung kfarnung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kunalspathak
Merge nodejs/master into xplat
c577509 
Merge e8f3163 as of 2017-04-25

PR-URL: nodejs#236
Reviewed-By: Kyle Farnung <Kyle.Farnung@microsoft.com>
@kunalspathak
test: fixed unit test and jslint issues
9a7af26 
Fixed some unit test and marked some to FLAKY.

Test cases in `test_environment.cc` from cctest are failing because
node-chakracore requires the context to be created before `IsolateData`
is created. But in test case in `Env` ctor `IsolateData` is getting
created first.

PR-URL: nodejs#236
Reviewed-By: Kyle Farnung <Kyle.Farnung@microsoft.com>
@kunalspathak kunalspathak merged commit 9a7af26 into nodejs:xplat May 5, 2017
@kunalspathak kunalspathak deleted the FI branch May 5, 2017 00:22
@kunalspathak kunalspathak mentioned this pull request May 10, 2017
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@kfarnung kfarnung kfarnung approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.