-
Notifications
You must be signed in to change notification settings - Fork 30.1k
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
benchmark: build the misc/function_call addon #16934
Conversation
vcbuild.bat
Outdated
@@ -416,6 +416,7 @@ for /d %%F in (test\addons\*) do ( | |||
--nodedir="%cd%" | |||
if !errorlevel! neq 0 exit /b !errorlevel! | |||
) | |||
%node_gyp_exe% rebuild --directory="%~dp0benchmark\misc\function_call" --nodedir="%~dp0." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why, but the call above (L416) uses --nodedir="%cd%"
, so I'd rather we keep this consistent.
IMHO simplest solution is to add benchmark\misc\function_call
to L413:
for /d %%F in (test\addons\* benchmark\misc\function_call) do (
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM but I would prefer @refack's suggestion.
e169fbb
to
f7227de
Compare
Amended to use the suggestion in #16934 (comment) New CI: https://ci.nodejs.org/job/node-test-pull-request/11353/ |
Forgot the cross-compilation on arms so the tests failed there. Updated, but probably will need to wait for them to get back before starting another CI.. |
Wait...all the |
It should be possible to run the benchmark suite without running |
@AndreasMadsen So IIUC, it is safe to remove those targets and make |
Yes. But we might have to update the CI benchmarker script. |
@AndreasMadsen OK thanks, I will take a look in the benchmark CI script. |
@refack Thanks, looks like it does not even use the |
I'm +1 for GC on Makefile (as I commented, it is IMHO too complex) |
@joyeecheung Yep, the benchmarking jobs just do a normal make, so as long as that doesn't disappear, we'll be fine :) |
@gareth-ellis But I suppose we should run |
@refack @jasnell @richardlau Can you take a look again? Thanks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
still lgtm
CI failed due to the makefile regression. Trying again: https://ci.nodejs.org/job/node-test-pull-request/11492/ |
@joyeecheung This would need a rebase :) |
- Build the addon required by benchmark/misc/function_call - Throw errors in the addon if the binding could not be loaded
8b86f94
to
71cde66
Compare
Fails on arm & shared-lib-debug:
|
@@ -386,7 +387,8 @@ CI_DOC := doctool | |||
|
|||
# Build and test addons without building anything else | |||
test-ci-native: LOGLEVEL := info | |||
test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp | |||
test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp \ | |||
benchmark/misc/function_call/build/Release/binding.node |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably needs to be added to test-ci-js
since the benchmark is tested from JS. I'd suggest adding a comment since this dependency is not intuitive.
IMHO we should consider a different approach, since this is getting a bit convoluted (test => benchmark => native-addon => node-gyp => node binary).
|
@refack Yes that seems to be a better idea, I'll try running node-gyp from the test. Although I think it should not silently fail when there is |
Couldn't get gyp running from a Node.js script with the proper |
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passesAffected core subsystem(s)
test, benchmark, build
This patch builds the addon for
benchmark/misc/function_call
in build files when running tests, and throw an error in the benchmark when the addon is not built instead of failing silently.