changeset 1876:eb9f15dfd19e

6797871: Fix for 6797463 did not remove the jtreg tests, and it should have Reviewed-by: jjg
author tbell
date Mon, 26 Jan 2009 15:14:46 -0800
parents 6306c60724ee
children b60cca94e94d a891da9d8db1
files langtools/test/tools/javac/generics/rawOverride/6557199/T6557199.java langtools/test/tools/javac/generics/rawOverride/6557199/T6557199.out
diffstat 2 files changed, 0 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/test/tools/javac/generics/rawOverride/6557199/T6557199.java	Sat Jan 24 16:35:52 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
- * @bug 6557199
- * @summary  Fails to reject bad override of generic method
- * @author Maurizio Cimadamore
- * @compile/fail/ref=T6557199.out T6557199.java -XDrawDiagnostics
- */
-
-class T6557199 {
-    static class X<S> {
-        public static <U> X<U> test() {
-            return null;
-        }
-    }
-
-    static class B extends X<B> {
-        public static B test() {
-            return null;
-        }
-    }
-}
--- a/langtools/test/tools/javac/generics/rawOverride/6557199/T6557199.out	Sat Jan 24 16:35:52 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-T6557199.java:40:25: compiler.err.prob.found.req: (- compiler.misc.override.incompatible.ret: (- compiler.misc.cant.override: test(), T6557199.B, <U>test(), T6557199.X)), T6557199.B, T6557199.X<U>
-1 error