8144621: CompilerControl: inline tests timeout with Xcomp
Summary: Restrict patterns that lead to timeout
Reviewed-by: kvn, neliasso
--- a/hotspot/test/compiler/compilercontrol/share/AbstractTestBase.java Wed Feb 17 09:57:10 2016 -0800
+++ b/hotspot/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;