diff options
| author | Alexis Campailla <alexis@janeasystems.com> | 2015-07-08 16:44:06 +0200 |
|---|---|---|
| committer | Alexis Campailla <alexis@janeasystems.com> | 2015-07-10 10:06:24 -0700 |
| commit | 2d2494cf140c38327218a087593ff2177a9d0ec9 (patch) | |
| tree | 6385a2660c65ffa5cc64d1abd1b8d85e009f9005 | |
| parent | b25d26f2ef4f520a6613799b227f79ceaf7b8bdc (diff) | |
| download | node-2d2494cf140c38327218a087593ff2177a9d0ec9.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
Conflicts:
Makefile
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25653
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | vcbuild.bat | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -6,6 +6,7 @@ NINJA ?= ninja DESTDIR ?= SIGN ?= PREFIX ?= /usr/local +FLAKY_TESTS ?= run NODE ?= ./node @@ -128,7 +129,7 @@ test-all-valgrind: test-build $(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: test-build $(PYTHON) tools/test.py --mode=release diff --git a/vcbuild.bat b/vcbuild.bat index 0e46a27d2..ab4dd003f 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -38,6 +38,7 @@ set noperfctr_msi_arg= set i18n_arg= set download_arg= set build_release= +set flaky_tests_arg= :next-arg if "%1"=="" goto args-done @@ -72,6 +73,7 @@ if /i "%1"=="full-icu" set i18n_arg=%1&goto arg-ok if /i "%1"=="intl-none" set i18n_arg=%1&goto arg-ok if /i "%1"=="download-all" set download_arg="--download=all"&goto arg-ok if /i "%1"=="build-release" set build_release=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`. @@ -205,7 +207,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 |