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

build: add config.gypi to test/addons/.buildstamp #8905

Closed
wants to merge 1 commit into from

Conversation

danbev
Copy link
Contributor

@danbev danbev commented Oct 3, 2016

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

build

Description of change

This motivation for this commit is to enable a reconfiguration of the
build type (Debug/Release) to be reflected by the addons tests.

Currently, when using configure --debug, and then running the tests, the
addons build configurations (build/config.gypi) will not be updated.
Adding config.gypi to the test/addons/.buildstamp target's
prerequisites will cause the addons configurations to be updated when
config.gypi has been updated.

Also, build-addons has been added as a prerequisite to the test target
to have the addons rebuilt if the build type configuration has changed.

This is a backport of #7893.

@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. v4.x labels Oct 3, 2016
@danbev
Copy link
Contributor Author

danbev commented Oct 3, 2016

Copy link
Member

@addaleax addaleax left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -111,7 +111,7 @@ v8:
tools/make-v8.sh v8
$(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)

test: | cctest # Depends on 'all'.
test: | build-addons cctest # Depends on 'all'.
Copy link
Member

Choose a reason for hiding this comment

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

The test target doesn't actually test addons, so the addons don't need to be built?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah sorry about that. I was comparing this with the Makefile in master and incorrectly added this to the test target. It looks like the correct way to run the addons test is using make test-addons. I'll remove build-addons from the test target and check that this works with the test-addons target. Thanks!

Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

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

LGTM but any reason we don't run add-on tests as part of make test in v4.x?

@MylesBorins
Copy link
Contributor

@bnoordhuis I don't believe we backported it, woud you like to?

@MylesBorins
Copy link
Contributor

@danbev can you squash these commits and add the original meta data please

Currently the build-addons target is called as part of the
test target, and it has test/addons/.buildstamp as a dependency.
When running ./configure --debug and later switching/
updating branches you can be in a situation where the config.gypi
files in the addons build directories are using an incorrect
value for default_configuration. Currently this can happen and you
will get test errors as there are a few test that depend on the
value of default_configuration to be Release.

Ben Noordhuis provided the solution for this by adding a dependency to
config.gypi, which is generated when running ./configure, and will
correct this situation.

This commit is related to nodejs#7860. Please see the dicussion in that
issue regarding the test using hard-coded paths.

Ref: nodejs#7893
@danbev danbev force-pushed the add-config.gypi-to-addons branch from 9b551f4 to a531581 Compare October 6, 2016 14:14
@danbev
Copy link
Contributor Author

danbev commented Oct 6, 2016

@danbev can you squash these commits and add the original meta data please

I've updated this PR now and used the original meta data with an additional Ref to the PR against master. Let me know if there is anything else missing. Thanks

Copy link
Member

@jasnell jasnell left a comment

Choose a reason for hiding this comment

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

LGTM

MylesBorins pushed a commit that referenced this pull request Oct 7, 2016
Currently the build-addons target is called as part of the
test target, and it has test/addons/.buildstamp as a dependency.
When running ./configure --debug and later switching/
updating branches you can be in a situation where the config.gypi
files in the addons build directories are using an incorrect
value for default_configuration. Currently this can happen and you
will get test errors as there are a few test that depend on the
value of default_configuration to be Release.

Ben Noordhuis provided the solution for this by adding a dependency to
config.gypi, which is generated when running ./configure, and will
correct this situation.

This commit is related to #7860. Please see the dicussion in that
issue regarding the test using hard-coded paths.

Ref: #8905
PR-URL: #7893
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@MylesBorins
Copy link
Contributor

landed in 49c8ecf

@danbev please take a look at the meta data in the landed commit. Generally we keep all the original sign off / PR-URL data from the original commit and add the new PR as a ref.

Thanks for taking the time to do this backport!

@MylesBorins MylesBorins closed this Oct 7, 2016
@danbev
Copy link
Contributor Author

danbev commented Oct 8, 2016

Generally we keep all the original sign off / PR-URL data from the original commit and add the new PR as a ref.

Ah got it now, will keep that in mind for next time. Thanks!

MylesBorins pushed a commit that referenced this pull request Oct 10, 2016
Currently the build-addons target is called as part of the
test target, and it has test/addons/.buildstamp as a dependency.
When running ./configure --debug and later switching/
updating branches you can be in a situation where the config.gypi
files in the addons build directories are using an incorrect
value for default_configuration. Currently this can happen and you
will get test errors as there are a few test that depend on the
value of default_configuration to be Release.

Ben Noordhuis provided the solution for this by adding a dependency to
config.gypi, which is generated when running ./configure, and will
correct this situation.

This commit is related to #7860. Please see the dicussion in that
issue regarding the test using hard-coded paths.

Ref: #8905
PR-URL: #7893
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
rvagg pushed a commit that referenced this pull request Oct 18, 2016
Currently the build-addons target is called as part of the
test target, and it has test/addons/.buildstamp as a dependency.
When running ./configure --debug and later switching/
updating branches you can be in a situation where the config.gypi
files in the addons build directories are using an incorrect
value for default_configuration. Currently this can happen and you
will get test errors as there are a few test that depend on the
value of default_configuration to be Release.

Ben Noordhuis provided the solution for this by adding a dependency to
config.gypi, which is generated when running ./configure, and will
correct this situation.

This commit is related to #7860. Please see the dicussion in that
issue regarding the test using hard-coded paths.

Ref: #8905
PR-URL: #7893
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
MylesBorins pushed a commit that referenced this pull request Oct 26, 2016
Currently the build-addons target is called as part of the
test target, and it has test/addons/.buildstamp as a dependency.
When running ./configure --debug and later switching/
updating branches you can be in a situation where the config.gypi
files in the addons build directories are using an incorrect
value for default_configuration. Currently this can happen and you
will get test errors as there are a few test that depend on the
value of default_configuration to be Release.

Ben Noordhuis provided the solution for this by adding a dependency to
config.gypi, which is generated when running ./configure, and will
correct this situation.

This commit is related to #7860. Please see the dicussion in that
issue regarding the test using hard-coded paths.

Ref: #8905
PR-URL: #7893
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants