common/makefiles/Main.gmk

Print this page
rev 902 : 8020779: Improve detection and handling of jtreg/jtdiff executable path
8026988: Makefile is confused if JT_HOME is a different location than jtreg executable
Reviewed-by: duke

@@ -177,11 +177,11 @@
         @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
 
 test: images test-only
 test-only: start-make
         @$(call TargetEnter)
-        @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
+        @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JTREG="$(JTREG)" JTDIFF="$(JTDIFF)" PRODUCT_HOME="$(JDK_IMAGE_DIR)" ALT_OUTPUTDIR="$(OUTPUT_ROOT)" CONCURRENCY=$(JOBS) $(TEST)) || true
         @$(call TargetExit)
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
 # used to track the exact sources used to build that image.
 source-tips: $(OUTPUT_ROOT)/source_tips