--- a/langtools/test/tools/javac/T4093617/T4093617.java Wed Jul 05 22:48:37 2017 +0200
+++ b/langtools/test/tools/javac/T4093617/T4093617.java Tue Feb 07 16:19:50 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2017, 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
@@ -26,6 +26,6 @@
* @bug 4093617
* @summary Object has no superclass
* @author Peter von der Ah\u00e9
- * @compile/module=java.base/fail/ref=T4093617.out -XDrawDiagnostics Object.java
+ * @compile/module=java.base/fail/ref=T4093617.out -XDrawDiagnostics java/lang/Object.java
*/
--- a/langtools/test/tools/javac/T4093617/java.base/Object.java Wed Jul 05 22:48:37 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-/*
- * /nodynamiccopyright/
- * See ../T4093617.java
- */
-
-package java.lang;
-
-class Object {
- Object() { super(); }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T4093617/java.base/java/lang/Object.java Tue Feb 07 16:19:50 2017 -0800
@@ -0,0 +1,10 @@
+/*
+ * /nodynamiccopyright/
+ * See ../T4093617.java
+ */
+
+package java.lang;
+
+class Object {
+ Object() { super(); }
+}
--- a/langtools/test/tools/javac/redefineObject/Object1-test.java Wed Jul 05 22:48:37 2017 +0200
+++ b/langtools/test/tools/javac/redefineObject/Object1-test.java Tue Feb 07 16:19:50 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,6 +27,6 @@
* @summary java.lang.Object can't be redefined without crashing javac
* @author gafter
*
- * @compile/module=java.base/fail/ref=Object1.out -XDrawDiagnostics Object1.java
+ * @compile/module=java.base/fail/ref=Object1.out -XDrawDiagnostics java/lang/Object1.java
*/
--- a/langtools/test/tools/javac/redefineObject/Object2-test.java Wed Jul 05 22:48:37 2017 +0200
+++ b/langtools/test/tools/javac/redefineObject/Object2-test.java Tue Feb 07 16:19:50 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,5 +27,5 @@
* @summary java.lang.Object can't be redefined without crashing javac
* @author gafter
*
- * @compile/module=java.base/fail/ref=Object2.out -XDrawDiagnostics Object2.java
+ * @compile/module=java.base/fail/ref=Object2.out -XDrawDiagnostics java/lang/Object2.java
*/
--- a/langtools/test/tools/javac/redefineObject/java.base/Object1.java Wed Jul 05 22:48:37 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
- * /nodynamiccopyright/
- * See ../Object1-test.java
- */
-
-package java.lang;
-class Object extends Throwable {
- public final native Class getClass();
- public native int hashCode();
- public native boolean equals(Object obj);
- protected native Object clone() throws CloneNotSupportedException;
- public native String toString();
- public final native void notify();
- public final native void notifyAll();
- public final native void wait(long timeout) throws InterruptedException;
- public native final void wait(long timeout, int nanos) throws InterruptedException;
- public native final void wait() throws InterruptedException;
- protected void finalize() throws Throwable { }
-}
--- a/langtools/test/tools/javac/redefineObject/java.base/Object2.java Wed Jul 05 22:48:37 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
- * /nodynamiccopyright/
- * See ../Object2-test.java
- */
-
-package java.lang;
-class Object implements Cloneable {
- public final native Class getClass();
- public native int hashCode();
- public native boolean equals(Object obj);
- public native Object clone() throws CloneNotSupportedException;
- public native String toString();
- public final native void notify();
- public final native void notifyAll();
- public final native void wait(long timeout) throws InterruptedException;
- public native final void wait(long timeout, int nanos) throws InterruptedException;
- public native final void wait() throws InterruptedException;
- protected void finalize() throws Throwable { }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/redefineObject/java.base/java/lang/Object1.java Tue Feb 07 16:19:50 2017 -0800
@@ -0,0 +1,19 @@
+/*
+ * /nodynamiccopyright/
+ * See ../Object1-test.java
+ */
+
+package java.lang;
+class Object extends Throwable {
+ public final native Class getClass();
+ public native int hashCode();
+ public native boolean equals(Object obj);
+ protected native Object clone() throws CloneNotSupportedException;
+ public native String toString();
+ public final native void notify();
+ public final native void notifyAll();
+ public final native void wait(long timeout) throws InterruptedException;
+ public native final void wait(long timeout, int nanos) throws InterruptedException;
+ public native final void wait() throws InterruptedException;
+ protected void finalize() throws Throwable { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/redefineObject/java.base/java/lang/Object2.java Tue Feb 07 16:19:50 2017 -0800
@@ -0,0 +1,19 @@
+/*
+ * /nodynamiccopyright/
+ * See ../Object2-test.java
+ */
+
+package java.lang;
+class Object implements Cloneable {
+ public final native Class getClass();
+ public native int hashCode();
+ public native boolean equals(Object obj);
+ public native Object clone() throws CloneNotSupportedException;
+ public native String toString();
+ public final native void notify();
+ public final native void notifyAll();
+ public final native void wait(long timeout) throws InterruptedException;
+ public native final void wait(long timeout, int nanos) throws InterruptedException;
+ public native final void wait() throws InterruptedException;
+ protected void finalize() throws Throwable { }
+}