From c9d5be4af098848ebb4573d47750c4798845458d Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 18 Oct 2017 13:39:19 -0700 Subject: [PATCH] test: fix flaky test-make-doc `test-make-doc` fails in CI on Raspberry Pi devices where `test-ci-js` runs the test but does not build the docs. We do not want to build the docs in these cases. Move the test to the `doctool` suite and add that suite to `IGNORED_SUITES` in `test.py`. Specify `doctool` as a test suite to run with `make test` or `make test-ci` but not with the `make test-ci-js` job run on cross-compiled fanned CI tests like we do with Raspberry Pi devices in CI. PR-URL: https://github.com/nodejs/node/pull/16301 Reviewed-By: Refael Ackermann Reviewed-By: Anatoli Papirovski Reviewed-By: Joyee Cheung Reviewed-By: Colin Ihrig --- Makefile | 4 ++-- test/{sequential => doctool}/test-make-doc.js | 0 tools/test.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename test/{sequential => doctool}/test-make-doc.js (100%) diff --git a/Makefile b/Makefile index 98a4c1b53ce..d5c6f49cab3 100644 --- a/Makefile +++ b/Makefile @@ -214,7 +214,7 @@ test: all $(CI_ASYNC_HOOKS) \ $(CI_JS_SUITES) \ $(CI_NATIVE_SUITES) \ - known_issues + doctool known_issues $(MAKE) lint endif @@ -392,7 +392,7 @@ test-ci: | clear-stalled build-addons build-addons-napi doc out/Release/cctest --gtest_output=tap:cctest.tap $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=release --flaky-tests=$(FLAKY_TESTS) \ - $(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) known_issues + $(TEST_CI_ARGS) $(CI_ASYNC_HOOKS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) doctool known_issues # Clean up any leftover processes, error if found. ps awwx | grep Release/node | grep -v grep | cat @PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \ diff --git a/test/sequential/test-make-doc.js b/test/doctool/test-make-doc.js similarity index 100% rename from test/sequential/test-make-doc.js rename to test/doctool/test-make-doc.js diff --git a/tools/test.py b/tools/test.py index e5b3a550dde..48d4a1a1eaa 100755 --- a/tools/test.py +++ b/tools/test.py @@ -1555,6 +1555,7 @@ def PrintCrashed(code): IGNORED_SUITES = [ 'addons', 'addons-napi', + 'doctool', 'gc', 'internet', 'pummel',