changeset 10310:9900740dd51f

8144621: CompilerControl: inline tests timeout with Xcomp Summary: Restrict patterns that lead to timeout Reviewed-by: kvn, neliasso
author ppunegov
date Wed, 17 Feb 2016 17:48:56 +0300
parents cffca6de2c45
children 2c3c43037e14
files test/compiler/compilercontrol/share/AbstractTestBase.java
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/compiler/compilercontrol/share/AbstractTestBase.java	Wed Feb 17 09:57:10 2016 -0800
+++ b/test/compiler/compilercontrol/share/AbstractTestBase.java	Wed Feb 17 17:48:56 2016 +0300
@@ -51,8 +51,9 @@
         for (int i = 0; !md.isValid() && i < ATTEMPTS; i++) {
             md = METHOD_GEN.generateRandomDescriptor(exec);
         }
-        if (!md.isValid()) {
-            System.out.println("WARN: Using predefined pattern");
+        if (!md.isValid() || "any.method()".matches(md.getRegexp())) {
+            /* if we haven't got a valid pattern or it matches any method
+               leading to timeouts, then use plain standard descriptor */
             md = MethodGenerator.commandDescriptor(exec);
         }
         return md;