From 89aae086545e4a4b612bfab4d48bfd188dd5d5c5 Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Sun, 23 Oct 2022 16:56:42 +0200 Subject: [PATCH] make-rules: always save test output even if we do not need it for comparison --- make-rules/attpackagemake.mk | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/make-rules/attpackagemake.mk b/make-rules/attpackagemake.mk index 4ff55ca..96830c3 100644 --- a/make-rules/attpackagemake.mk +++ b/make-rules/attpackagemake.mk @@ -93,7 +93,7 @@ -(cd $(COMPONENT_TEST_DIR) ; \ $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \ bin/package test $(COMPONENT_TEST_TARGETS) \ - $(COMPONENT_TEST_ARGS) \ + $(COMPONENT_TEST_ARGS)) \ &> $(COMPONENT_TEST_OUTPUT) $(COMPONENT_POST_TEST_ACTION) $(COMPONENT_TEST_CREATE_TRANSFORMS) @@ -102,13 +102,19 @@ $(COMPONENT_TEST_CLEANUP) $(TOUCH) $@ +$(BUILD_DIR)/%/.tested: SHELLOPTS=pipefail $(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built + $(RM) -rf $(COMPONENT_TEST_BUILD_DIR) + $(MKDIR) $(COMPONENT_TEST_BUILD_DIR) $(COMPONENT_PRE_TEST_ACTION) (cd $(COMPONENT_TEST_DIR) ; \ $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \ bin/package test $(COMPONENT_TEST_TARGETS) \ - $(COMPONENT_TEST_ARGS) + $(COMPONENT_TEST_ARGS)) \ + |& $(TEE) $(COMPONENT_TEST_OUTPUT) $(COMPONENT_POST_TEST_ACTION) + $(COMPONENT_TEST_CREATE_TRANSFORMS) + $(COMPONENT_TEST_PERFORM_TRANSFORM) $(COMPONENT_TEST_CLEANUP) $(TOUCH) $@ -- Gitblit v1.9.3