make/Main.gmk

rev 2039 : [mq]: 8148244

*** 390,399 ****
--- 390,402 ----
  
  test-image-jdk-jtreg-native:
          +($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
              test-image-jdk-jtreg-native)
  
+ test-image-hotspot-gtest:
+         +($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk)
+ 
  build-test-lib:
          +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk)
  
  ifeq ($(BUILD_FAILURE_HANDLER), true)
    # Builds the failure handler jtreg extension
*** 413,423 ****
  endif
  
  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.
--- 416,426 ----
  endif
  
  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 test-image-hotspot-gtest
  
  ################################################################################
  # Run tests
  
  # Run tests specified by $(TEST), or the default test set.
*** 624,633 ****
--- 627,638 ----
  
    test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
  
    test-image-jdk-jtreg-native: build-test-jdk-jtreg-native
  
+   test-image-hotspot-gtest: hotspot
+ 
    test-hotspot-internal: exploded-image
  
    test-hotspot-jtreg: jimages test-image
  
    install: product-images
*** 705,715 ****
  # This target builds the documentation image
  docs-image: zip-docs
  
  # 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 \
--- 710,720 ----
  # This target builds the documentation image
  docs-image: zip-docs
  
  # 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 test-image-hotspot-gtest
  
  # 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 \