make-rules/setup.py.mk
changeset 6608 a98160718cfc
parent 6509 d45542b6400a
child 7124 3e0b5da5d4d1
equal deleted inserted replaced
6607:32e8bf76f9f7 6608:a98160718cfc
   196 endif
   196 endif
   197 ifeq ($(PYTHON_VERSION),3.5)
   197 ifeq ($(PYTHON_VERSION),3.5)
   198 SYSTEM_TEST_32_and_64 = $(SYSTEM_TEST_64)
   198 SYSTEM_TEST_32_and_64 = $(SYSTEM_TEST_64)
   199 endif
   199 endif
   200 
   200 
   201 # test the built source
   201 # Test the built source.  If the output file shows up in the environment or
       
   202 # arguments, don't redirect stdout/stderr to it.
   202 $(BUILD_DIR)/%/.tested-and-compared:    $(COMPONENT_TEST_DEP)
   203 $(BUILD_DIR)/%/.tested-and-compared:    $(COMPONENT_TEST_DEP)
   203 	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
   204 	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
   204 	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
   205 	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
   205 	$(COMPONENT_PRE_TEST_ACTION)
   206 	$(COMPONENT_PRE_TEST_ACTION)
   206 	-(cd $(COMPONENT_TEST_DIR) ; \
   207 	-(cd $(COMPONENT_TEST_DIR) ; \
   207 		$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
   208 		$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
   208 		$(COMPONENT_TEST_CMD) $(COMPONENT_TEST_ARGS)) \
   209 		$(COMPONENT_TEST_CMD) $(COMPONENT_TEST_ARGS)) \
   209 		&> $(COMPONENT_TEST_OUTPUT)
   210 		$(if $(findstring $(COMPONENT_TEST_OUTPUT),$(COMPONENT_TEST_ENV)$(COMPONENT_TEST_ARGS)),,&> $(COMPONENT_TEST_OUTPUT))
   210 	$(COMPONENT_POST_TEST_ACTION)
   211 	$(COMPONENT_POST_TEST_ACTION)
   211 	$(COMPONENT_TEST_CREATE_TRANSFORMS)
   212 	$(COMPONENT_TEST_CREATE_TRANSFORMS)
   212 	$(COMPONENT_TEST_PERFORM_TRANSFORM)
   213 	$(COMPONENT_TEST_PERFORM_TRANSFORM)
   213 	$(COMPONENT_TEST_COMPARE)
   214 	$(COMPONENT_TEST_COMPARE)
   214 	$(COMPONENT_TEST_CLEANUP)
   215 	$(COMPONENT_TEST_CLEANUP)
   221 		$(COMPONENT_TEST_CMD) $(COMPONENT_TEST_ARGS))
   222 		$(COMPONENT_TEST_CMD) $(COMPONENT_TEST_ARGS))
   222 	$(COMPONENT_POST_TEST_ACTION)
   223 	$(COMPONENT_POST_TEST_ACTION)
   223 	$(COMPONENT_TEST_CLEANUP)
   224 	$(COMPONENT_TEST_CLEANUP)
   224 	$(TOUCH) $@
   225 	$(TOUCH) $@
   225 
   226 
   226 # test the installed system
   227 # Test the installed packages.  If the output file shows up in the environment
       
   228 # or arguments, don't redirect stdout/stderr to it.
   227 $(BUILD_DIR)/%/.system-tested-and-compared:    $(COMPONENT_SYSTEM_TEST_DEP)
   229 $(BUILD_DIR)/%/.system-tested-and-compared:    $(COMPONENT_SYSTEM_TEST_DEP)
   228 	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
   230 	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
   229 	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
   231 	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
   230 	$(RM) -rf $(@D)
   232 	$(RM) -rf $(@D)
   231 	$(MKDIR) $(@D)
   233 	$(MKDIR) $(@D)
   232 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
   234 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
   233 	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
   235 	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
   234 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
   236 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
   235 		$(COMPONENT_SYSTEM_TEST_CMD) $(COMPONENT_SYSTEM_TEST_ARGS)) \
   237 		$(COMPONENT_SYSTEM_TEST_CMD) $(COMPONENT_SYSTEM_TEST_ARGS)) \
   236 		&> $(COMPONENT_TEST_OUTPUT)
   238 		$(if $(findstring $(COMPONENT_TEST_OUTPUT),$(COMPONENT_SYSTEM_TEST_ENV)$(COMPONENT_SYSTEM_TEST_ARGS)),,&> $(COMPONENT_TEST_OUTPUT))
   237 	$(COMPONENT_POST_SYSTEM_TEST_ACTION)
   239 	$(COMPONENT_POST_SYSTEM_TEST_ACTION)
   238 	$(COMPONENT_TEST_CREATE_TRANSFORMS)
   240 	$(COMPONENT_TEST_CREATE_TRANSFORMS)
   239 	$(COMPONENT_TEST_PERFORM_TRANSFORM)
   241 	$(COMPONENT_TEST_PERFORM_TRANSFORM)
   240 	$(COMPONENT_TEST_COMPARE)
   242 	$(COMPONENT_TEST_COMPARE)
   241 	$(COMPONENT_SYSTEM_TEST_CLEANUP)
   243 	$(COMPONENT_SYSTEM_TEST_CLEANUP)