Mercurial > hg > jdk9-shenandoah > langtools
changeset 2919:f2888cca1153
8074408: Group 12: golden files for tests in tools/javac dir
Reviewed-by: jjg
line wrap: on
line diff
--- a/test/tools/javac/HiddenAbstractMethod/Test.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/HiddenAbstractMethod/Test.java Fri May 15 01:56:14 2015 -0700 @@ -1,3 +1,26 @@ +/* + * Copyright (c) 1998, 2015, 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 1240831 @@ -8,5 +31,5 @@ * the method has the same name, it does not override. * @author turnidge * - * @compile/fail one/Parent.java two/Child.java + * @compile/fail/ref=Test.out -XDrawDiagnostics one/Parent.java two/Child.java */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/HiddenAbstractMethod/Test.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,2 @@ +Child.java:5:8: compiler.err.does.not.override.abstract: two.Child, method(), one.Parent +1 error
--- a/test/tools/javac/HiddenAbstractMethod/one/Parent.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/HiddenAbstractMethod/one/Parent.java Fri May 15 01:56:14 2015 -0700 @@ -1,25 +1,4 @@ -/* - * Copyright (c) 1998, 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. - */ +/* /nodynamiccopyright/ */ package one;
--- a/test/tools/javac/HiddenAbstractMethod/two/Child.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/HiddenAbstractMethod/two/Child.java Fri May 15 01:56:14 2015 -0700 @@ -1,25 +1,4 @@ -/* - * Copyright (c) 1998, 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. - */ +/* /nodynamiccopyright/ */ package two;
--- a/test/tools/javac/ImportUnnamed/Dummy.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/ImportUnnamed/Dummy.java Fri May 15 01:56:14 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, 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 @@ -27,7 +27,7 @@ * @summary Correct scoping and diagnostics for import declarations. * @author gafter * - * @compile/fail foo/A.java + * @compile/fail/ref=Dummy.out -XDrawDiagnostics foo/A.java */ public class Dummy {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/ImportUnnamed/Dummy.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,2 @@ +A.java:3:13: compiler.err.expected: '.' +1 error
--- a/test/tools/javac/ImportUnnamed/foo/A.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/ImportUnnamed/foo/A.java Fri May 15 01:56:14 2015 -0700 @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2001, 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. - */ +/* /nodynamiccopyright/ */ import Dummy;
--- a/test/tools/javac/PackageClassAmbiguity/Bad.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/PackageClassAmbiguity/Bad.java Fri May 15 01:56:14 2015 -0700 @@ -1,36 +1,12 @@ /* - * Copyright (c) 1998, 2001, 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 + * @test /nodynamiccopyright/ * @bug 4101529 * @summary The compiler used to create class names which were the same as * existing package names and vice-versa. The compiler now checks * for this before creating a package or a class. * @author turnidge * - * @compile/fail Bad.java - * @compile/fail util.java + * @compile/fail/ref=Bad.out -XDrawDiagnostics Bad.java */ package java.lang.String;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/PackageClassAmbiguity/Bad.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,2 @@ +Bad.java:12:1: compiler.err.pkg.clashes.with.class.of.same.name: java.lang.String +1 error
--- a/test/tools/javac/PackageClassAmbiguity/util.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/PackageClassAmbiguity/util.java Fri May 15 01:56:14 2015 -0700 @@ -1,28 +1,15 @@ /* - * Copyright (c) 1998, 2002, 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. + * @test /nodynamiccopyright/ + * @bug 4101529 + * @summary The compiler used to create class names which were the same as + * existing package names and vice-versa. The compiler now checks + * for this before creating a package or a class. + * @author turnidge * - * 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. + * @compile/fail/ref=util.out -XDrawDiagnostics util.java */ package java; - import java.util.Set; class util {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/PackageClassAmbiguity/util.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,3 @@ +util.java:13:17: compiler.err.cant.resolve.location: kindname.class, Set, , , (compiler.misc.location: kindname.class, java.util, null) +util.java:16:5: compiler.err.cant.resolve.location: kindname.class, Set, , , (compiler.misc.location: kindname.class, java.util, null) +2 errors
--- a/test/tools/javac/T6404756.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/T6404756.java Fri May 15 01:56:14 2015 -0700 @@ -1,31 +1,8 @@ /* - * Copyright (c) 2006, 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 + * @test /nodynamiccopyright/ * @bug 6404756 * @summary javac mishandles deprecation warnings on some elements marked deprecated - * @compile/fail -Werror -Xlint:deprecation T6404756.java + * @compile/fail/ref=T6404756.out -XDrawDiagnostics -Werror -Xlint:deprecation T6404756.java */ public class T6404756 {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T6404756.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,4 @@ +T6404756.java:10:34: compiler.warn.has.been.deprecated: foo, Foo +- compiler.err.warnings.and.werror +1 error +1 warning
--- a/test/tools/javac/T6882235.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/T6882235.java Fri May 15 01:56:14 2015 -0700 @@ -3,7 +3,6 @@ * @bug 6882235 * @summary invalid exponent causes silent javac crash * - * @compile/fail T6882235.java * @compile/fail/ref=T6882235.out -XDrawDiagnostics T6882235.java */
--- a/test/tools/javac/T6882235.out Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/T6882235.out Fri May 15 01:56:14 2015 -0700 @@ -1,5 +1,5 @@ -T6882235.java:11:13: compiler.err.illegal.start.of.expr -T6882235.java:12:15: compiler.err.malformed.fp.lit -T6882235.java:12:18: compiler.err.illegal.start.of.expr -T6882235.java:13:13: compiler.err.illegal.start.of.expr +T6882235.java:10:13: compiler.err.illegal.start.of.expr +T6882235.java:11:15: compiler.err.malformed.fp.lit +T6882235.java:11:18: compiler.err.illegal.start.of.expr +T6882235.java:12:13: compiler.err.illegal.start.of.expr 4 errors
--- a/test/tools/javac/conditional/Conditional.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/conditional/Conditional.java Fri May 15 01:56:14 2015 -0700 @@ -1,34 +1,11 @@ /* - * Copyright (c) 2004, 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 + * @test /nodynamiccopyright/ * @bug 5077054 * @summary Conditional operator applies assignment conversion * @author Tim Hanson, BEA * * @compile Conditional.java - * @compile/fail -source 7 Conditional.java + * @compile/fail/ref=Conditional.out -XDrawDiagnostics -source 7 Conditional.java */ import java.util.*;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/conditional/Conditional.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,4 @@ +- compiler.warn.source.no.bootclasspath: 1.7 +Conditional.java:16:38: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<? extends java.lang.Object>, java.util.List<java.lang.String>) +1 error +1 warning
--- a/test/tools/javac/literals/BadUnderscoreLiterals.6.out Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/literals/BadUnderscoreLiterals.6.out Fri May 15 01:56:14 2015 -0700 @@ -1,21 +1,21 @@ -BadUnderscoreLiterals.java:14:17: compiler.err.unsupported.underscore.lit: 1.6 -BadUnderscoreLiterals.java:18:15: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:22:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:25:14: compiler.err.unsupported.binary.lit: 1.6 -BadUnderscoreLiterals.java:25:16: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:26:17: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:29:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:11:17: compiler.err.unsupported.underscore.lit: 1.6 +BadUnderscoreLiterals.java:15:15: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:19:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:22:14: compiler.err.unsupported.binary.lit: 1.6 +BadUnderscoreLiterals.java:22:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:23:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:26:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:27:17: compiler.err.illegal.underscore BadUnderscoreLiterals.java:30:17: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:33:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:31:18: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:32:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:33:19: compiler.err.illegal.underscore BadUnderscoreLiterals.java:34:18: compiler.err.illegal.underscore BadUnderscoreLiterals.java:35:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:36:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:37:18: compiler.err.illegal.underscore BadUnderscoreLiterals.java:38:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:41:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:42:20: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:43:21: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:44:22: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:45:21: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:46:22: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:39:20: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:40:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:41:22: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:42:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:43:22: compiler.err.illegal.underscore 20 errors
--- a/test/tools/javac/literals/BadUnderscoreLiterals.7.out Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/literals/BadUnderscoreLiterals.7.out Fri May 15 01:56:14 2015 -0700 @@ -1,19 +1,19 @@ -BadUnderscoreLiterals.java:18:15: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:22:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:25:16: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:26:17: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:29:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:15:15: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:19:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:22:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:23:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:26:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:27:17: compiler.err.illegal.underscore BadUnderscoreLiterals.java:30:17: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:33:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:31:18: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:32:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:33:19: compiler.err.illegal.underscore BadUnderscoreLiterals.java:34:18: compiler.err.illegal.underscore BadUnderscoreLiterals.java:35:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:36:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:37:18: compiler.err.illegal.underscore BadUnderscoreLiterals.java:38:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:41:19: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:42:20: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:43:21: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:44:22: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:45:21: compiler.err.illegal.underscore -BadUnderscoreLiterals.java:46:22: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:39:20: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:40:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:41:22: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:42:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:43:22: compiler.err.illegal.underscore 18 errors
--- a/test/tools/javac/literals/BadUnderscoreLiterals.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/literals/BadUnderscoreLiterals.java Fri May 15 01:56:14 2015 -0700 @@ -3,10 +3,7 @@ * @bug 6860973 * @summary Project Coin: underscores in literals * - * @compile/fail BadUnderscoreLiterals.java * @compile/fail/ref=BadUnderscoreLiterals.7.out -XDrawDiagnostics BadUnderscoreLiterals.java - * - * @compile/fail -source 6 BadUnderscoreLiterals.java * @compile/fail/ref=BadUnderscoreLiterals.6.out -XDrawDiagnostics -source 6 -Xlint:-options BadUnderscoreLiterals.java */
--- a/test/tools/javac/miranda/4686148/ConcreteTest.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/miranda/4686148/ConcreteTest.java Fri May 15 01:56:14 2015 -0700 @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2002, 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. - */ +/* /nodynamiccopyright/ */ package two; import one.*;
--- a/test/tools/javac/miranda/4686148/Test.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/miranda/4686148/Test.java Fri May 15 01:56:14 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, 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 @@ -28,7 +28,7 @@ * @author gafter * * @compile Test.java AbstractTest.java - * @compile/fail ConcreteTest.java + * @compile/fail/ref=Test.out -XDrawDiagnostics ConcreteTest.java */ package one;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/miranda/4686148/Test.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,2 @@ +ConcreteTest.java:8:18: compiler.err.override.weaker.access: (compiler.misc.cant.implement: perform(), two.ConcreteTest, perform(), one.Test), public +1 error
--- a/test/tools/javac/miranda/4711056/T1.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/miranda/4711056/T1.java Fri May 15 01:56:14 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, 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 @@ -30,7 +30,7 @@ * @compile T1.java * @compile T2.java * @compile T3.java - * @compile/fail T4.java + * @compile/fail/ref=T1.out -XDrawDiagnostics T4.java */ interface iclss01004_1 {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/miranda/4711056/T1.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,2 @@ +T4.java:3:10: compiler.err.types.incompatible.diff.ret: iclss01004_2, iclss01004_1, foo(int) +1 error
--- a/test/tools/javac/miranda/4711056/T4.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/miranda/4711056/T4.java Fri May 15 01:56:14 2015 -0700 @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2002, 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. - */ +/* /nodynamiccopyright/ */ abstract class clss01004_a extends clss01004_b implements iclss01004_2 { // conflict!
--- a/test/tools/javac/sourcePath2/SourcePath2.java Fri May 15 01:36:32 2015 -0700 +++ b/test/tools/javac/sourcePath2/SourcePath2.java Fri May 15 01:56:14 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4648973 * @summary compiler does not emit code for second class in source file * @author gafter * - * @compile/fail SourcePath2.java + * @compile/fail/ref=SourcePath2.out -XDrawDiagnostics SourcePath2.java */ import p.SourcePath2A;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/sourcePath2/SourcePath2.out Fri May 15 01:56:14 2015 -0700 @@ -0,0 +1,2 @@ +SourcePath2A.java:30:5: compiler.err.cant.resolve.location: kindname.class, this_should_not, , , (compiler.misc.location: kindname.class, p.Trash, null) +1 error