build: fix cctest compilation #16887
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
the
build
|
Hopefully fixed windows: https://ci.nodejs.org/job/node-test-pull-request/11315/ |
danbev
force-pushed
the
fix_cctest_sources_compilation
branch
from
136a0d1
to
34e96af
Compare
bnoordhuis
approved these changes
Nov 9, 2017
doc/guides/writing-tests.md
Outdated
| @@ -325,6 +325,11 @@ Next add the test to the `sources` in the `cctest` target in node.gyp: | |||
| ... | |||
| ], | |||
| ``` | |||
| Note that the only sources that should be included in the cctest are actual | |||
There was a problem hiding this comment.
Yeah, that should be cctest target, I'll update this.
node.gyp
Outdated
| # For tests | ||
| './deps/openssl/openssl.gyp:openssl-cli', | ||
| ], | ||
| # Do not let unused OpenSSL symbols to slip away |
There was a problem hiding this comment.
Since you're here: s/to slip/slip/ - although this comment could be removed since it's superfluous: it just says what the lines below do, not why.
There was a problem hiding this comment.
I'll remove the comment then if that is alright. Thanks
danbev
force-pushed
the
fix_cctest_sources_compilation
branch
from
b48a9e2
to
a3e4332
Compare
danbev
force-pushed
the
fix_cctest_sources_compilation
branch
from
a3e4332
to
2e9391a
Compare
Currently the cctest target compiles sources files even though they are compiled for the node target. This is my fault as when I worked on the task of getting the cctest to use the object files from the node target I missed a few sources that were being included from node.gypi. This also effects the build time as these sources are compiled twice. This commit moves the conditions in question into the node target in node.gyp. With this commit there should be no object files in out/Release/obj.target/cctest/src/ (the path will vary depending on the operating system being used).
danbev
added a commit
that referenced
this pull request
Nov 13, 2017
Currently the cctest target compiles sources files even though they are compiled for the node target. This is my fault as when I worked on the task of getting the cctest to use the object files from the node target I missed a few sources that were being included from node.gypi. This also effects the build time as these sources are compiled twice. This commit moves the conditions in question into the node target in node.gyp. With this commit there should be no object files in out/Release/obj.target/cctest/src/ (the path will vary depending on the operating system being used). PR-URL:#16887 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
|
Landed in f5809d8 |
evanlucas
pushed a commit
that referenced
this pull request
Nov 13, 2017
Currently the cctest target compiles sources files even though they are compiled for the node target. This is my fault as when I worked on the task of getting the cctest to use the object files from the node target I missed a few sources that were being included from node.gypi. This also effects the build time as these sources are compiled twice. This commit moves the conditions in question into the node target in node.gyp. With this commit there should be no object files in out/Release/obj.target/cctest/src/ (the path will vary depending on the operating system being used). PR-URL:#16887 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Merged
|
Should this be backported to |
danbev
added a commit
to danbev/node
that referenced
this pull request
Nov 21, 2017
Currently the cctest target compiles sources files even though they are compiled for the node target. This is my fault as when I worked on the task of getting the cctest to use the object files from the node target I missed a few sources that were being included from node.gypi. This also effects the build time as these sources are compiled twice. This commit moves the conditions in question into the node target in node.gyp. With this commit there should be no object files in out/Release/obj.target/cctest/src/ (the path will vary depending on the operating system being used). Refs: nodejs#16887 PR-URL:nodejs#16887 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
2 tasks
gibfahn
pushed a commit
that referenced
this pull request
Dec 19, 2017
Currently the cctest target compiles sources files even though they are compiled for the node target. This is my fault as when I worked on the task of getting the cctest to use the object files from the node target I missed a few sources that were being included from node.gypi. This also effects the build time as these sources are compiled twice. This commit moves the conditions in question into the node target in node.gyp. With this commit there should be no object files in out/Release/obj.target/cctest/src/ (the path will vary depending on the operating system being used). Refs: #16887 PR-URL: #16887 Backport-PR-URL: #17174 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Closed
gibfahn
pushed a commit
that referenced
this pull request
Dec 20, 2017
Currently the cctest target compiles sources files even though they are compiled for the node target. This is my fault as when I worked on the task of getting the cctest to use the object files from the node target I missed a few sources that were being included from node.gypi. This also effects the build time as these sources are compiled twice. This commit moves the conditions in question into the node target in node.gyp. With this commit there should be no object files in out/Release/obj.target/cctest/src/ (the path will vary depending on the operating system being used). Refs: #16887 PR-URL: #16887 Backport-PR-URL: #17174 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the cctest target compiles sources files even though they are
compiled for the node target. This is my fault as when I worked on the
task of getting the cctest to use the object files from the node target
I missed a few sources that were being included from node.gypi. This
also effects the build time as these sources are compiled twice.
This commit moves the conditions in question into the node target in
node.gyp. With this commit there should be no object files in
out/Release/obj.target/cctest/src/ (the path will vary depending on the
operating system being used).
cc @nodejs/build
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
build, doc