make-rules/attpackagemake.mk
changeset 4393 963a977eeb62
parent 4305 90493abe0c5c
child 5129 5431772f7235
equal deleted inserted replaced
4392:bc0af00a3a4a 4393:963a977eeb62
   115 		$(COMPONENT_TEST_ARGS)
   115 		$(COMPONENT_TEST_ARGS)
   116 	$(COMPONENT_POST_TEST_ACTION)
   116 	$(COMPONENT_POST_TEST_ACTION)
   117 	$(COMPONENT_TEST_CLEANUP)
   117 	$(COMPONENT_TEST_CLEANUP)
   118 	$(TOUCH) $@
   118 	$(TOUCH) $@
   119 
   119 
   120 # test the installed packages
   120 # Test the installed packages.  The targets above depend on .built which
       
   121 # means $(CLONEY) has already run.  System-test needs cloning but not
       
   122 # building; thus ideally, we would want to depend on .cloned here and below,
       
   123 # but since we don't have that, we depend on .prep and run $(CLONEY) here.
   121 $(BUILD_DIR)/%/.system-tested-and-compared:    $(SOURCE_DIR)/.prep
   124 $(BUILD_DIR)/%/.system-tested-and-compared:    $(SOURCE_DIR)/.prep
   122 	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
   125 	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
   123 	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
   126 	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
       
   127 	$(CLONEY) $(SOURCE_DIR) $(@D)
   124 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
   128 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
   125 	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
   129 	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
   126 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
   130 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
   127 		bin/package test $(COMPONENT_SYSTEM_TEST_TARGETS) \
   131 		bin/package test $(COMPONENT_SYSTEM_TEST_TARGETS) \
   128 		$(COMPONENT_SYSTEM_TEST_ARGS) \
   132 		$(COMPONENT_SYSTEM_TEST_ARGS) \
   133 	$(COMPONENT_TEST_COMPARE)
   137 	$(COMPONENT_TEST_COMPARE)
   134 	$(COMPONENT_SYSTEM_TEST_CLEANUP)
   138 	$(COMPONENT_SYSTEM_TEST_CLEANUP)
   135 	$(TOUCH) $@
   139 	$(TOUCH) $@
   136 
   140 
   137 $(BUILD_DIR)/%/.system-tested:    $(SOURCE_DIR)/.prep
   141 $(BUILD_DIR)/%/.system-tested:    $(SOURCE_DIR)/.prep
       
   142 	$(CLONEY) $(SOURCE_DIR) $(@D)
   138 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
   143 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
   139 	cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
   144 	cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
   140 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
   145 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
   141 		bin/package test $(COMPONENT_SYSTEM_TEST_TARGETS) \
   146 		bin/package test $(COMPONENT_SYSTEM_TEST_TARGETS) \
   142 		$(COMPONENT_SYSTEM_TEST_ARGS)
   147 		$(COMPONENT_SYSTEM_TEST_ARGS)