Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: don't assume broadcast traffic is unfiltered #220

Closed
wants to merge 23 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4dc660e
build: do not generate support for libuv's probes
Dec 3, 2014
20a7088
deps: update libuv to 1.0.2
saghul Dec 9, 2014
8708c7a
test: mark more tests as flaky
orangemocha Dec 10, 2014
946cec7
lib,src: fix spawnSync ignoring its 'env' option
juamedgod Oct 14, 2014
4bba870
test: add test for spawnSync() env option
cjihrig Dec 9, 2014
5b9e5bd
doc: clarify create{Read,Write}Stream fd option
benjamincburns Jul 26, 2014
6f6a979
zlib: support concatenated gzip files
eendeego Sep 9, 2014
e93ff4f
debugger: fix unhandled error in setBreakpoint
bajtos Nov 4, 2013
93533e9
src: fix windows build error
bnoordhuis Nov 11, 2014
9158666
stream: switch _writableState.buffer to queue
chrisdickinson Dec 4, 2014
890baa0
doc: add details for http res/req end callback
JacksonTian Dec 10, 2014
6a03fce
url: improve parsing speed
CGavrila Oct 28, 2014
d8586ea
lib: introduce process module
Dec 30, 2014
8b04161
doc: util: document --trace-deprecation
bnoordhuis Dec 21, 2014
d5c7a97
doc: added TC meeting minutes 2014-12-17
rvagg Dec 17, 2014
a308395
build: i18n: add icu config options
srl295 Nov 13, 2014
261706e
doc: added TC meeting minutes 2014-12-30
rvagg Jan 2, 2015
8cfbeed
docs: update to authors file
srl295 Jan 3, 2015
b636ba8
net: make connect() input validation synchronous
cjihrig Jan 3, 2015
372a2f5
smalloc: fix bad assert for zero length data
trevnorris Jan 5, 2015
94e1475
Merge remote-tracking branch 'joyent/v0.12' into v1.x
bnoordhuis Jan 5, 2015
eaed2a1
deps: update libuv to 1.2.0
bnoordhuis Jan 5, 2015
52e600a
test: don't assume broadcast traffic is unfiltered
bnoordhuis Dec 29, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
build: do not generate support for libuv's probes
Dtrace probes were removed from libuv recently, but their usage by node
was not completely removed, causing build breaks on SmartOS.

Even though the build is working on other platforms, these probes are
not fired by libuv anymore, so there's no point in using them on these
platforms too.

Reviewed-by: Trevor Norris <trev.norris@gmail.com>
  • Loading branch information
Julien Gilli committed Dec 9, 2014
commit 4dc660e164417e0a1bc86eadd825b41d7abb053f
19 changes: 3 additions & 16 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,7 @@
'conditions': [
[ 'OS=="linux"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
'<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o',
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
],
}],
[ 'OS!="mac" and OS!="linux"', {
Expand Down Expand Up @@ -510,15 +509,13 @@
{
'action_name': 'node_dtrace_provider_o',
'inputs': [
'<(OBJ_DIR)/libuv/deps/uv/src/unix/core.o',
'<(OBJ_DIR)/node/src/node_dtrace.o',
],
'outputs': [
'<(OBJ_DIR)/node/src/node_dtrace_provider.o'
],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
'-s', 'deps/uv/src/unix/uv-dtrace.d', '<@(_inputs)',
'-o', '<@(_outputs)' ]
'<@(_inputs)', '-o', '<@(_outputs)' ]
}
]
}],
Expand All @@ -533,17 +530,7 @@
'action': [
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
],
},
{
'action_name': 'libuv_dtrace_provider_o',
'inputs': [ 'deps/uv/src/unix/uv-dtrace.d' ],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o'
],
'action': [
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
],
},
}
],
}],
]
Expand Down