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.
8140453: compiler control test failed with RuntimeException: CompileCommand: nonexistent missing
authorppunegov
Wed, 28 Oct 2015 16:26:42 +0300
changeset 33475 3dc9257e9d0f
parent 33474 6a1f70c3c73e
child 33476 539f03d50dab
8140453: compiler control test failed with RuntimeException: CompileCommand: nonexistent missing Summary: Replace incorrect check for validity of method pattern with full command check Reviewed-by: kvn
hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java file | annotate | diff | comparison | revisions
hotspot/test/compiler/compilercontrol/share/processors/QuietProcessor.java file | annotate | diff | comparison | revisions 
--- a/hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java	Wed Oct 28 16:00:54 2015 +0300
+++ b/hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java	Wed Oct 28 16:26:42 2015 +0300
@@ -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 16:00:54 2015 +0300
+++ b/hotspot/test/compiler/compilercontrol/share/processors/QuietProcessor.java	Wed Oct 28 16:26:42 2015 +0300
@@ -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 {
jdk-sandbox