# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1451517919 -3600
# Node ID 4dd5d43dea1e9311f2276d38d7a34914c11e2486
# Parent  7e22838663c1ac8f6e2e1330bc43ceec6481a446
recognize -XX:+TraceClassLoading output prefixed with junit output

diff -r 7e22838663c1 -r 4dd5d43dea1e graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java
--- 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;