Changeset 278 for trunk/openjdk/hotspot/test/runtime

Timestamp:

Mar 26, 2011, 8:39:20 PM (15 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (2 props)
• hotspot/test/runtime/6626217 (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217 )
• hotspot/test/runtime/6626217/IFace.java (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/IFace.java )
• hotspot/test/runtime/6626217/Loader2.java (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/Loader2.java )
• hotspot/test/runtime/6626217/Test6626217.sh (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/Test6626217.sh )
• hotspot/test/runtime/6626217/You_Have_Been_P0wned.java (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/You_Have_Been_P0wned.java )
• hotspot/test/runtime/6626217/bug_21227.java (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/bug_21227.java )
• hotspot/test/runtime/6626217/from_loader2.java (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/from_loader2.java )
• hotspot/test/runtime/6626217/many_loader1.java.foo (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/many_loader1.java.foo )
• hotspot/test/runtime/6626217/many_loader2.java.foo (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6626217/many_loader2.java.foo )
• hotspot/test/runtime/6819213/TestBootNativeLibraryPath.java (modified) (2 diffs)
• hotspot/test/runtime/6888954 (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6888954 )
• hotspot/test/runtime/6888954/vmerrors.sh (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6888954/vmerrors.sh )
• hotspot/test/runtime/6925573 (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6925573 )
• hotspot/test/runtime/6925573/SortMethodsTest.java (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6925573/SortMethodsTest.java )
• hotspot/test/runtime/6929067 (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6929067 )
• hotspot/test/runtime/6929067/T.java (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6929067/T.java )
• hotspot/test/runtime/6929067/Test6929067.sh (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6929067/Test6929067.sh )
• hotspot/test/runtime/6929067/invoke.c (copied) (copied from branches/vendor/oracle/openjdk6/b22/hotspot/test/runtime/6929067/invoke.c )

trunk/openjdk

@@ -1 +1 @@
 build
+build-product-release

@@ -1 +1 @@
 build
+build-product-release

trunk/openjdk/hotspot/test/runtime/6819213/TestBootNativeLibraryPath.java

@@ -1 +1 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -17 +17 @@
  * 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.
+ * 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.
  */
 

@@ -1 +1 @@
 build
+build-product-release