From 2585eba99b57ff2f3813d06d4018495c42fec004 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 07 Apr 2024 17:44:45 +0200
Subject: [PATCH] pciutils: update to 3.12.0
---
make-rules/attpackagemake.mk | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/make-rules/attpackagemake.mk b/make-rules/attpackagemake.mk
index a56d73e..36d3a46 100644
--- a/make-rules/attpackagemake.mk
+++ b/make-rules/attpackagemake.mk
@@ -67,7 +67,7 @@
# build the configured source
$(BUILD_DIR)/%/.built: $(SOURCE_DIR)/.prep
$(RM) -r $(@D) ; $(MKDIR) $(@D)
- $(CLONEY) $(SOURCE_DIR) $(@D)
+ $(ENV) $(CLONEY_ARGS) $(CLONEY) $(SOURCE_DIR) $(@D)
$(COMPONENT_PRE_BUILD_ACTION)
cd $(@D); $(ENV) $(COMPONENT_BUILD_ENV) \
bin/package make $(COMPONENT_BUILD_TARGETS) $(COMPONENT_BUILD_ARGS)
@@ -86,12 +86,36 @@
$(TOUCH) $@
# test the built source
-$(BUILD_DIR)/%/.tested: $(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); $(ENV) $(COMPONENT_TEST_ENV) \
+ -(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)
+ $(COMPONENT_TEST_PERFORM_TRANSFORM)
+ $(COMPONENT_TEST_COMPARE)
+ $(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) \
+ bin/package test $(COMPONENT_TEST_TARGETS) \
+ $(COMPONENT_TEST_ARGS)) \
+ |& $(TEE) $(COMPONENT_TEST_OUTPUT)
+ $(COMPONENT_POST_TEST_ACTION)
+ $(COMPONENT_TEST_CREATE_TRANSFORMS)
+ $(COMPONENT_TEST_PERFORM_TRANSFORM)
+ $(COMPONENT_TEST_CLEANUP)
$(TOUCH) $@
clean::
--
Gitblit v1.9.3