20548962 generated test files should be in the build directory for clobbering time
--- a/make-rules/ant.mk Wed Feb 25 16:10:06 2015 -0800
+++ b/make-rules/ant.mk Thu Feb 26 06:52:41 2015 -0800
@@ -52,6 +52,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) \
--- a/make-rules/attpackagemake.mk Wed Feb 25 16:10:06 2015 -0800
+++ b/make-rules/attpackagemake.mk Thu Feb 26 06:52:41 2015 -0800
@@ -90,6 +90,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) \
--- a/make-rules/configure.mk Wed Feb 25 16:10:06 2015 -0800
+++ b/make-rules/configure.mk Thu Feb 26 06:52:41 2015 -0800
@@ -136,6 +136,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) \
--- a/make-rules/justmake.mk Wed Feb 25 16:10:06 2015 -0800
+++ b/make-rules/justmake.mk Thu Feb 26 06:52:41 2015 -0800
@@ -69,6 +69,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) \
--- a/make-rules/makemaker.mk Wed Feb 25 16:10:06 2015 -0800
+++ b/make-rules/makemaker.mk Thu Feb 26 06:52:41 2015 -0800
@@ -100,10 +100,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)
@@ -121,6 +121,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) \
--- a/make-rules/setup.py.mk Wed Feb 25 16:10:06 2015 -0800
+++ b/make-rules/setup.py.mk Thu Feb 26 06:52:41 2015 -0800
@@ -121,10 +121,10 @@
# Define bit specific and Python version specific filenames.
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PYTHON_VERSION)-$(BITS).master
-COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
-COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs
-COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PYTHON_VERSION)-$(BITS).snapshot
-COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(PYTHON_VERSION)-$(BITS)-results
+COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
+COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs
+COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(PYTHON_VERSION)-$(BITS).snapshot
+COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(PYTHON_VERSION)-$(BITS)-results
COMPONENT_TEST_DEP = $(BUILD_DIR)/%/.installed
COMPONENT_TEST_DIR = $(COMPONENT_SRC)/test
@@ -149,6 +149,8 @@
# test the built source
$(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) \
--- a/make-rules/shared-macros.mk Wed Feb 25 16:10:06 2015 -0800
+++ b/make-rules/shared-macros.mk Thu Feb 26 06:52:41 2015 -0800
@@ -228,20 +228,23 @@
# set the default target for installation of the component
COMPONENT_INSTALL_TARGETS = install
-# set the default test results directory
+# set the default build test results directory
+COMPONENT_TEST_BUILD_DIR = $(BUILD_DIR)/test/$(MACH$(BITS))
+
+# set the default master test results directory
COMPONENT_TEST_RESULTS_DIR = $(COMPONENT_DIR)/test
# set the default master test results file
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS).master
# set the default test results output file
-COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_RESULTS_DIR)/test-$(BITS)-results
+COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(BITS)-results
# set the default test results comparison diffs file
-COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_RESULTS_DIR)/test-$(BITS)-diffs
+COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_BUILD_DIR)/test-$(BITS)-diffs
# set the default test snapshot file
-COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS).snapshot
+COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(BITS).snapshot
# Normally $(GSED) is simplest, but some results files need more power.
COMPONENT_TEST_TRANSFORMER = $(GSED)
@@ -272,7 +275,7 @@
fi
# set the default command for performing any test result munging
-COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(BITS)-results
+COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(BITS)-results
# set the default operation to run to perform test result normalization
COMPONENT_TEST_PERFORM_TRANSFORM = \