126 SYSTEM_TEST_64 = $(BUILD_DIR)/$(MACH64)-5.22/.system-tested |
126 SYSTEM_TEST_64 = $(BUILD_DIR)/$(MACH64)-5.22/.system-tested |
127 else |
127 else |
128 SYSTEM_TEST_64 = $(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared |
128 SYSTEM_TEST_64 = $(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared |
129 endif |
129 endif |
130 |
130 |
131 # test the built source |
131 # Test the built source. If the output file shows up in the environment or |
|
132 # arguments, don't redirect stdout/stderr to it. |
132 $(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built |
133 $(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built |
133 $(RM) -rf $(COMPONENT_TEST_BUILD_DIR) |
134 $(RM) -rf $(COMPONENT_TEST_BUILD_DIR) |
134 $(MKDIR) $(COMPONENT_TEST_BUILD_DIR) |
135 $(MKDIR) $(COMPONENT_TEST_BUILD_DIR) |
135 $(COMPONENT_PRE_TEST_ACTION) |
136 $(COMPONENT_PRE_TEST_ACTION) |
136 -(cd $(COMPONENT_TEST_DIR) ; \ |
137 -(cd $(COMPONENT_TEST_DIR) ; \ |
137 $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \ |
138 $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \ |
138 $(COMPONENT_TEST_CMD) \ |
139 $(COMPONENT_TEST_CMD) \ |
139 $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \ |
140 $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \ |
140 &> $(COMPONENT_TEST_OUTPUT) |
141 $(if $(findstring $(COMPONENT_TEST_OUTPUT),$(COMPONENT_TEST_ENV)$(COMPONENT_TEST_ARGS)),,&> $(COMPONENT_TEST_OUTPUT)) |
141 $(COMPONENT_POST_TEST_ACTION) |
142 $(COMPONENT_POST_TEST_ACTION) |
142 $(COMPONENT_TEST_CREATE_TRANSFORMS) |
143 $(COMPONENT_TEST_CREATE_TRANSFORMS) |
143 $(COMPONENT_TEST_PERFORM_TRANSFORM) |
144 $(COMPONENT_TEST_PERFORM_TRANSFORM) |
144 $(COMPONENT_TEST_COMPARE) |
145 $(COMPONENT_TEST_COMPARE) |
145 $(COMPONENT_TEST_CLEANUP) |
146 $(COMPONENT_TEST_CLEANUP) |
156 $(TOUCH) $@ |
157 $(TOUCH) $@ |
157 |
158 |
158 # Test the installed packages. The targets above depend on .built which |
159 # Test the installed packages. The targets above depend on .built which |
159 # means $(CLONEY) has already run. System-test needs cloning but not |
160 # means $(CLONEY) has already run. System-test needs cloning but not |
160 # building; thus ideally, we would want to depend on .cloned here and below, |
161 # building; thus ideally, we would want to depend on .cloned here and below, |
161 # but since we don't have that, we depend on .prep and run $(CLONEY) here. |
162 # but since we don't have that, we depend on .prep and run $(CLONEY) here. If |
|
163 # the output file shows up in the environment or arguments, don't redirect |
|
164 # stdout/stderr to it. |
162 $(BUILD_DIR)/%/.system-tested-and-compared: $(SOURCE_DIR)/.prep |
165 $(BUILD_DIR)/%/.system-tested-and-compared: $(SOURCE_DIR)/.prep |
163 $(RM) -rf $(COMPONENT_TEST_BUILD_DIR) |
166 $(RM) -rf $(COMPONENT_TEST_BUILD_DIR) |
164 $(MKDIR) $(COMPONENT_TEST_BUILD_DIR) |
167 $(MKDIR) $(COMPONENT_TEST_BUILD_DIR) |
165 $(CLONEY) $(SOURCE_DIR) $(@D) |
168 $(CLONEY) $(SOURCE_DIR) $(@D) |
166 $(COMPONENT_PRE_SYSTEM_TEST_ACTION) |
169 $(COMPONENT_PRE_SYSTEM_TEST_ACTION) |
167 -(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \ |
170 -(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \ |
168 $(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \ |
171 $(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \ |
169 $(COMPONENT_SYSTEM_TEST_CMD) \ |
172 $(COMPONENT_SYSTEM_TEST_CMD) \ |
170 $(COMPONENT_SYSTEM_TEST_ARGS) $(COMPONENT_SYSTEM_TEST_TARGETS)) \ |
173 $(COMPONENT_SYSTEM_TEST_ARGS) $(COMPONENT_SYSTEM_TEST_TARGETS)) \ |
171 &> $(COMPONENT_TEST_OUTPUT) |
174 $(if $(findstring $(COMPONENT_TEST_OUTPUT),$(COMPONENT_SYSTEM_TEST_ENV)$(COMPONENT_SYSTEM_TEST_ARGS)),,&> $(COMPONENT_TEST_OUTPUT)) |
172 $(COMPONENT_POST_SYSTEM_TEST_ACTION) |
175 $(COMPONENT_POST_SYSTEM_TEST_ACTION) |
173 $(COMPONENT_TEST_CREATE_TRANSFORMS) |
176 $(COMPONENT_TEST_CREATE_TRANSFORMS) |
174 $(COMPONENT_TEST_PERFORM_TRANSFORM) |
177 $(COMPONENT_TEST_PERFORM_TRANSFORM) |
175 $(COMPONENT_TEST_COMPARE) |
178 $(COMPONENT_TEST_COMPARE) |
176 $(COMPONENT_SYSTEM_TEST_CLEANUP) |
179 $(COMPONENT_SYSTEM_TEST_CLEANUP) |