--- a/jdk/make/jprt.properties	Wed Apr 29 20:55:13 2009 +0400
+++ b/jdk/make/jprt.properties	Wed Apr 29 11:43:19 2009 -0700
@@ -32,8 +32,8 @@
 solaris_sparcv9_5.10,\
 solaris_i586_5.10,\
 solaris_x64_5.10,\
-linux_i586,\
-linux_x64,\
+linux_i586_2.6,\
+linux_x64_2.6,\
 windows_i586,\
 windows_x64
 

--- a/jdk/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java	Wed Apr 29 20:55:13 2009 +0400
+++ b/jdk/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java	Wed Apr 29 11:43:19 2009 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4962341
+ * @bug 4962341 6832557
  * @summary Check getEnclosingMethod method
  * @author Joseph D. Darcy
  */
@@ -57,8 +57,8 @@
     }
 
 
-    static int examine(Class enclosedClass, String constructorSig) {
-        Constructor c = enclosedClass.getEnclosingConstructor();
+    static int examine(Class<?> enclosedClass, String constructorSig) {
+        Constructor<?> c = enclosedClass.getEnclosingConstructor();
         if (c == null && constructorSig == null)
             return 0;
 

--- a/jdk/test/java/lang/instrument/ParallelTransformerLoader.sh	Wed Apr 29 20:55:13 2009 +0400
+++ b/jdk/test/java/lang/instrument/ParallelTransformerLoader.sh	Wed Apr 29 11:43:19 2009 -0700
@@ -23,6 +23,7 @@
 
 # @test
 # @bug 5088398
+# @ignore until bug 6835233 dealt with
 # @summary Test parallel class loading by parallel transformers.
 # @author Daniel D. Daugherty as modified from the code of Daryl Puryear @ Wily
 #

--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadStateTest.java	Wed Apr 29 20:55:13 2009 +0400
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadStateTest.java	Wed Apr 29 11:43:19 2009 -0700
@@ -23,7 +23,8 @@
 
 /*
  * @test
- * @bug     4967283
+ * @bug     4967283 5080203
+ * @ignore  Due to 5080203, cannot rely on this test always passing.
  * @summary Basic unit test of thread states returned by
  *          ThreadMXBean.getThreadInfo.getThreadState().
  *          It also tests lock information returned by ThreadInfo.

--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Wed Apr 29 20:55:13 2009 +0400
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Wed Apr 29 11:43:19 2009 -0700
@@ -26,6 +26,7 @@
 
 # @test
 # @bug 6440846
+# @ignore until 6203816 is dealt with.
 # @summary make sure we do not deadlock between ExtClassLoader and AppClassLoader
 # @author Valerie Peng
 # @run shell/timeout=20 Deadlock2.sh

--- a/jdk/test/java/util/logging/LoggingDeadlock2.java	Wed Apr 29 20:55:13 2009 +0400
+++ b/jdk/test/java/util/logging/LoggingDeadlock2.java	Wed Apr 29 11:43:19 2009 -0700
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug     6467152 6716076 6829503
+ * @ignore Until made more stable, see 6829636.
  * @summary deadlock occurs in LogManager initialization and JVM termination
  * @author  Serguei Spitsyn / Hitachi / Martin Buchholz
  *