Skip to content

Commit 2f58a51

Browse files
committed
build: support Jenkins via test-ci
1 parent cf4ea0d commit 2f58a51

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,14 @@ bench-idle:
418418
sleep 1
419419
./node benchmark/idle_clients.js &
420420

421+
test-ci:
422+
$(PYTHON) tools/test.py -ptap --logfile test.tap --mode=release --arch=$(DESTCPU) simple
423+
$(PYTHON) tools/test.py -ptap --logfile test.tap --mode=release --arch=$(DESTCPU) message
424+
# $(PYTHON) tools/test.py -ptap --logfile test.tap --mode=release --arch=$(DESTCPU) gc
425+
$(PYTHON) tools/test.py -ptap --logfile test.tap --mode=release --arch=$(DESTCPU) internet
426+
$(MAKE) jslint
427+
$(MAKE) cpplint
428+
421429
jslintfix:
422430
PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/fixjsstyle.py --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
423431

vcbuild.bat

Lines changed: 7 additions & 3 deletions
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&set jslint=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
@@ -202,7 +202,11 @@ if "%test%"=="" goto exit
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+
207+
205208
if "%test%"=="test" set test_args=%test_args% simple message
209+
if "%test%"=="test-ci" set test_args=%test_args% -p tap --logfile test.tap simple message internet
206210
if "%test%"=="test-internet" set test_args=%test_args% internet
207211
if "%test%"=="test-pummel" set test_args=%test_args% pummel
208212
if "%test%"=="test-simple" set test_args=%test_args% simple
@@ -224,7 +228,7 @@ goto exit
224228
:run-tests
225229
echo running 'python tools/test.py %test_args%'
226230
python tools/test.py %test_args%
227-
if "%test%"=="test" goto jslint
231+
if defined jslint goto jslint
228232
goto exit
229233

230234
:create-msvs-files-failed

0 commit comments

Comments
 (0)