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.
Merge
authoriklam
Tue, 17 Oct 2017 22:02:10 +0000 (2017-10-17)
changeset 47640 7852e65127e4
parent 47638 cccfa7339755 (diff)
parent 47639 ad6a219f8b95 (current diff)
child 47643 51a922ce7c4a
Merge
--- a/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Tue Oct 17 14:06:36 2017 -0700
+++ b/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Tue Oct 17 22:02:10 2017 +0000
@@ -1093,7 +1093,7 @@
     },
 
     "jdk.tools.jaotc.test" : {
-      "subDir" : "../../test/compiler/aot",
+      "subDir" : "../../test/hotspot/jtreg/compiler/aot",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "mx:JUNIT",
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh	Tue Oct 17 14:06:36 2017 -0700
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh	Tue Oct 17 22:02:10 2017 +0000
@@ -108,7 +108,7 @@
 done
 
 NAME="jvmci"
-DIR="$DIR/../../../../src/jdk.internal.vm.ci"
+DIR="$DIR/../../../../../../src/jdk.internal.vm.ci"
 FILES=`find $DIR -type f -name '*.java'`
 COUNT=`find $DIR -type f -name '*.java' | wc -l`
jdk-sandbox