From 237543c1cd4e502ce2fed48f9010faace85a3e88 Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov <apyhalov@gmail.com> Date: Wed, 21 Sep 2016 11:21:02 +0200 Subject: [PATCH] Import test framework improvements from upstream --- make-rules/makemaker.mk | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/make-rules/makemaker.mk b/make-rules/makemaker.mk index c0200a8..f22f5f7 100644 --- a/make-rules/makemaker.mk +++ b/make-rules/makemaker.mk @@ -97,10 +97,10 @@ # Define bit specific and Perl version specific filenames. COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PERL_VERSION)-$(BITS).master -COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PERL_VERSION)-$(BITS)-results -COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PERL_VERSION)-$(BITS)-diffs -COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PERL_VERSION)-$(BITS).snapshot -COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(PERL_VERSION)-$(BITS)-results +COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-results +COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-diffs +COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(PERL_VERSION)-$(BITS).snapshot +COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(PERL_VERSION)-$(BITS)-results COMPONENT_TEST_TARGETS = check COMPONENT_TEST_ENV += $(COMMON_PERL_ENV) @@ -114,6 +114,8 @@ # test the built source $(BUILD_DIR)/%/.tested-and-compared: $(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) \ -- Gitblit v1.9.3