# HG changeset patch
# User ehelin
# Date 1463394802 -7200
# Node ID 05e1a65c1d56d61528052712e6fbe811554ac24e
# Parent  922326ad0c94bff59a17ed62c58ad8ab29259923
8157028: Add make target for running gtest tests
Reviewed-by: erikj, jwilhelm

diff -r 922326ad0c94 -r 05e1a65c1d56 make/Main.gmk
--- a/make/Main.gmk	Wed May 18 15:04:39 2016 +0530
+++ b/make/Main.gmk	Mon May 16 12:33:22 2016 +0200
@@ -433,25 +433,28 @@
 
 # Run tests specified by $(TEST), or the default test set.
 test:
-	$(call RunTests, $(TEST))
+	$(call RunTests, $(TEST), $(JDK_IMAGE_DIR))
 
 test-hotspot-jtreg:
-	$(call RunTests, "hotspot_all")
+	$(call RunTests, "hotspot_all", $(JDK_IMAGE_DIR))
 
 test-hotspot-jtreg-native:
-	$(call RunTests, "hotspot_native_sanity")
+	$(call RunTests, "hotspot_native_sanity", $(JDK_IMAGE_DIR))
 
 test-hotspot-internal:
-	$(call RunTests, "hotspot_internal")
+	$(call RunTests, "hotspot_internal", $(JDK_OUTPUTDIR))
+
+test-hotspot-gtest:
+	$(call RunTests, "hotspot_gtest", $(JDK_OUTPUTDIR))
 
 test-jdk-jtreg-native:
-	$(call RunTests, "jdk_native_sanity")
+	$(call RunTests, "jdk_native_sanity", $(JDK_IMAGE_DIR))
 
 test-make:
 	($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
 
 ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
-    test-hotspot-internal test-jdk-jtreg-native test-make
+    test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make
 
 ################################################################################
 # Bundles
@@ -690,6 +693,8 @@
 
   test-hotspot-jtreg: jimages test-image
 
+  test-hotspot-gtest: exploded-image test-image-hotspot-gtest
+
   install: product-images
 
   product-bundles: product-images
diff -r 922326ad0c94 -r 05e1a65c1d56 make/MainSupport.gmk
--- a/make/MainSupport.gmk	Wed May 18 15:04:39 2016 +0530
+++ b/make/MainSupport.gmk	Mon May 16 12:33:22 2016 +0200
@@ -30,10 +30,10 @@
 ifndef _MAINSUPPORT_GMK
 _MAINSUPPORT_GMK := 1
 
-# Run the tests specified by $1.
+# Run the tests specified by $1, with PRODUCT_HOME specified by $2
 define RunTests
 	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
-	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) \
+	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(strip $2) \
 	    TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \
 	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) TEST_JOBS=$(TEST_JOBS) \
 	    JOBS=$(JOBS) $1) || true