From 5a9394761a76843883ab7b09d15c336324e2be13 Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Fri, 05 Apr 2024 16:14:27 +0200 Subject: [PATCH] apache-24: update to 2.4.59 --- make-rules/attpackagemake.mk | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/make-rules/attpackagemake.mk b/make-rules/attpackagemake.mk index 4ff55ca..36d3a46 100644 --- a/make-rules/attpackagemake.mk +++ b/make-rules/attpackagemake.mk @@ -86,14 +86,14 @@ $(TOUCH) $@ # test the built source -$(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built +$(BUILD_DIR)/%/.tested-and-compared: $(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) \ 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: $(BUILD_DIR)/%/.built +$(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) \ 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