# HG changeset patch
# User ehelin
# Date 1418654544 -3600
#      Mon Dec 15 15:42:24 2014 +0100
# Node ID 26effaeccc317a271f9f0c6154e71cbd8fa5a875
# Parent  fed09f6c37111e76b0e9f27838a9ef9f87c8c930
8067442: Tests using -Xshare:dump does not work with 'make test'

diff --git a/make/Main.gmk b/make/Main.gmk
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -252,17 +252,17 @@ docs-jvmtidoc:
 
 ALL_TARGETS += docs-javadoc docs-jvmtidoc
 
 ################################################################################
 # Test target
 
 test:
 	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
-	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_OUTPUTDIR) \
+	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) \
 	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
 
 test-make:
 	($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
 
 ALL_TARGETS += test test-make
 
 ################################################################################
@@ -389,17 +389,17 @@ else
   mac-bundles: jimages
 
   bootcycle-images: jimages
 
   docs-javadoc: gensrc rmic
 
   docs-jvmtidoc: hotspot
 
-  test: exploded-image
+  test: jimages
 
   verify-modules: exploded-image
 
 endif
 
 ################################################################################
 # Virtual targets without recipes