Skip to content

Commit 100dd19

Browse files
committed
build: support Jenkins via test-ci
PR-URL: nodejs/node-v0.x-archive#25686 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
1 parent df59d43 commit 100dd19

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
@@ -101,6 +101,9 @@ test-all-http1: all
101101
test-all-valgrind: all
102102
$(PYTHON) tools/test.py --mode=debug,release --valgrind
103103

104+
test-ci:
105+
$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --arch=$(DESTCPU) simple message internet
106+
104107
test-release: all
105108
$(PYTHON) tools/test.py --mode=release
106109

vcbuild.bat

+8-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ if /i "%1"=="test-simple" set test=test-simple&goto arg-ok
5858
if /i "%1"=="test-message" set test=test-message&goto arg-ok
5959
if /i "%1"=="test-gc" set test=test-gc&set buildnodeweak=1&goto arg-ok
6060
if /i "%1"=="test-all" set test=test-all&set buildnodeweak=1&goto arg-ok
61-
if /i "%1"=="test" set test=test&goto arg-ok
61+
if /i "%1"=="test-ci" set test=test-ci&set nosnapshot=1&goto arg-ok
62+
if /i "%1"=="test" set test=test&set jslint=1&goto arg-ok
6263
if /i "%1"=="msi" set msi=1&set licensertf=1&goto arg-ok
6364
if /i "%1"=="upload" set upload=1&goto arg-ok
6465
if /i "%1"=="jslint" set jslint=1&goto arg-ok
@@ -73,7 +74,6 @@ goto next-arg
7374

7475
:args-done
7576
if defined upload goto upload
76-
if defined jslint goto jslint
7777

7878
if "%config%"=="Debug" set debug_arg=--debug
7979
if "%target_arch%"=="x64" set msiplatform=x64
@@ -166,12 +166,15 @@ if errorlevel 1 echo Failed to sign msi&goto exit
166166

167167
:run
168168
@rem Run tests if requested.
169-
if "%test%"=="" goto exit
169+
if "%test%"=="" goto jslint
170170

171171
if "%config%"=="Debug" set test_args=--mode=debug
172172
if "%config%"=="Release" set test_args=--mode=release
173173

174+
set test_args=%test_args% --arch=%target_arch%
175+
174176
if "%test%"=="test" set test_args=%test_args% simple message
177+
if "%test%"=="test-ci" set test_args=%test_args% -p tap --logfile test.tap simple message internet
175178
if "%test%"=="test-internet" set test_args=%test_args% internet
176179
if "%test%"=="test-pummel" set test_args=%test_args% pummel
177180
if "%test%"=="test-simple" set test_args=%test_args% simple
@@ -193,8 +196,7 @@ goto exit
193196
:run-tests
194197
echo running 'python tools/test.py %test_args%'
195198
python tools/test.py %test_args%
196-
if "%test%"=="test" goto jslint
197-
goto exit
199+
goto jslint
198200

199201
:create-msvs-files-failed
200202
echo Failed to create vc project files.
@@ -212,6 +214,7 @@ scp Release\node.pdb node@nodejs.org:~/web/nodejs.org/dist/v%NODE_VERSION%/node.
212214
goto exit
213215

214216
:jslint
217+
if not defined jslint goto exit
215218
echo running jslint
216219
set PYTHONPATH=tools/closure_linter/
217220
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)