changeset 1311:b198e38d6e61

7901641: org/openjdk/jmh/it/ccontrol/CompilerControlExcludeActualTest fails in recent JDK 9, due to Compiler Control changes
author shade
date Mon, 28 Mar 2016 17:41:15 +0300
parents f4e8d0d61f1f
children d74b2861222c
files jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlExcludeActualTest.java
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlExcludeActualTest.java	Thu Jan 14 23:28:31 2016 +0300
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlExcludeActualTest.java	Mon Mar 28 17:41:15 2016 +0300
@@ -73,9 +73,15 @@
 
             if (CompilerControlUtils.check(runResult, "@", "callee")) { // Poor man's check -XX:+PrintInlining works
                 Assert.assertTrue("Failed with " + mode,
-                        CompilerControlUtils.check(runResult, this.getClass().getName() + "::compilerControlSpecimen", "excluded by"));
+                         CompilerControlUtils.check(runResult, this.getClass().getName() + "::compilerControlSpecimen", "excluded by") ||
+                         CompilerControlUtils.check(runResult, this.getClass().getName() + "::compilerControlSpecimen", "not compilable") ||
+                         CompilerControlUtils.check(runResult, this.getClass().getName() + "::compilerControlSpecimen", "disallowed by CompileCommand")
+                );
                 Assert.assertTrue("Failed with " + mode,
-                        CompilerControlUtils.check(runResult, this.getClass().getName() + "::strawMethod", "excluded by"));
+                        CompilerControlUtils.check(runResult, this.getClass().getName() + "::strawMethod", "excluded by") ||
+                        CompilerControlUtils.check(runResult, this.getClass().getName() + "::strawMethod", "not compilable") ||
+                        CompilerControlUtils.check(runResult, this.getClass().getName() + "::strawMethod", "disallowed by CompileCommand")
+                );
             }
         }
     }