Skip to content

Commit b25d26f

Browse files
committed
build: support Jenkins via test-ci
Reviewed-By: Julien Gilli <[email protected]> PR-URL: nodejs/node-v0.x-archive#25653
1 parent d998a65 commit b25d26f

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ test-all-http1: test-build
127127
test-all-valgrind: test-build
128128
$(PYTHON) tools/test.py --mode=debug,release --valgrind
129129

130+
test-ci:
131+
$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --arch=$(DESTCPU) simple message internet
132+
130133
test-release: test-build
131134
$(PYTHON) tools/test.py --mode=release
132135

vcbuild.bat

+8-5
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ if /i "%1"=="test-simple" set test=test-simple&goto arg-ok
6161
if /i "%1"=="test-message" set test=test-message&goto arg-ok
6262
if /i "%1"=="test-gc" set test=test-gc&set buildnodeweak=1&goto arg-ok
6363
if /i "%1"=="test-all" set test=test-all&set buildnodeweak=1&goto arg-ok
64-
if /i "%1"=="test" set test=test&goto arg-ok
64+
if /i "%1"=="test-ci" set test=test-ci&set nosnapshot=1&goto arg-ok
65+
if /i "%1"=="test" set test=test&set jslint=1&goto arg-ok
6566
@rem Include small-icu support with MSI installer
6667
if /i "%1"=="msi" set msi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok
6768
if /i "%1"=="upload" set upload=1&goto arg-ok
@@ -81,7 +82,6 @@ goto next-arg
8182

8283
:args-done
8384
if defined upload goto upload
84-
if defined jslint goto jslint
8585

8686
if defined build_release (
8787
set nosnapshot=1
@@ -197,12 +197,15 @@ if errorlevel 1 echo Failed to sign msi&goto exit
197197

198198
:run
199199
@rem Run tests if requested.
200-
if "%test%"=="" goto exit
200+
if "%test%"=="" goto jslint
201201

202202
if "%config%"=="Debug" set test_args=--mode=debug
203203
if "%config%"=="Release" set test_args=--mode=release
204204

205+
set test_args=%test_args% --arch=%target_arch%
206+
205207
if "%test%"=="test" set test_args=%test_args% simple message
208+
if "%test%"=="test-ci" set test_args=%test_args% -p tap --logfile test.tap simple message internet
206209
if "%test%"=="test-internet" set test_args=%test_args% internet
207210
if "%test%"=="test-pummel" set test_args=%test_args% pummel
208211
if "%test%"=="test-simple" set test_args=%test_args% simple
@@ -224,8 +227,7 @@ goto exit
224227
:run-tests
225228
echo running 'python tools/test.py %test_args%'
226229
python tools/test.py %test_args%
227-
if "%test%"=="test" goto jslint
228-
goto exit
230+
goto jslint
229231

230232
:create-msvs-files-failed
231233
echo Failed to create vc project files.
@@ -243,6 +245,7 @@ scp Release\node.pdb [email protected]:~/web/nodejs.org/dist/v%NODE_VERSION%/node.
243245
goto exit
244246

245247
:jslint
248+
if not defined jslint goto exit
246249
echo running jslint
247250
set PYTHONPATH=tools/closure_linter/
248251
python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js

0 commit comments

Comments
 (0)