diff -r 5bb96781fb58 -r c491eec0acc7 test/tools/javap/typeAnnotations/ArrayClassLiterals2.java
--- a/test/tools/javap/typeAnnotations/ArrayClassLiterals2.java	Thu Nov 04 15:54:46 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6918625
- * @summary javap dumps type information of array class literals
- */
-
-import java.io.*;
-
-public class ArrayClassLiterals2 {
-    public static void main(String[] args) throws Exception {
-        new ArrayClassLiterals2().run();
-    }
-
-    public void run() throws IOException {
-        File classFile = new File(System.getProperty("test.classes"), "ArrayClassLiterals2$Test.class");
-
-        verify(classFile,
-               "RuntimeInvisibleTypeAnnotations:",
-               "CLASS_LITERAL_GENERIC_OR_ARRAY"
-               );
-
-        if (errors > 0)
-            throw new Error(errors + " found.");
-    }
-
-    String javap(File f) {
-        StringWriter sw = new StringWriter();
-        PrintWriter out = new PrintWriter(sw);
-        int rc = com.sun.tools.javap.Main.run(new String[] { "-v", f.getPath() }, out);
-        if (rc != 0)
-            throw new Error("javap failed. rc=" + rc);
-        out.close();
-        return sw.toString();
-    }
-
-    void verify(File classFile, String... expects) {
-        String output = javap(classFile);
-        for (String expect: expects) {
-            if (output.indexOf(expect)< 0)
-                error(expect + " not found");
-        }
-    }
-
-    void error(String msg) {
-        System.err.println(msg);
-        errors++;
-    }
-
-    int errors;
-
-
-    /*********************** Test class *************************/
-    static class Test {
-        @interface A { }
-        void test() {
-            Object a = @A String @A [] @A [].class;
-        }
-    }
-}