changeset 11887:decd90cdad6f

8139700: compiler/jvmci/compilerToVM/DisassembleCodeBlobTest and InvalidateInstalledCodeTest timeout Reviewed-by: kvn
author dpochepk
date Sat, 20 Aug 2016 00:15:45 +0300
parents e0a8f4132724
children 89151398365e
files test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java	Fri Aug 19 08:34:30 2016 +0200
+++ b/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java	Sat Aug 20 00:15:45 2016 +0300
@@ -107,6 +107,12 @@
     }
 
     public NMethod compile(int level) {
+        String directive = "[{ match: \"" + executable.getDeclaringClass().getName().replace('.', '/')
+                + "." + (executable instanceof Constructor ? "<init>" : executable.getName())
+                + "\", " + "BackgroundCompilation: false }]";
+        if (WB.addCompilerDirective(directive) != 1) {
+            throw new Error("Failed to add compiler directive: " + directive);
+        }
         boolean enqueued = WB.enqueueMethodForCompilation(executable,
                 level, bci);
         if (!enqueued) {
--- a/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java	Fri Aug 19 08:34:30 2016 +0200
+++ b/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java	Sat Aug 20 00:15:45 2016 +0300
@@ -34,7 +34,6 @@
  *          jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.code
  *
- * @ignore 8139700
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
  *        compiler.jvmci.compilerToVM.DisassembleCodeBlobTest
--- a/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	Fri Aug 19 08:34:30 2016 +0200
+++ b/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	Sat Aug 20 00:15:45 2016 +0300
@@ -35,7 +35,7 @@
  *          jdk.vm.ci/jdk.vm.ci.code
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *
- * @ignore 8139700
+ * @ignore 8163894
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.InvalidateInstalledCodeTest
  * @build sun.hotspot.WhiteBox