From 1663f130e33c85053525717aff0242f7906fd829 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 17 Oct 2019 14:02:36 -0400 Subject: [PATCH] build: make linter failures fail `test-doc` target Linter failures in the `test-doc` make target were not failing the build if the subsequent `doctools` test passed as its exit code wasn't being preserved. Make the `lint` target a dependency of `test-doc` so that it is outside of the `node_use_openssl` guard -- its own dependencies have their own guards where necessary and the targets that don't require an available node (e.g. the C++ linters) will be allowed to run. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 53dea85eb8f553..8d4e6bbe6474b9 100644 --- a/Makefile +++ b/Makefile @@ -592,11 +592,10 @@ test-hash-seed: all $(NODE) test/pummel/test-hash-seed.js .PHONY: test-doc -test-doc: doc-only ## Builds, lints, and verifies the docs. +test-doc: doc-only lint ## Builds, lints, and verifies the docs. @if [ "$(shell $(node_use_openssl))" != "true" ]; then \ echo "Skipping test-doc (no crypto)"; \ else \ - $(MAKE) lint; \ $(PYTHON) tools/test.py $(PARALLEL_ARGS) doctool; \ fi