Skip to content

build: ignore empty folders in test-addons-napi#16380

Closed
addaleax wants to merge 1 commit intonodejs:masterfrom
addaleax:ignore-addons-napi
Closed

build: ignore empty folders in test-addons-napi#16380
addaleax wants to merge 1 commit intonodejs:masterfrom
addaleax:ignore-addons-napi

Conversation

@addaleax
Copy link
Member

@addaleax addaleax commented Oct 22, 2017

The same as #16031 except for N-API addons.

Fixes: #13521

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

build

@addaleax addaleax added addons Issues and PRs related to native addons. build Issues and PRs related to build files or the CI. node-api Issues and PRs related to the Node-API. test Issues and PRs related to the tests. labels Oct 22, 2017
@nodejs-github-bot nodejs-github-bot added the build Issues and PRs related to build files or the CI. label Oct 22, 2017
hiroppy
hiroppy approved these changes Oct 22, 2017
View reviewed changes
Copy link
Member

@hiroppy hiroppy left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I had the same issue. I confirmed the PR locally, the test passed! Thank you @addaleax

gibfahn
gibfahn approved these changes Oct 22, 2017
View reviewed changes
Copy link
Member

@gibfahn gibfahn left a comment

Choose a reason for hiding this comment

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

LGTM with suggestion

Makefile
# (https://github.com/nodejs/node/issues/14843)
@for dirname in test/addons-napi/*/; do \
if [ ! -f "$$PWD/$${dirname}binding.gyp" ]; then \
continue; fi ; \
Copy link
Member

@gibfahn gibfahn Oct 22, 2017

Choose a reason for hiding this comment

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

Suggestion: it might be cleaner if you change

	if [ ! -f "$$PWD/$${dirname}binding.gyp" ]; then \
			continue; fi ; \

to

[ ! -f "$$PWD/$${dirname}binding.gyp" ] && continue ; \

Maybe it's just me that find that cleaner though.

Copy link
Member Author

@addaleax addaleax Oct 22, 2017

Choose a reason for hiding this comment

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

I think moving control flow into logical expressions is … hm. 😄

Copy link
Member

@gibfahn gibfahn Oct 22, 2017

Choose a reason for hiding this comment

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

It just wasn't immediately obvious where the end of the if block was, because the fi isn't on its own line.

As this already squashes things down, you could go further and do:

		if [ ! -f "$$PWD/$${dirname}binding.gyp" ]; then continue; fi ; \

I think moving control flow into logical expressions is … hm. 😄

Unrelated to this PR, but I'd be interested to know what the objection is, I've heard a lot of people say this, but for me [ x ] && y is just a cleaner way of saying if [ x ]; then y; fi (for simple ys). Obviously in a language with nicer ifs, then there's not much gain (e.g. for rust if x { y }), but in bash it seems more worthwhile.

Copy link
Member Author

@addaleax addaleax Oct 22, 2017

Choose a reason for hiding this comment

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

@gibfahn I really like [ x ] && y too, but for other things – shell scripts are exceptional in that you can actually make control flow part of the expression, and that just feels pretty odd to me I guess?

@gireeshpunathil
Copy link
Member

gireeshpunathil commented Oct 23, 2017

CI: https://ci.nodejs.org/job/node-test-pull-request/10914/

mhdawson
mhdawson approved these changes Oct 24, 2017
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@tniessen
Copy link
Member

tniessen commented Oct 29, 2017

Landed in 65d2067, thanks Anna!

@tniessen tniessen closed this Oct 29, 2017
tniessen pushed a commit that referenced this pull request Oct 29, 2017
@addaleax @tniessen
build: ignore empty folders in test-addons-napi
65d2067 
The same as #16031 except
for N-API addons.

PR-URL: #16380
Fixes: #13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@jasnell jasnell mentioned this pull request Oct 30, 2017
Merged
gibfahn pushed a commit that referenced this pull request Oct 30, 2017
@addaleax @gibfahn
build: ignore empty folders in test-addons-napi
293fe0e 
The same as #16031 except
for N-API addons.

PR-URL: #16380
Fixes: #13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
gibfahn pushed a commit that referenced this pull request Oct 30, 2017
@addaleax @gibfahn
build: ignore empty folders in test-addons-napi
d9cc8ee 
The same as #16031 except
for N-API addons.

PR-URL: #16380
Fixes: #13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
gibfahn pushed a commit that referenced this pull request Oct 31, 2017
@addaleax @gibfahn
build: ignore empty folders in test-addons-napi
528edb2 
The same as #16031 except
for N-API addons.

PR-URL: #16380
Fixes: #13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@gibfahn gibfahn mentioned this pull request Oct 31, 2017
Merged
Qard pushed a commit to ayojs/ayo that referenced this pull request Nov 2, 2017
@addaleax @Qard
build: ignore empty folders in test-addons-napi
1dd85ce 
The same as nodejs/node#16031 except
for N-API addons.

PR-URL: nodejs/node#16380
Fixes: nodejs/node#13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Qard pushed a commit to ayojs/ayo that referenced this pull request Nov 2, 2017
@addaleax @Qard
build: ignore empty folders in test-addons-napi
55b5bd3 
The same as nodejs/node#16031 except
for N-API addons.

PR-URL: nodejs/node#16380
Fixes: nodejs/node#13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
addaleax added a commit to ayojs/ayo that referenced this pull request Dec 7, 2017
@addaleax
build: ignore empty folders in test-addons-napi
23e3591 
The same as nodejs/node#16031 except
for N-API addons.

PR-URL: nodejs/node#16380
Fixes: nodejs/node#13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasnell jasnell jasnell approved these changes

@cjihrig cjihrig cjihrig approved these changes

@gireeshpunathil gireeshpunathil gireeshpunathil approved these changes

@mhdawson mhdawson mhdawson approved these changes

+3 more reviewers

@gibfahn gibfahn gibfahn approved these changes

@danbev danbev danbev approved these changes

@hiroppy hiroppy hiroppy approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

addons Issues and PRs related to native addons. build Issues and PRs related to build files or the CI. node-api Issues and PRs related to the Node-API. test Issues and PRs related to the tests.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

test: n-api/addons test change issues