diff -r 2c1ef6ec9413 -r 6fcc8de719f5 test/tools/javap/T6622260.java
--- a/test/tools/javap/T6622260.java	Thu Oct 16 07:39:53 2008 -0700
+++ b/test/tools/javap/T6622260.java	Thu Oct 16 18:07:37 2008 +0100
@@ -189,10 +189,7 @@
 
     void verify(String output) {
         System.out.println(output);
-        if (output.startsWith("Classfile")) {
-            // make sure to ignore filename
-            output = output.substring(output.indexOf('\n'));
-        }
+        output = output.substring(output.indexOf("Test.java"));
         if (output.indexOf("-") >= 0)
             throw new Error("- found in output");
         if (output.indexOf("FFFFFF") >= 0)