--- a/src/hotspot/.mx.jvmci/mx_jvmci.py Wed Oct 11 23:29:24 2017 +0900
+++ b/src/hotspot/.mx.jvmci/mx_jvmci.py Thu Oct 12 01:18:38 2017 +0000
@@ -256,14 +256,10 @@
"""
roots = [
- 'ASSEMBLY_EXCEPTION',
- 'LICENSE',
- 'README',
- 'THIRD_PARTY_README',
- 'agent',
- 'make',
- 'src',
- 'test'
+ 'cpu',
+ 'os',
+ 'os_cpu',
+ 'share'
]
for jvmVariant in _jdkJvmVariants:
@@ -605,6 +601,16 @@
def _get_openjdk_os_cpu():
return _get_openjdk_os() + '-' + _get_openjdk_cpu()
+def _get_jdk_dir():
+ suiteParentDir = dirname(_suite.dir)
+ # suitParentDir is now something like: /some_prefix/jdk10-hs/open/src
+ pathComponents = suiteParentDir.split(os.sep)
+ for i in range(0, len(pathComponents)):
+ if pathComponents[i] in ["open", "src"]:
+ del pathComponents[i:]
+ break
+ return os.path.join(os.sep, *pathComponents)
+
def _get_jdk_build_dir(debugLevel=None):
"""
Gets the directory into which the JDK is built. This directory contains
@@ -613,7 +619,7 @@
if debugLevel is None:
debugLevel = _vm.debugLevel
name = '{}-{}-{}-{}'.format(_get_openjdk_os_cpu(), 'normal', _vm.jvmVariant, debugLevel)
- return join(dirname(_suite.dir), 'build', name)
+ return join(_get_jdk_dir(), 'build', name)
_jvmci_bootclasspath_prepends = []
--- a/src/hotspot/.mx.jvmci/suite.py Wed Oct 11 23:29:24 2017 +0900
+++ b/src/hotspot/.mx.jvmci/suite.py Thu Oct 12 01:18:38 2017 +0000
@@ -24,9 +24,7 @@
"defaultLicense" : "GPLv2-CPE",
- # This puts mx/ as a sibling of the JDK build configuration directories
- # (e.g., macosx-x86_64-normal-server-release).
- "outputRoot" : "../build/mx/hotspot",
+ "outputRoot" : "../../build/mx/hotspot",
# ------------- Libraries -------------
@@ -43,7 +41,7 @@
# ------------- JVMCI:Service -------------
"jdk.vm.ci.services" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"javaCompliance" : "9",
"workingSets" : "API,JVMCI",
@@ -52,7 +50,7 @@
# ------------- JVMCI:API -------------
"jdk.vm.ci.common" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "9",
@@ -60,7 +58,7 @@
},
"jdk.vm.ci.meta" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "9",
@@ -68,7 +66,7 @@
},
"jdk.vm.ci.code" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.meta"],
"checkstyle" : "jdk.vm.ci.services",
@@ -77,7 +75,7 @@
},
"jdk.vm.ci.code.test" : {
- "subDir" : "test/compiler/jvmci",
+ "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"sourceDirs" : ["src"],
"dependencies" : [
"mx:JUNIT",
@@ -92,7 +90,7 @@
},
"jdk.vm.ci.runtime" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : [
"jdk.vm.ci.code",
@@ -104,7 +102,7 @@
},
"jdk.vm.ci.runtime.test" : {
- "subDir" : "test/compiler/jvmci",
+ "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"sourceDirs" : ["src"],
"dependencies" : [
"mx:JUNIT",
@@ -119,7 +117,7 @@
# ------------- JVMCI:HotSpot -------------
"jdk.vm.ci.aarch64" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"],
"checkstyle" : "jdk.vm.ci.services",
@@ -128,7 +126,7 @@
},
"jdk.vm.ci.amd64" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"],
"checkstyle" : "jdk.vm.ci.services",
@@ -137,7 +135,7 @@
},
"jdk.vm.ci.sparc" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"],
"checkstyle" : "jdk.vm.ci.services",
@@ -146,7 +144,7 @@
},
"jdk.vm.ci.hotspot" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : [
"jdk.vm.ci.common",
@@ -163,7 +161,7 @@
},
"jdk.vm.ci.hotspot.test" : {
- "subDir" : "test/compiler/jvmci",
+ "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"sourceDirs" : ["src"],
"dependencies" : [
"TESTNG",
@@ -175,7 +173,7 @@
},
"jdk.vm.ci.hotspot.aarch64" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : [
"jdk.vm.ci.aarch64",
@@ -187,7 +185,7 @@
},
"jdk.vm.ci.hotspot.amd64" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : [
"jdk.vm.ci.amd64",
@@ -199,7 +197,7 @@
},
"jdk.vm.ci.hotspot.sparc" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : [
"jdk.vm.ci.sparc",
@@ -221,12 +219,12 @@
# ------------- Distributions -------------
"JVMCI_SERVICES" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"dependencies" : ["jdk.vm.ci.services"],
},
"JVMCI_API" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"dependencies" : [
"jdk.vm.ci.runtime",
"jdk.vm.ci.common",
@@ -240,7 +238,7 @@
},
"JVMCI_HOTSPOT" : {
- "subDir" : "src/jdk.internal.vm.ci/share/classes",
+ "subDir" : "../jdk.internal.vm.ci/share/classes",
"dependencies" : [
"jdk.vm.ci.hotspot.aarch64",
"jdk.vm.ci.hotspot.amd64",
@@ -253,7 +251,7 @@
},
"JVMCI_TEST" : {
- "subDir" : "test/compiler/jvmci",
+ "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"dependencies" : [
"jdk.vm.ci.runtime.test",
],