From 25d59cf83a970658311e5bb4c6671a7fba8c1d92 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 30 Aug 2019 08:52:42 +0200 Subject: [PATCH] build: hard code doctool in test-doc target This commit removes the usage of the CI_DOC variable in the test-doc recipe and specifies the doctool argument to tools/test.py explicitly. The motivation for this is that the build is taking longer time and this is mostly due to tests being run twice as the CI_DOC variable will be empty in most cases (when not using --without-ssl). This change was introduced with/after Commit 9039af83a33af870a074463a0e8d79a0cb95d14c ("build: skip test-ci doc targets if no crypto") and while I though it might make sense to change the setting of CI_DOC I not sure about the implications that might have to our CI environment. It currently looks like this: ifeq ($(node_use_openssl), false) CI_DOC := doctool else CI_DOC = endif Which is setting CI_DOC to doctool if there is no crypto support which not available. But perhaps this should be be the other way around, changing the order or updating condition to be true. PR-URL: https://github.com/nodejs/node/pull/29375 Reviewed-By: Ben Noordhuis Reviewed-By: Yongsheng Zhang Reviewed-By: David Carlier Reviewed-By: Luigi Pinca --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 478326e2cd851c..33d43798f52617 100644 --- a/Makefile +++ b/Makefile @@ -604,7 +604,7 @@ test-doc: doc-only ## Builds, lints, and verifies the docs. echo "Skipping test-doc (no crypto)"; \ else \ $(MAKE) lint; \ - $(PYTHON) tools/test.py $(PARALLEL_ARGS) $(CI_DOC); \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) doctool; \ fi test-known-issues: all