Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed _NT_SYMBOL_PATH on windows ihse-runtestprebuilt-branch
authorerikj
Fri, 12 Oct 2018 17:45:44 -0700
branchihse-runtestprebuilt-branch
changeset 56964 ec6411b451d8
parent 56956 a05fd2db5721
child 56968 de6373676c08
Fixed _NT_SYMBOL_PATH on windows
make/RunTestsPrebuiltSpec.gmk file | annotate | diff | comparison | revisions
make/conf/jib-profiles.js file | annotate | diff | comparison | revisions 
--- a/make/RunTestsPrebuiltSpec.gmk	Thu Oct 11 14:44:23 2018 -0700
+++ b/make/RunTestsPrebuiltSpec.gmk	Fri Oct 12 17:45:44 2018 -0700
@@ -124,7 +124,7 @@
 JMOD := $(FIXPATH) $(JMOD_CMD)
 JARSIGNER := $(FIXPATH) $(JARSIGNER_CMD)
 
-BUILD_JAVA := $(JAVA)
+BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
 # Some common tools. Assume most common name and no path.
 AWK := awk
--- a/make/conf/jib-profiles.js	Thu Oct 11 14:44:23 2018 -0700
+++ b/make/conf/jib-profiles.js	Fri Oct 12 17:45:44 2018 -0700
@@ -801,7 +801,7 @@
         windowsRunTestPrebuiltExtra = {
             dependencies: [ testedProfile + ".jdk_symbols" ],
             environment: {
-                "PRODUCT_SYMBOLS_HOME": input.get(testedProfile + ".jdk_symbols", "home_path"),
+                "SYMBOLS_IMAGE_DIR": input.get(testedProfile + ".jdk_symbols", "home_path"),
             }
         };
         profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"],
jdk-sandbox