aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormduigou <none@none>2013-03-06 08:37:27 -0800
committermduigou <none@none>2013-03-06 08:37:27 -0800
commitebc474c1861c4dd1b3d63720d2e5feb2800193d0 (patch)
tree8eb08d9fa0ed21730b88e5de2c5095e249312d4c
parenta40dccfca36fc3df4a110c5ca46bc3bd0ac85330 (diff)
8009162: root repo "make test" target should run against image
Reviewed-by: alanb, martin, erikj --HG-- extra : rebase_source : 100fe009f58843fd891021f495a0263d0c879feb
-rw-r--r--common/makefiles/Main.gmk5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
index c43f590..2be24af 100644
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -184,9 +184,10 @@ bootcycle-images:
@$(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