From f09dca6e20c67020d6f337fc95eec480de4d24ef Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Fri, 05 Apr 2024 22:31:34 +0200 Subject: [PATCH] tcsh: update to 6.24.12 --- make-rules/ninja.mk | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/make-rules/ninja.mk b/make-rules/ninja.mk index 5d844ed..cd35c09 100644 --- a/make-rules/ninja.mk +++ b/make-rules/ninja.mk @@ -78,7 +78,7 @@ COMPONENT_SYSTEM_TEST_TARGETS = test # 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) @@ -94,16 +94,23 @@ $(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) \ $(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) $@ clean:: $(RM) -r $(BUILD_DIR) $(PROTO_DIR) -REQUIRED_PACKAGES += developer/build/ninja + +USERLAND_REQUIRED_PACKAGES += developer/build/ninja -- Gitblit v1.9.3