Commit b25d26f
committed
build: support Jenkins via test-ci
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: nodejs/node-v0.x-archive#256531 parent d998a65 commit b25d26f
2 files changed
Lines changed: 11 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -127,6 +127,9 @@ test-all-http1: test-build | |||
| 127 | 127 | test-all-valgrind: test-build | |
| 128 | 128 | $(PYTHON) tools/test.py --mode=debug,release --valgrind | |
| 129 | 129 | ||
| 130 | + test-ci: | ||
| 131 | + $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --arch=$(DESTCPU) simple message internet | ||
| 132 | + | ||
| 130 | 133 | test-release: test-build | |
| 131 | 134 | $(PYTHON) tools/test.py --mode=release | |
| 132 | 135 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -61,7 +61,8 @@ if /i "%1"=="test-simple" set test=test-simple&goto arg-ok | |||
| 61 | 61 | if /i "%1"=="test-message" set test=test-message&goto arg-ok | |
| 62 | 62 | if /i "%1"=="test-gc" set test=test-gc&set buildnodeweak=1&goto arg-ok | |
| 63 | 63 | 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 | ||
| 65 | 66 | @rem Include small-icu support with MSI installer | |
| 66 | 67 | if /i "%1"=="msi" set msi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok | |
| 67 | 68 | if /i "%1"=="upload" set upload=1&goto arg-ok | |
@@ -81,7 +82,6 @@ goto next-arg | |||
| 81 | 82 | ||
| 82 | 83 | :args-done | |
| 83 | 84 | if defined upload goto upload | |
| 84 | - if defined jslint goto jslint | ||
| 85 | 85 | ||
| 86 | 86 | if defined build_release ( | |
| 87 | 87 | set nosnapshot=1 | |
@@ -197,12 +197,15 @@ if errorlevel 1 echo Failed to sign msi&goto exit | |||
| 197 | 197 | ||
| 198 | 198 | :run | |
| 199 | 199 | @rem Run tests if requested. | |
| 200 | - if "%test%"=="" goto exit | ||
| 200 | + if "%test%"=="" goto jslint | ||
| 201 | 201 | ||
| 202 | 202 | if "%config%"=="Debug" set test_args=--mode=debug | |
| 203 | 203 | if "%config%"=="Release" set test_args=--mode=release | |
| 204 | 204 | ||
| 205 | + set test_args=%test_args% --arch=%target_arch% | ||
| 206 | + | ||
| 205 | 207 | 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 | ||
| 206 | 209 | if "%test%"=="test-internet" set test_args=%test_args% internet | |
| 207 | 210 | if "%test%"=="test-pummel" set test_args=%test_args% pummel | |
| 208 | 211 | if "%test%"=="test-simple" set test_args=%test_args% simple | |
@@ -224,8 +227,7 @@ goto exit | |||
| 224 | 227 | :run-tests | |
| 225 | 228 | echo running 'python tools/test.py %test_args%' | |
| 226 | 229 | python tools/test.py %test_args% | |
| 227 | - if "%test%"=="test" goto jslint | ||
| 228 | - goto exit | ||
| 230 | + goto jslint | ||
| 229 | 231 | ||
| 230 | 232 | :create-msvs-files-failed | |
| 231 | 233 | echo Failed to create vc project files. | |
@@ -243,6 +245,7 @@ scp Release\node.pdb node@nodejs.org:~/web/nodejs.org/dist/v%NODE_VERSION%/node. | |||
| 243 | 245 | goto exit | |
| 244 | 246 | ||
| 245 | 247 | :jslint | |
| 248 | + if not defined jslint goto exit | ||
| 246 | 249 | echo running jslint | |
| 247 | 250 | set PYTHONPATH=tools/closure_linter/ | |
| 248 | 251 | python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js | |
0 commit comments