Index: vm/tests/kernel/java/lang/ThreadRTest.java =================================================================== --- vm/tests/kernel/java/lang/ThreadRTest.java (revision 523551) +++ vm/tests/kernel/java/lang/ThreadRTest.java (working copy) @@ -120,7 +120,7 @@ } t.stop(); - int count = 10; + int count = 300; while(!tt.finished && count-- > 0 ){ Thread.sleep(100); } Index: vm/tests/kernel/java/lang/ThreadTest.java =================================================================== --- vm/tests/kernel/java/lang/ThreadTest.java (revision 523551) +++ vm/tests/kernel/java/lang/ThreadTest.java (working copy) @@ -1480,6 +1480,14 @@ } catch (InterruptedException e) { fail(INTERRUPTED_MESSAGE); } + waitTime = waitDuration; + Thread.State ts = t.getState(); + while (ts != Thread.State.TIMED_WAITING && !(expired = doSleep(10))) { + ts = t.getState(); + } + if (expired) { + fail("TIMED_WAITING state has not been reached"); + } t.interrupt(); waitTime = waitDuration; while (!t.exceptionReceived && !(expired = doSleep(10))) { Index: vm/tests/kernel/org/apache/harmony/lang/generics/SpecialD.java =================================================================== --- vm/tests/kernel/org/apache/harmony/lang/generics/SpecialD.java (revision 523562) +++ vm/tests/kernel/org/apache/harmony/lang/generics/SpecialD.java (working copy) @@ -33,12 +33,13 @@ } else { //System.out.println("PASSED: " + this.getClass().getClassLoader().getClass() + " was marked as initiating classloader for SpecialC"); } - //System.out.println("Trying to define SpecialC for the second time..."); + // Trying to define SpecialC for the second time... ClassLoaderTest.flag++; try { ((SpecialClassLoader)this.getClass().getClassLoader()).loadClass(""); fail("FAILED: LinkageError wasn't thrown"); } catch (LinkageError err) { + // expected } } catch (Throwable t) { fail("FAILED: Unexpected error thrown:"); Index: vm/tests/kernel/org/apache/harmony/lang/generics/ClassLoaderTest.java =================================================================== --- vm/tests/kernel/org/apache/harmony/lang/generics/ClassLoaderTest.java (revision 523562) +++ vm/tests/kernel/org/apache/harmony/lang/generics/ClassLoaderTest.java (working copy) @@ -31,7 +31,7 @@ Object obj = cls.newInstance(); cls.getDeclaredMethod("test", (Class[])null).invoke(obj, (Object[])null); } catch (Exception e) { - e.printStackTrace(); + fail("Unexpected exception " + e); } } public void main(String[] args) { Index: vm/tests/kernel/org/apache/harmony/lang/generics/SpecialClassLoader.java =================================================================== --- vm/tests/kernel/org/apache/harmony/lang/generics/SpecialClassLoader.java (revision 523562) +++ vm/tests/kernel/org/apache/harmony/lang/generics/SpecialClassLoader.java (working copy) @@ -36,14 +36,18 @@ s="org"+File.separator+"apache"+File.separator+"harmony"+File.separator+"lang"+File.separator+"generics"+File.separator+"SpecialC"; s2="org.apache.harmony.lang.generics.SpecialC"; } + String javaHome = System.getProperty("java.home"); + String kernelTests = javaHome.substring(0, javaHome.indexOf("deploy")) + + File.separator + "semis" + + File.separator + "kernel.tests" + + File.separator + "classes"; FileInputStream fis; - fis = new FileInputStream(System.getProperty("java.ext.dirs")+File.separator+"classes"+File.separator+s+".class"); + fis = new FileInputStream(kernelTests + File.separator + s + ".class"); byte[] classToBytes = new byte[fis.available()]; fis.read(classToBytes); return defineClass(s2, classToBytes, 0, classToBytes.length); } catch (Exception e) { - System.err.println("Unexpected exception during classloading: "); - e.printStackTrace(); + System.err.println("Unexpected exception during classloading: " + e); return null; } }