changeset 23224:4dd5d43dea1e

recognize -XX:+TraceClassLoading output prefixed with junit output
author Doug Simon <doug.simon@oracle.com>
date Thu, 31 Dec 2015 00:25:19 +0100
parents 7e22838663c1
children 2375d87e535d 2415a168a090
files graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java	Thu Dec 31 00:23:35 2015 +0100
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java	Thu Dec 31 00:25:19 2015 +0100
@@ -104,8 +104,9 @@
             if (VERBOSE) {
                 System.out.println(line);
             }
-            if (line.startsWith("[Loaded ")) {
-                int start = "[Loaded ".length();
+            int index = line.indexOf("[Loaded ");
+            if (index != -1) {
+                int start = index + "[Loaded ".length();
                 int end = line.indexOf(' ', start);
                 String loadedClass = line.substring(start, end);
                 if (isGraalClass(loadedClass)) {
@@ -203,6 +204,11 @@
             return true;
         }
 
+        if (OptionValue.OverrideScope.class.isAssignableFrom(cls)) {
+            // Reading options can check override scopes
+            return true;
+        }
+
         if (hotSpotVMEventListener != null && hotSpotVMEventListener.isAssignableFrom(cls)) {
             // HotSpotVMEventListeners need to be loaded on JVMCI startup.
             return true;