# HG changeset patch
# User mduigou
# Date 1362587847 28800
# Node ID b35d986ff2760a6b3b6393b549560250f46e84da
# Parent  929e2461818bc45dc35c000b81494b5e5d7ee42e
8009162: root repo "make test" target should run against image
Reviewed-by: alanb, martin, erikj

diff -r 929e2461818b -r b35d986ff276 common/makefiles/Main.gmk
--- a/common/makefiles/Main.gmk	Tue Mar 05 22:45:59 2013 -0500
+++ b/common/makefiles/Main.gmk	Wed Mar 06 08:37:27 2013 -0800
@@ -184,9 +184,10 @@
 	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
 	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
 
-test: start-make
+test: images test-only
+test-only: start-make
 	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
+	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
 	@$(call TargetExit)
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be