make/Main.gmk

@  rev 2383 : 8222737: [TESTBUG] Allow for tier 1 like testing in OpenJDK 8u
|  Reviewed-by: duke
~

*** 170,184 ****
--- 170,190 ----
  bootcycle-images: images bootcycle-images-only
  bootcycle-images-only: start-make
          @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
          @($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
  
+ # If the tests produced a $(TEST)_exitcode.txt file, use the number in that
+ # file for the exit code of the "make test" invocation.
  test: images test-only
  test-only: start-make
          @$(call TargetEnter)
          @($(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
          @$(call TargetExit)
+         @(if [ -r $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt ]; then \
+                 EXIT=$$($(CAT) $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt); \
+                 exit $${EXIT}; \
+           fi)
  
  # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
  # used to track the exact sources used to build that image.
  source-tips: $(OUTPUT_ROOT)/source_tips
  $(OUTPUT_ROOT)/source_tips: FRC