From 6195b46ed84d9090d1550884a72edeabb62f189b Mon Sep 17 00:00:00 2001 From: Alexis Campailla Date: Wed, 26 Aug 2015 12:38:48 +0200 Subject: [PATCH] test: support flaky tests in test-ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Ported from https://github.com/joyent/node/commit/2d2494cf140c38327218a087593ff2177a9d0ec9 PR-URL: https://github.com/nodejs/node/pull/2424 Reviewed-By: Ben Noordhuis Reviewed-By: João Reis Reviewed-By: Sakthipriyan Vairamani --- Makefile | 3 ++- vcbuild.bat | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bccdc9afa054ab..c82a7991317754 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ PYTHON ?= python DESTDIR ?= SIGN ?= PREFIX ?= /usr/local +FLAKY_TESTS ?= run STAGINGSERVER ?= node-www OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]') @@ -140,7 +141,7 @@ test-all-valgrind: test-build $(PYTHON) tools/test.py --mode=debug,release --valgrind test-ci: | build-addons - $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release \ + $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --flaky-tests=$(FLAKY_TESTS) \ addons message parallel sequential test-release: test-build diff --git a/vcbuild.bat b/vcbuild.bat index 1073a3e5886eea..4ebb0ede00b469 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -70,6 +70,7 @@ if /i "%1"=="small-icu" set i18n_arg=%1&goto arg-ok 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"=="ignore-flaky" set test_args=%test_args% --flaky-tests=dontcare&goto arg-ok echo Warning: ignoring invalid command line option `%1`.