diff options
| author | Alexis Campailla <alexis@janeasystems.com> | 2015-07-08 16:44:06 +0200 |
|---|---|---|
| committer | Alexis Campailla <alexis@janeasystems.com> | 2015-07-16 20:21:30 -0400 |
| commit | ffa1e1f31d9227096e2ec2aa97ce9321acff14b0 (patch) | |
| tree | 372a814adf70d88d018b2b630c512eb0d0cdb658 | |
| parent | 100dd19e6104fe0f7538b73fca550dd5dd5141cc (diff) | |
| download | node-ffa1e1f31d9227096e2ec2aa97ce9321acff14b0.tar.gz | |
build: support flaky tests in test-ci
Adding support for specifying flaky test mode to
the test runner:
- via an environment variable FLAKY_TESTS for Makefile
- via an argument ignore-flaky for vcbuild.bat
PR-URL: https://github.com/joyent/node/pull/25686
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | vcbuild.bat | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -5,6 +5,7 @@ PYTHON ?= python NINJA ?= ninja DESTDIR ?= SIGN ?= +FLAKY_TESTS ?= run NODE ?= ./node @@ -102,7 +103,7 @@ test-all-valgrind: all $(PYTHON) tools/test.py --mode=debug,release --valgrind test-ci: - $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --arch=$(DESTCPU) simple message internet + $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --arch=$(DESTCPU) --flaky-tests=$(FLAKY_TESTS) simple message internet test-release: all $(PYTHON) tools/test.py --mode=release diff --git a/vcbuild.bat b/vcbuild.bat index 7784722b3..1fb9aa44a 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -35,6 +35,7 @@ set noetw_msi_arg= set noperfctr= set noperfctr_arg= set noperfctr_msi_arg= +set flaky_tests_arg= :next-arg if "%1"=="" goto args-done @@ -64,6 +65,7 @@ if /i "%1"=="msi" set msi=1&set licensertf=1&goto arg-ok if /i "%1"=="upload" set upload=1&goto arg-ok if /i "%1"=="jslint" set jslint=1&goto arg-ok if /i "%1"=="build-release" set nosnapshot=1&set config=Release&set msi=1&set licensertf=1&goto arg-ok +if /i "%1"=="ignore-flaky" set flaky_tests_arg=--flaky-tests=dontcare&goto arg-ok echo Warning: ignoring invalid command line option `%1`. @@ -174,7 +176,7 @@ if "%config%"=="Release" set test_args=--mode=release set test_args=%test_args% --arch=%target_arch% if "%test%"=="test" set test_args=%test_args% simple message -if "%test%"=="test-ci" set test_args=%test_args% -p tap --logfile test.tap simple message internet +if "%test%"=="test-ci" set test_args=%test_args% -p tap --logfile test.tap %flaky_tests_arg% simple message internet if "%test%"=="test-internet" set test_args=%test_args% internet if "%test%"=="test-pummel" set test_args=%test_args% pummel if "%test%"=="test-simple" set test_args=%test_args% simple |