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

Commit 40aeb28

Browse files
committed
Merge nodejs/master
Merge 3c0ebf5 as of 2017-10-19. This is an automatically created merge. For any problems please contact @kunalspathak.
2 parents 9738df7 + 3c0ebf5 commit 40aeb28

File tree

2,084 files changed

+71635
-125231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,084 files changed

+71635
-125231
lines changed

.eslintrc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ overrides:
1818
rules:
1919
# Possible Errors
2020
# http://eslint.org/docs/rules/#possible-errors
21+
for-direction: error
2122
no-control-regex: error
2223
no-debugger: error
2324
no-dupe-args: error
@@ -41,6 +42,7 @@ rules:
4142

4243
# Best Practices
4344
# http://eslint.org/docs/rules/#best-practices
45+
accessor-pairs: error
4446
dot-location: [error, property]
4547
eqeqeq: [error, smart]
4648
no-fallthrough: error
@@ -122,6 +124,7 @@ rules:
122124
ignoreUrls: true,
123125
tabWidth: 2}]
124126
new-parens: error
127+
no-lonely-if: error
125128
no-mixed-spaces-and-tabs: error
126129
no-multiple-empty-lines: [error, {max: 2, maxEOF: 0, maxBOF: 0}]
127130
no-restricted-syntax: [error, {
@@ -172,6 +175,7 @@ rules:
172175
no-this-before-super: error
173176
prefer-const: [error, {ignoreReadBeforeAssign: true}]
174177
rest-spread-spacing: error
178+
symbol-description: error
175179
template-curly-spacing: error
176180

177181
# Custom rules in tools/eslint-rules

Makefile

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
1313
COVTESTS ?= test-cov
1414
GTEST_FILTER ?= "*"
1515
GNUMAKEFLAGS += --no-print-directory
16+
GCOV ?= gcov
1617

1718
ifdef JOBS
1819
PARALLEL_ARGS = -j $(JOBS)
@@ -34,6 +35,10 @@ ifdef DISABLE_V8_I18N
3435
V8_BUILD_OPTIONS += i18nsupport=off
3536
endif
3637

38+
ifeq ($(OSTYPE), darwin)
39+
GCOV = xcrun llvm-cov gcov
40+
endif
41+
3742
BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[A-Z]' '[a-z]')
3843

3944
# Determine EXEEXT
@@ -124,10 +129,12 @@ coverage-clean:
124129
$(RM) -r gcovr testing
125130
$(RM) -r out/$(BUILDTYPE)/.coverage
126131
$(RM) -r .cov_tmp coverage
127-
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
132+
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcda
128133
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
129-
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcno
130-
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing*.gcno
134+
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcno
135+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcno
136+
$(RM) out/$(BUILDTYPE)/obj.target/cctest/src/*.gcno
137+
$(RM) out/$(BUILDTYPE)/obj.target/cctest/test/cctest/*.gcno
131138

132139
# Build and test with code coverage reporting. Leave the lib directory
133140
# instrumented for any additional runs the user may want to make.
@@ -157,7 +164,7 @@ coverage-build: all
157164
coverage-test: coverage-build
158165
$(RM) -r out/$(BUILDTYPE)/.coverage
159166
$(RM) -r .cov_tmp
160-
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
167+
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcda
161168
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
162169
-$(MAKE) $(COVTESTS)
163170
mv lib lib__
@@ -170,7 +177,8 @@ coverage-test: coverage-build
170177
--report-dir "../coverage")
171178
-(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
172179
--gcov-exclude='.*usr' -v -r Release/obj.target/node \
173-
--html --html-detail -o ../coverage/cxxcoverage.html)
180+
--html --html-detail -o ../coverage/cxxcoverage.html \
181+
--gcov-executable="$(GCOV)")
174182
mv lib lib_
175183
mv lib__ lib
176184
@echo -n "Javascript coverage %: "
@@ -200,13 +208,13 @@ else
200208
test: all
201209
$(MAKE) build-addons
202210
$(MAKE) build-addons-napi
203-
$(MAKE) doc
211+
$(MAKE) doc-only
204212
$(MAKE) cctest
205213
$(PYTHON) tools/test.py --mode=release --flaky-tests=$(FLAKY_TESTS) -J \
206214
$(CI_ASYNC_HOOKS) \
207215
$(CI_JS_SUITES) \
208216
$(CI_NATIVE_SUITES) \
209-
known_issues
217+
doctool known_issues
210218
$(MAKE) lint
211219
endif
212220

@@ -380,11 +388,11 @@ test-ci-js: | clear-stalled
380388
fi
381389

382390
test-ci: LOGLEVEL := info
383-
test-ci: | clear-stalled build-addons build-addons-napi doc
391+
test-ci: | clear-stalled build-addons build-addons-napi doc-only
384392
out/Release/cctest --gtest_output=tap:cctest.tap
385393
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
386394
--mode=release --flaky-tests=$(FLAKY_TESTS) \
387-
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) known_issues
395+
$(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) doctool known_issues
388396
# Clean up any leftover processes, error if found.
389397
ps awwx | grep Release/node | grep -v grep | cat
390398
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
@@ -424,7 +432,7 @@ test-known-issues: all
424432
$(PYTHON) tools/test.py known_issues
425433

426434
test-npm: $(NODE_EXE)
427-
NODE=$(NODE) tools/test-npm.sh
435+
$(NODE) tools/test-npm-package --install --logfile=test-npm.tap deps/npm test-node
428436

429437
test-npm-publish: $(NODE_EXE)
430438
npm_package_config_publishtest=true $(NODE) deps/npm/test/run.js

common.gypi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Reset this number to 0 on major V8 upgrades.
3131
# Increment by one for each non-official patch applied to deps/v8.
32-
'v8_embedder_string': '-node.0',
32+
'v8_embedder_string': '-node.3',
3333

3434
# Enable disassembler for `--print-code` v8 options
3535
'v8_enable_disassembler': 1,
@@ -162,6 +162,9 @@
162162
'MinimalRebuild': 'false',
163163
'OmitFramePointers': 'false',
164164
'BasicRuntimeChecks': 3, # /RTC1
165+
'AdditionalOptions': [
166+
'/bigobj', # prevent error C1128 in VS2015
167+
],
165168
},
166169
'VCLinkerTool': {
167170
'LinkIncremental': 2, # enable incremental linking

deps/chakrashim/include/v8-version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
// NOTE these macros are used by some of the tool scripts and the build
1010
// system so their names cannot be changed without changing the scripts.
1111
#define V8_MAJOR_VERSION 6
12-
#define V8_MINOR_VERSION 1
13-
#define V8_BUILD_NUMBER 534
14-
#define V8_PATCH_LEVEL 42
12+
#define V8_MINOR_VERSION 2
13+
#define V8_BUILD_NUMBER 414
14+
#define V8_PATCH_LEVEL 32
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true

deps/v8/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
.project
3333
.pydevproject
3434
.settings
35+
.vscode
3536
/_*
3637
/build
3738
/buildtools

deps/v8/AUTHORS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Amazon, Inc <*@amazon.com>
2828
ST Microelectronics <*@st.com>
2929
Yandex LLC <*@yandex-team.ru>
3030
StrongLoop, Inc. <*@strongloop.com>
31+
Facebook, Inc. <*@fb.com>
32+
Facebook, Inc. <*@oculus.com>
3133

3234
Aaron Bieber <deftly@gmail.com>
3335
Abdulla Kamar <abdulla.kamar@gmail.com>
@@ -88,6 +90,7 @@ Luis Reis <luis.m.reis@gmail.com>
8890
Luke Zarko <lukezarko@gmail.com>
8991
Maciej Małecki <me@mmalecki.com>
9092
Marcin Cieślak <saper@marcincieslak.com>
93+
Mateusz Czeladka <mateusz.szczap@gmail.com>
9194
Mathias Bynens <mathias@qiwi.be>
9295
Matt Hanselman <mjhanselman@gmail.com>
9396
Matthew Sporleder <msporleder@gmail.com>
@@ -100,12 +103,14 @@ Mike Pennisi <mike@mikepennisi.com>
100103
Milton Chiang <milton.chiang@mediatek.com>
101104
Myeong-bo Shim <m0609.shim@samsung.com>
102105
Nicolas Antonius Ernst Leopold Maria Kaiser <nikai@nikai.net>
106+
Niklas Hambüchen <mail@nh2.me>
103107
Noj Vek <nojvek@gmail.com>
104108
Oleksandr Chekhovskyi <oleksandr.chekhovskyi@gmail.com>
105109
Paolo Giarrusso <p.giarrusso@gmail.com>
106110
Patrick Gansterer <paroga@paroga.com>
107111
Peter Rybin <peter.rybin@gmail.com>
108112
Peter Varga <pvarga@inf.u-szeged.hu>
113+
Peter Wong <peter.wm.wong@gmail.com>
109114
Paul Lind <plind44@gmail.com>
110115
Qiuyi Zhang <qiuyi.zqy@alibaba-inc.com>
111116
Rafal Krypa <rafal@krypa.net>
@@ -130,4 +135,4 @@ Wiktor Garbacz <wiktor.garbacz@gmail.com>
130135
Yu Yin <xwafish@gmail.com>
131136
Zac Hansen <xaxxon@gmail.com>
132137
Zhongping Wang <kewpie.w.zp@gmail.com>
133-
柳荣一 <admin@web-tinker.com>
138+
柳荣一 <admin@web-tinker.com>

0 commit comments

Comments
 (0)