make/Main.gmk

*** 382,394 ****
              test-image-jdk-jtreg-native)
  
  build-test-lib:
          +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk)
  
  ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
      test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
!     test-image-jdk-jtreg-native build-test-lib
  
  ################################################################################
  # Run tests
  
  # Run tests specified by $(TEST), or the default test set.
--- 382,407 ----
              test-image-jdk-jtreg-native)
  
  build-test-lib:
          +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk)
  
+ build-test-failure-handler:
+         +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
+             -f BuildFailureHandler.gmk build)
+ 
+ test-failure-handler:
+         +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
+             -f BuildFailureHandler.gmk test)
+ 
+ test-image-failure-handler:
+         +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
+              -f BuildFailureHandler.gmk images)
+ 
  ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
      test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
!     test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \
!     test-failure-handler test-image-failure-handler
  
  ################################################################################
  # Run tests
  
  # Run tests specified by $(TEST), or the default test set.
*** 579,588 ****
--- 592,607 ----
  
    test-make: clean-test-make
  
    build-test-lib: java
  
+   build-test-failure-handler: interim-langtools
+ 
+   test-failure-handler: build-test-failure-handler
+ 
+   test-image-failure-handler: build-test-failure-handler
+ 
    build-test-hotspot-jtreg-native: buildtools-jdk
  
    build-test-jdk-jtreg-native: buildtools-jdk
  
    test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
*** 668,678 ****
  # This target builds the documentation image
  docs-image: docs-javadoc docs-jvmtidoc
  
  # This target builds the test image
  test-image: prepare-test-image test-image-hotspot-jtreg-native \
!     test-image-jdk-jtreg-native
  
  # all-images is the top-most target, it builds all our deliverables ("images").
  all-images: product-images test-image docs-image
  
  ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \
--- 687,697 ----
  # This target builds the documentation image
  docs-image: docs-javadoc docs-jvmtidoc
  
  # This target builds the test image
  test-image: prepare-test-image test-image-hotspot-jtreg-native \
!     test-image-jdk-jtreg-native test-image-failure-handler
  
  # all-images is the top-most target, it builds all our deliverables ("images").
  all-images: product-images test-image docs-image
  
  ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \