From ae743c890d535a68e6b05eb7a9fea14bcb462fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 7 Apr 2020 20:23:34 +0200 Subject: [PATCH 1/2] build: output dots instead of tap in GitHub actions This makes the output much smaller and lets us focus on errors if there are any. --- .github/workflows/test-linux.yml | 2 +- .github/workflows/test-macos.yml | 2 +- Makefile | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index b3450c489edcfc..5aa25033879345 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -20,4 +20,4 @@ jobs: - name: Build run: make build-ci -j2 V=1 - name: Test - run: make run-ci -j2 V=1 + run: make run-ci -j2 V=1 TEST_CI_PROGRESS="-p dots" diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index a78feb8b2d518b..9a2f00ad618284 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -20,4 +20,4 @@ jobs: - name: Build run: make build-ci -j8 V=1 - name: Test - run: make run-ci -j8 V=1 + run: make run-ci -j8 V=1 TEST_CI_PROGRESS="-p dots" diff --git a/Makefile b/Makefile index 0fbcbb87fb346c..c3997f4c1f6e9f 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ SIGN ?= PREFIX ?= /usr/local FLAKY_TESTS ?= run TEST_CI_ARGS ?= +TEST_CI_PROGRESS ?= -p tap --logfile test.tap STAGINGSERVER ?= node-www LOGLEVEL ?= silent OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]') @@ -536,7 +537,7 @@ endif # Related CI job: node-test-commit-arm-fanned test-ci-native: LOGLEVEL := info test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp test/abort/.buildstamp - $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) $(TEST_CI_PROGRESS) \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) @@ -544,7 +545,7 @@ test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/no # This target should not use a native compiler at all # Related CI job: node-test-commit-arm-fanned test-ci-js: | clear-stalled - $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) $(TEST_CI_PROGRESS) \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) @echo "Clean up any leftover processes, error if found." @@ -559,7 +560,7 @@ test-ci-js: | clear-stalled test-ci: LOGLEVEL := info test-ci: | clear-stalled build-addons build-abort-tests build-js-native-api-tests build-node-api-tests doc-only out/Release/cctest --gtest_output=xml:out/junit/cctest.xml - $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) $(TEST_CI_PROGRESS) \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC) out/Release/embedtest 'require("./test/embedding/test-embedding.js")' From 4d35de254b9a15e1c6c66654680fb8972483adb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 8 Apr 2020 11:49:56 +0200 Subject: [PATCH 2/2] no makefile change --- .github/workflows/test-linux.yml | 2 +- .github/workflows/test-macos.yml | 2 +- Makefile | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 5aa25033879345..4b0bc052f0c190 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -20,4 +20,4 @@ jobs: - name: Build run: make build-ci -j2 V=1 - name: Test - run: make run-ci -j2 V=1 TEST_CI_PROGRESS="-p dots" + run: make run-ci -j2 V=1 TEST_CI_ARGS="-p dots" diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 9a2f00ad618284..8bb0ab6d71001e 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -20,4 +20,4 @@ jobs: - name: Build run: make build-ci -j8 V=1 - name: Test - run: make run-ci -j8 V=1 TEST_CI_PROGRESS="-p dots" + run: make run-ci -j8 V=1 TEST_CI_ARGS="-p dots" diff --git a/Makefile b/Makefile index c3997f4c1f6e9f..0fbcbb87fb346c 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ SIGN ?= PREFIX ?= /usr/local FLAKY_TESTS ?= run TEST_CI_ARGS ?= -TEST_CI_PROGRESS ?= -p tap --logfile test.tap STAGINGSERVER ?= node-www LOGLEVEL ?= silent OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]') @@ -537,7 +536,7 @@ endif # Related CI job: node-test-commit-arm-fanned test-ci-native: LOGLEVEL := info test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp test/abort/.buildstamp - $(PYTHON) tools/test.py $(PARALLEL_ARGS) $(TEST_CI_PROGRESS) \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) @@ -545,7 +544,7 @@ test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/no # This target should not use a native compiler at all # Related CI job: node-test-commit-arm-fanned test-ci-js: | clear-stalled - $(PYTHON) tools/test.py $(PARALLEL_ARGS) $(TEST_CI_PROGRESS) \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) @echo "Clean up any leftover processes, error if found." @@ -560,7 +559,7 @@ test-ci-js: | clear-stalled test-ci: LOGLEVEL := info test-ci: | clear-stalled build-addons build-abort-tests build-js-native-api-tests build-node-api-tests doc-only out/Release/cctest --gtest_output=xml:out/junit/cctest.xml - $(PYTHON) tools/test.py $(PARALLEL_ARGS) $(TEST_CI_PROGRESS) \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC) out/Release/embedtest 'require("./test/embedding/test-embedding.js")'