1.1 --- a/make/Main.gmk Sat Nov 09 20:15:27 2019 +0800
1.2 +++ b/make/Main.gmk Sat Nov 09 20:29:44 2019 +0800
1.3 @@ -172,11 +172,17 @@
1.4 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
1.5 @($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
1.6
1.7 +# If the tests produced a $(TEST)_exitcode.txt file, use the number in that
1.8 +# file for the exit code of the "make test" invocation.
1.9 test: images test-only
1.10 test-only: start-make
1.11 @$(call TargetEnter)
1.12 @($(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
1.13 @$(call TargetExit)
1.14 + @(if [ -r $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt ]; then \
1.15 + EXIT=$$($(CAT) $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt); \
1.16 + exit $${EXIT}; \
1.17 + fi)
1.18
1.19 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
1.20 # used to track the exact sources used to build that image.
