Marcel Telka
2022-10-23 89aae086545e4a4b612bfab4d48bfd188dd5d5c5
make-rules: always save test output even if we do not need it for comparison

11 files modified
100 ■■■■ changed files
make-rules/ant.mk 8 ●●●● patch | view | raw | blame | history
make-rules/attpackagemake.mk 10 ●●●● patch | view | raw | blame | history
make-rules/cmake.mk 8 ●●●● patch | view | raw | blame | history
make-rules/configure.mk 8 ●●●● patch | view | raw | blame | history
make-rules/gem.mk 8 ●●●● patch | view | raw | blame | history
make-rules/justmake.mk 8 ●●●● patch | view | raw | blame | history
make-rules/makemaker.mk 10 ●●●● patch | view | raw | blame | history
make-rules/modulebuild.mk 8 ●●●● patch | view | raw | blame | history
make-rules/ninja.mk 8 ●●●● patch | view | raw | blame | history
make-rules/setup.py.mk 8 ●●●● patch | view | raw | blame | history
make-rules/waf.mk 16 ●●●● patch | view | raw | blame | history
make-rules/ant.mk
@@ -64,13 +64,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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
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) $@
make-rules/cmake.mk
@@ -205,13 +205,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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
make-rules/configure.mk
@@ -215,13 +215,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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
make-rules/gem.mk
@@ -92,13 +92,19 @@
    $(TOUCH) $@
$(BUILD_DIR)/%/.tested:    SHELLOPTS=pipefail
$(BUILD_DIR)/%/.tested:    $(COMPONENT_TEST_DEP)
    $(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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        $(if $(findstring $(COMPONENT_TEST_OUTPUT),$(COMPONENT_TEST_ENV)$(COMPONENT_TEST_ARGS)),,|& $(TEE) $(COMPONENT_TEST_OUTPUT))
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
make-rules/justmake.mk
@@ -91,13 +91,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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
make-rules/makemaker.mk
@@ -118,7 +118,7 @@
COMPONENT_TEST_TRANSFORMS += '-e "/^make\[/d"'            # delete make logs
# Add the expected 'test_harness' line if it is missing in the test results.
$(BUILD_DIR)/%/.tested-and-compared:    COMPONENT_POST_TEST_ACTION += \
COMPONENT_POST_TEST_ACTION += \
    $(GNU_GREP) -q test_harness $(COMPONENT_TEST_OUTPUT) \
    || $(GSED) -i -e '1i\test_harness' $(COMPONENT_TEST_OUTPUT) ;
@@ -153,13 +153,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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
make-rules/modulebuild.mk
@@ -69,12 +69,18 @@
        $(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) \
                ./Build \
                $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
                $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
                |& $(TEE) $(COMPONENT_TEST_OUTPUT)
        $(COMPONENT_POST_TEST_ACTION)
        $(COMPONENT_TEST_CREATE_TRANSFORMS)
        $(COMPONENT_TEST_PERFORM_TRANSFORM)
        $(COMPONENT_TEST_CLEANUP)
        $(TOUCH) $@
make-rules/ninja.mk
@@ -94,13 +94,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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
make-rules/setup.py.mk
@@ -209,13 +209,19 @@
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
$(BUILD_DIR)/%/.tested:    SHELLOPTS=pipefail
$(BUILD_DIR)/%/.tested:    $(COMPONENT_TEST_DEP)
    $(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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
make-rules/waf.mk
@@ -190,13 +190,19 @@
    $(eval $(BUILD_DIR)/%-$(pyver)/.tested: PYTHON_VERSION=$(pyver)) \
)
$(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) \
        $(COMPONENT_TEST_CMD) \
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
        $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_TEST_CLEANUP)
    $(TOUCH) $@
@@ -221,14 +227,20 @@
    $(COMPONENT_SYSTEM_TEST_CLEANUP)
    $(TOUCH) $@
$(BUILD_DIR)/%/.system-tested:    SHELLOPTS=pipefail
$(BUILD_DIR)/%/.system-tested:    $(SOURCE_DIR)/.prep
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(ENV) $(CLONEY_ARGS) $(CLONEY) $(SOURCE_DIR) $(@D)
    $(COMPONENT_PRE_SYSTEM_TEST_ACTION)
    (cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
        $(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
        $(COMPONENT_SYSTEM_TEST_CMD) \
        $(COMPONENT_SYSTEM_TEST_ARGS) $(COMPONENT_SYSTEM_TEST_TARGETS))
        $(COMPONENT_SYSTEM_TEST_ARGS) $(COMPONENT_SYSTEM_TEST_TARGETS)) \
        |& $(TEE) $(COMPONENT_TEST_OUTPUT)
    $(COMPONENT_POST_SYSTEM_TEST_ACTION)
    $(COMPONENT_TEST_CREATE_TRANSFORMS)
    $(COMPONENT_TEST_PERFORM_TRANSFORM)
    $(COMPONENT_SYSTEM_TEST_CLEANUP)
    $(TOUCH) $@