make/Main.gmk
changeset 37031 e90042bf422d
parent 36789 46a9456815a3
child 37034 b63fd4af003e
child 37406 ffe907153695
equal deleted inserted replaced
37030:e047c2f3f510 37031:e90042bf422d
   383 	    test-image-jdk-jtreg-native)
   383 	    test-image-jdk-jtreg-native)
   384 
   384 
   385 build-test-lib:
   385 build-test-lib:
   386 	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk)
   386 	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk)
   387 
   387 
       
   388 # Builds the failure handler jtreg extension
       
   389 build-test-failure-handler:
       
   390 	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
       
   391 	    -f BuildFailureHandler.gmk build)
       
   392 
       
   393 # Runs the tests for the failure handler jtreg extension
       
   394 test-failure-handler:
       
   395 	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
       
   396 	    -f BuildFailureHandler.gmk test)
       
   397 
       
   398 # Copies the failure handler jtreg extension into the test image
       
   399 test-image-failure-handler:
       
   400 	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
       
   401 	     -f BuildFailureHandler.gmk images)
       
   402 
   388 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
   403 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
   389     test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
   404     test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
   390     test-image-jdk-jtreg-native build-test-lib
   405     test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \
       
   406     test-failure-handler test-image-failure-handler
   391 
   407 
   392 ################################################################################
   408 ################################################################################
   393 # Run tests
   409 # Run tests
   394 
   410 
   395 # Run tests specified by $(TEST), or the default test set.
   411 # Run tests specified by $(TEST), or the default test set.
   579   create-buildjdk-compile-modules: create-buildjdk-copy create-buildjdk-compile-hotspot
   595   create-buildjdk-compile-modules: create-buildjdk-copy create-buildjdk-compile-hotspot
   580 
   596 
   581   test-make: clean-test-make
   597   test-make: clean-test-make
   582 
   598 
   583   build-test-lib: java
   599   build-test-lib: java
       
   600 
       
   601   build-test-failure-handler: interim-langtools
       
   602 
       
   603   test-failure-handler: build-test-failure-handler
       
   604 
       
   605   test-image-failure-handler: build-test-failure-handler
   584 
   606 
   585   build-test-hotspot-jtreg-native: buildtools-jdk
   607   build-test-hotspot-jtreg-native: buildtools-jdk
   586 
   608 
   587   build-test-jdk-jtreg-native: buildtools-jdk
   609   build-test-jdk-jtreg-native: buildtools-jdk
   588 
   610 
   669 # This target builds the documentation image
   691 # This target builds the documentation image
   670 docs-image: docs-javadoc docs-jvmtidoc
   692 docs-image: docs-javadoc docs-jvmtidoc
   671 
   693 
   672 # This target builds the test image
   694 # This target builds the test image
   673 test-image: prepare-test-image test-image-hotspot-jtreg-native \
   695 test-image: prepare-test-image test-image-hotspot-jtreg-native \
   674     test-image-jdk-jtreg-native
   696     test-image-jdk-jtreg-native test-image-failure-handler
   675 
   697 
   676 # all-images is the top-most target, it builds all our deliverables ("images").
   698 # all-images is the top-most target, it builds all our deliverables ("images").
   677 all-images: product-images test-image docs-image
   699 all-images: product-images test-image docs-image
   678 
   700 
   679 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \
   701 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \