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.

Sign up for GitHub

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, windows: build and test add-ons on test-ci #5886

Closed
wants to merge 6 commits into from
+30 −4
Closed

build, windows: build and test add-ons on test-ci #5886

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff3d2a7
build, windows: build and test add-ons on test-ci
Mar 24, 2016
32caebb
build, windows: check if "node_exe" defined
Mar 24, 2016
26f3f04
build, windows: move "node_exe" variable assignment.
Mar 24, 2016
ee5e294
build, windows: changes accordingly to PR comment
Mar 24, 2016
683fb9a
Merge remote-tracking branch 'upstream/master'
Mar 27, 2016
c1b7db7
build, windows: changes accordingly to PR comments
Mar 28, 2016
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
34 changes: 30 additions & 4 deletions vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ set release_urls_arg=
set build_release=
set enable_vtune_arg=
set configure_flags=
set build_addons=

:: assign path to node_exe
set node_exe="%config%\node.exe"
Copy link
Member

Choose a reason for hiding this comment

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

The correct place for this is after all set config= have happened, before the configure_flags are prepared, exactly at

node/vcbuild.bat

Line 93 in 089c6a4

. @blobor can you move this?

Copy link
Member

Choose a reason for hiding this comment

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

The quotes should not be stored in the variable, but added to every place where the variable is used, to be consistent with all other variables in this file.


:next-arg
if "%1"=="" goto args-done
Expand All @@ -54,8 +58,9 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
if /i "%1"=="noetw" set noetw=1&goto arg-ok
if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
if /i "%1"=="test" set test_args=%test_args% sequential parallel message -J&set jslint=1&goto arg-ok
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap message sequential parallel&goto arg-ok
if /i "%1"=="test" set test_args=%test_args% addons sequential parallel message -J&set jslint=1&set build_addons=1&goto arg-ok
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons message sequential parallel&set build_addons=1&goto arg-ok
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok
if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok
if /i "%1"=="test-gc" set test_args=%test_args% gc&set buildnodeweak=1&goto arg-ok
Expand Down Expand Up @@ -240,15 +245,36 @@ ssh -F %SSHCONFIG% %STAGINGSERVER% "touch nodejs/%DISTTYPEDIR%/v%FULLVERSION%/no

:build-node-weak
@rem Build node-weak if required
if "%buildnodeweak%"=="" goto run-tests
if "%buildnodeweak%"=="" goto build-addons
"%config%\node" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild --directory="%~dp0test\gc\node_modules\weak" --nodedir="%~dp0."
if errorlevel 1 goto build-node-weak-failed
goto run-tests
goto build-addons

:build-node-weak-failed
echo Failed to build node-weak.
goto exit

:build-addons
if not defined build_addons goto run-tests
if not exist %node_exe% (
echo Failed to find node.exe
goto run-tests
)
echo Building add-ons
:: clear
for /d %%F in (test\addons\??_*) do (
rd /s /q %%F
)
:: generate
%node_exe% tools/doc/addon-verify.js
Copy link
Member

Choose a reason for hiding this comment

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

Backslashes should be used consistently, here and below.

:: building addons
for /d %%F in (test/addons/*) do (
%node_exe% deps/npm/node_modules/node-gyp/bin/node-gyp rebuild ^
--directory=test/addons/%%F ^
--nodedir=%cd%
Copy link
Member

Choose a reason for hiding this comment

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

Should be quoted: "%cd%", to support testing in a path with spaces.

)
goto run-tests

:run-tests
if "%test_args%"=="" goto jslint
if "%config%"=="Debug" set test_args=--mode=debug %test_args%
Expand Down