--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/compilercontrol/parser/DirectiveParser.java Wed Oct 28 16:01:45 2015 +0000
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8137167
+ * @summary Tests directive json parser
+ * @library /testlibrary /../../test/lib ../share /
+ * @run driver compiler.compilercontrol.parser.DirectiveParser
+ */
+
+package compiler.compilercontrol.parser;
+
+import compiler.compilercontrol.share.JSONFile;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.ProcessTools;
+import jdk.test.lib.Utils;
+
+public class DirectiveParser {
+ private static final String ERROR_MSG = "VM should exit with error "
+ + "on incorrect JSON file: ";
+ private static final String EXPECTED_ERROR_STRING = "Parsing of compiler"
+ + " directives failed";
+
+ public static void main(String[] args) {
+ simpleTest();
+ nonMatchingBrackets();
+ arrayTest();
+ emptyObjectTest();
+ emptyFile();
+ noFile();
+ directory();
+ }
+
+ private static void simpleTest() {
+ String fileName = "simple.json";
+ try (JSONFile file = new JSONFile(fileName)) {
+ file.write(JSONFile.Element.ARRAY)
+ .write(JSONFile.Element.OBJECT)
+ .write(JSONFile.Element.PAIR, "match")
+ .write(JSONFile.Element.VALUE, "\"java/lang/String.*\"")
+ .write(JSONFile.Element.PAIR, "c2")
+ .write(JSONFile.Element.OBJECT)
+ .write(JSONFile.Element.PAIR, "inline")
+ .write(JSONFile.Element.ARRAY)
+ .write(JSONFile.Element.VALUE, "\"+*.indexOf\"")
+ .write(JSONFile.Element.VALUE, "\"-a.b\"")
+ .end()
+ .end()
+ .end() // end object
+ .write(JSONFile.Element.OBJECT)
+ .write(JSONFile.Element.PAIR, "match")
+ .write(JSONFile.Element.VALUE, "\"*.indexOf\"")
+ .write(JSONFile.Element.PAIR, "c1")
+ .write(JSONFile.Element.OBJECT)
+ .write(JSONFile.Element.PAIR, "enable")
+ .write(JSONFile.Element.VALUE, "false")
+ .end()
+ .end(); // end object
+ file.end();
+ }
+ OutputAnalyzer output = execute(fileName);
+ output.shouldHaveExitValue(0);
+ output.shouldNotContain(EXPECTED_ERROR_STRING);
+ }
+
+ private static void nonMatchingBrackets() {
+ String fileName = "non-matching.json";
+ try (JSONFile file = new JSONFile(fileName)) {
+ file.write(JSONFile.Element.ARRAY)
+ .write(JSONFile.Element.OBJECT)
+ .write(JSONFile.Element.PAIR, "match")
+ .write(JSONFile.Element.VALUE, "\"java/lang/String.*\"")
+ .end();
+ // don't write matching }
+ }
+ OutputAnalyzer output = execute(fileName);
+ Asserts.assertNE(output.getExitValue(), 0, ERROR_MSG + "non matching "
+ + "brackets");
+ output.shouldContain(EXPECTED_ERROR_STRING);
+ }
+
+ private static void arrayTest() {
+ String fileName = "array.json";
+ try (JSONFile file = new JSONFile(fileName)) {
+ file.write(JSONFile.Element.ARRAY);
+ file.end();
+ }
+ OutputAnalyzer output = execute(fileName);
+ Asserts.assertNE(output.getExitValue(), 0, ERROR_MSG + "empty array");
+ }
+
+ private static void emptyObjectTest() {
+ String fileName = "emptyObject.json";
+ try (JSONFile file = new JSONFile(fileName)) {
+ file.write(JSONFile.Element.OBJECT);
+ file.end();
+ }
+ OutputAnalyzer output = execute(fileName);
+ Asserts.assertNE(output.getExitValue(), 0, ERROR_MSG + "empty object "
+ + "without any match");
+ output.shouldContain(EXPECTED_ERROR_STRING);
+ }
+
+ private static void emptyFile() {
+ String fileName = "empty.json";
+ try (JSONFile file = new JSONFile(fileName)) {
+ // empty
+ }
+ OutputAnalyzer output = execute(fileName);
+ Asserts.assertNE(output.getExitValue(), 0, ERROR_MSG + "empty file");
+ output.shouldContain(EXPECTED_ERROR_STRING);
+ }
+
+ private static void noFile() {
+ OutputAnalyzer output = execute("nonexistent.json");
+ Asserts.assertNE(output.getExitValue(), 0, ERROR_MSG + "non existing "
+ + "file");
+ }
+
+ private static void directory() {
+ OutputAnalyzer output = execute(Utils.TEST_SRC);
+ Asserts.assertNE(output.getExitValue(), 0, ERROR_MSG + "directory as "
+ + "a name");
+ }
+
+ private static OutputAnalyzer execute(String fileName) {
+ OutputAnalyzer output;
+ try {
+ output = ProcessTools.executeTestJvm(
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:CompilerDirectivesFile=" + fileName,
+ "-version");
+ } catch (Throwable thr) {
+ throw new Error("Execution failed", thr);
+ }
+ return output;
+ }
+}
--- a/hotspot/test/compiler/compilercontrol/share/actions/CompileAction.java Wed Oct 28 15:15:59 2015 +0100
+++ b/hotspot/test/compiler/compilercontrol/share/actions/CompileAction.java Wed Oct 28 16:01:45 2015 +0000
@@ -79,10 +79,10 @@
return !WHITE_BOX.isMethodQueuedForCompilation(executable);
}, 100L);
execute(executable);
- boolean isCompiled = WHITE_BOX.isMethodCompiled(executable);
- Asserts.assertEQ(isCompiled, expectedCompiled,
- String.format("FAILED: method %s compiled: %b, but should: %b"
- + " on required level: %d", executable, isCompiled,
+ boolean isCompilable = WHITE_BOX.isMethodCompilable(executable, level);
+ Asserts.assertEQ(isCompilable, expectedCompiled,
+ String.format("FAILED: method %s compilable: %b, but should: %b"
+ + " on required level: %d", executable, isCompilable,
expectedCompiled, level));
}
--- a/hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java Wed Oct 28 15:15:59 2015 +0100
+++ b/hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java Wed Oct 28 16:01:45 2015 +0000
@@ -23,8 +23,6 @@
package compiler.compilercontrol.share.processors;
-import compiler.compilercontrol.share.method.MethodDescriptor;
-import compiler.compilercontrol.share.scenario.Command;
import compiler.compilercontrol.share.scenario.CompileCommand;
import jdk.test.lib.OutputAnalyzer;
@@ -44,12 +42,10 @@
@Override
public void accept(OutputAnalyzer outputAnalyzer) {
for (CompileCommand command : commands) {
- MethodDescriptor methodDescriptor = command.methodDescriptor;
- if (methodDescriptor.isValid()) {
- Command cmd = command.command;
- String method = methodDescriptor.getCanonicalString();
- outputAnalyzer.shouldContain("CompileCommand: " + cmd.name
- + " " + method);
+ if (command.isValid()) {
+ outputAnalyzer.shouldContain("CompileCommand: "
+ + command.command.name + " "
+ + command.methodDescriptor.getCanonicalString());
outputAnalyzer.shouldNotContain("CompileCommand: An error "
+ "occurred during parsing");
} else {
--- a/hotspot/test/compiler/compilercontrol/share/processors/QuietProcessor.java Wed Oct 28 15:15:59 2015 +0100
+++ b/hotspot/test/compiler/compilercontrol/share/processors/QuietProcessor.java Wed Oct 28 16:01:45 2015 +0000
@@ -23,8 +23,6 @@
package compiler.compilercontrol.share.processors;
-import compiler.compilercontrol.share.method.MethodDescriptor;
-import compiler.compilercontrol.share.scenario.Command;
import compiler.compilercontrol.share.scenario.CompileCommand;
import jdk.test.lib.OutputAnalyzer;
@@ -41,12 +39,10 @@
@Override
public void accept(OutputAnalyzer outputAnalyzer) {
for (CompileCommand command : commands) {
- MethodDescriptor methodDescriptor = command.methodDescriptor;
- if (methodDescriptor.isValid()) {
- Command cmd = command.command;
- String method = methodDescriptor.getCanonicalString();
+ if (command.isValid()) {
outputAnalyzer.shouldNotContain("CompileCommand: "
- + cmd.name + " " + method);
+ + command.command.name + " "
+ + command.methodDescriptor.getCanonicalString());
outputAnalyzer.shouldNotContain("CompileCommand: An error "
+ "occurred during parsing");
} else {
--- a/hotspot/test/testlibrary/jdk/test/lib/Utils.java Wed Oct 28 15:15:59 2015 +0100
+++ b/hotspot/test/testlibrary/jdk/test/lib/Utils.java Wed Oct 28 16:01:45 2015 +0000
@@ -78,7 +78,7 @@
/**
* Returns the value of 'test.src' system property.
*/
- public static final String TEST_SRC = System.getProperty("test.src", "").trim();
+ public static final String TEST_SRC = System.getProperty("test.src", ".").trim();
private static Unsafe unsafe = null;