make/Main.gmk

changeset 2458
daa47f8cf745
parent 2438
f4b08401e50d
parent 2447
ef851705e3e1
child 2556
76a0f827e163
equal deleted inserted replaced
2440:320af913b4de 2458:daa47f8cf745
170 bootcycle-images: images bootcycle-images-only 170 bootcycle-images: images bootcycle-images-only
171 bootcycle-images-only: start-make 171 bootcycle-images-only: start-make
172 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image 172 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
173 @($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images) 173 @($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
174 174
175 # If the tests produced a $(TEST)_exitcode.txt file, use the number in that
176 # file for the exit code of the "make test" invocation.
175 test: images test-only 177 test: images test-only
176 test-only: start-make 178 test-only: start-make
177 @$(call TargetEnter) 179 @$(call TargetEnter)
178 @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true 180 @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
179 @$(call TargetExit) 181 @$(call TargetExit)
182 @(if [ -r $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt ]; then \
183 EXIT=$$($(CAT) $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt); \
184 exit $${EXIT}; \
185 fi)
180 186
181 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be 187 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
182 # used to track the exact sources used to build that image. 188 # used to track the exact sources used to build that image.
183 source-tips: $(OUTPUT_ROOT)/source_tips 189 source-tips: $(OUTPUT_ROOT)/source_tips
184 $(OUTPUT_ROOT)/source_tips: FRC 190 $(OUTPUT_ROOT)/source_tips: FRC

mercurial