Index: vm/tests/smoke/Hi.java =================================================================== --- vm/tests/smoke/Hi.java (revision 483837) +++ vm/tests/smoke/Hi.java (working copy) @@ -18,11 +18,6 @@ * @author Alexei Fedotov, Salikh Zakirov * @version $Revision: 1.3.40.3 $ */ -/** - * Excluded from acceptance test set. - * - * @keyword XXX - */ public class Hi { public static void main (String[] args) { System.out.println("Hi!"); Index: vm/tests/smoke/stress/BigStringBuffer.java =================================================================== --- vm/tests/smoke/stress/BigStringBuffer.java (revision 483837) +++ vm/tests/smoke/stress/BigStringBuffer.java (working copy) @@ -20,9 +20,6 @@ */ package stress; -/** - * @keyword slow - */ public class BigStringBuffer { synchronized boolean test(int ignore) { Index: vm/tests/smoke/stress/Finalizer.java =================================================================== --- vm/tests/smoke/stress/Finalizer.java (revision 483837) +++ vm/tests/smoke/stress/Finalizer.java (working copy) @@ -21,9 +21,6 @@ package stress; -/** - * @keyword slow X_int_bug_6695 - */ public class Finalizer { static int create_count, finalize_count; Index: vm/tests/smoke/stress/Stack.java =================================================================== --- vm/tests/smoke/stress/Stack.java (revision 483837) +++ vm/tests/smoke/stress/Stack.java (working copy) @@ -20,9 +20,6 @@ */ package stress; -/** - * @keyword XXX_bug_2887 - */ public class Stack { static final int depth = 7000; // the external java crashes if depth = 200000 @@ -33,7 +30,7 @@ if (i < depth && test(++i)) { return true; } - return false; // Should got stack overflow? + return true; } public static void main(String[] args) { Index: vm/tests/smoke/stress/Threads.java =================================================================== --- vm/tests/smoke/stress/Threads.java (revision 483837) +++ vm/tests/smoke/stress/Threads.java (working copy) @@ -22,8 +22,6 @@ /** * Tries to start at least 100 threads simultaneously. - * - * @keyword stress */ public class Threads extends Thread { Index: vm/tests/smoke/stress/Sync.java =================================================================== --- vm/tests/smoke/stress/Sync.java (revision 483837) +++ vm/tests/smoke/stress/Sync.java (working copy) @@ -21,9 +21,6 @@ package stress; -/** - * @keyword stress - */ public class Sync extends Thread { final static int number_of_threads = 200; Index: vm/tests/smoke/stress/Mix.java =================================================================== --- vm/tests/smoke/stress/Mix.java (revision 483837) +++ vm/tests/smoke/stress/Mix.java (working copy) @@ -24,9 +24,6 @@ import java.io.*; import java.util.*; -/** - * @keyword stress X_pure_bug_6103 - */ public class Mix extends Thread { static Object sync; Index: vm/tests/smoke/outofmemory/Vector.java =================================================================== --- vm/tests/smoke/outofmemory/Vector.java (revision 483837) +++ vm/tests/smoke/outofmemory/Vector.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class Vector { public static void main (String[] args) { Index: vm/tests/smoke/outofmemory/Plain.java =================================================================== --- vm/tests/smoke/outofmemory/Plain.java (revision 483837) +++ vm/tests/smoke/outofmemory/Plain.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class Plain { public static final int N = 10; Index: vm/tests/smoke/outofmemory/Throw.java =================================================================== --- vm/tests/smoke/outofmemory/Throw.java (revision 483837) +++ vm/tests/smoke/outofmemory/Throw.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class Throw { public static void main (String[] args) { Index: vm/tests/smoke/outofmemory/Double.java =================================================================== --- vm/tests/smoke/outofmemory/Double.java (revision 483837) +++ vm/tests/smoke/outofmemory/Double.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class Double { public static final int N = 10; Index: vm/tests/smoke/outofmemory/Int.java =================================================================== --- vm/tests/smoke/outofmemory/Int.java (revision 483837) +++ vm/tests/smoke/outofmemory/Int.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class Int { public static final int N = 10; Index: vm/tests/smoke/outofmemory/Ref.java =================================================================== --- vm/tests/smoke/outofmemory/Ref.java (revision 483837) +++ vm/tests/smoke/outofmemory/Ref.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class Ref { public static final int N = 10; Index: vm/tests/smoke/outofmemory/VectorDouble.java =================================================================== --- vm/tests/smoke/outofmemory/VectorDouble.java (revision 483837) +++ vm/tests/smoke/outofmemory/VectorDouble.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class VectorDouble { public static void main (String[] args) { Index: vm/tests/smoke/outofmemory/VectorInt.java =================================================================== --- vm/tests/smoke/outofmemory/VectorInt.java (revision 483837) +++ vm/tests/smoke/outofmemory/VectorInt.java (working copy) @@ -22,7 +22,6 @@ /** * Out of memory tests have no dependecy on class library. - * @keyword slow */ public class VectorInt { public static void main (String[] args) { Index: vm/tests/smoke/gc/Fragment.java =================================================================== --- vm/tests/smoke/gc/Fragment.java (revision 483837) +++ vm/tests/smoke/gc/Fragment.java (working copy) @@ -24,8 +24,6 @@ * Fragment the heap with large allocations interspersed * with medium-size allocation and then check if larger * allocation works. - * - * @keyword gc XXX_not_implemented_feature */ public class Fragment { Index: vm/tests/smoke/gc/MultiThreads.java =================================================================== --- vm/tests/smoke/gc/MultiThreads.java (revision 483837) +++ vm/tests/smoke/gc/MultiThreads.java (working copy) @@ -24,8 +24,6 @@ /** * plain allocation workload. - * - * @keyword gc stress */ public class MultiThreads extends Thread { Index: vm/tests/smoke/gc/StressRef.java =================================================================== --- vm/tests/smoke/gc/StressRef.java (revision 483837) +++ vm/tests/smoke/gc/StressRef.java (working copy) @@ -24,9 +24,6 @@ import java.util.*; import java.lang.ref.*; -/** - * @keyword ref XXX_bug_6317 - */ public class StressRef { static long ref_count; Index: vm/tests/smoke/gc/RunFinalizersOnExitTest.java =================================================================== --- vm/tests/smoke/gc/RunFinalizersOnExitTest.java (revision 483837) +++ vm/tests/smoke/gc/RunFinalizersOnExitTest.java (working copy) @@ -22,10 +22,7 @@ /** * The test for Run Finilazers on exit for 3 types of object. - * - * @keyword X_jitrino_ipf_bug_6523 */ - public class RunFinalizersOnExitTest { private static final int ALIVE_QUANTITY = 128; Index: vm/tests/smoke/gc/Finalizer.java =================================================================== --- vm/tests/smoke/gc/Finalizer.java (revision 483837) +++ vm/tests/smoke/gc/Finalizer.java (working copy) @@ -20,9 +20,6 @@ */ package gc; -/** - * @keyword XXX - */ public class Finalizer { static volatile boolean passed = false; Index: vm/tests/smoke/gc/FinAlloc.java =================================================================== --- vm/tests/smoke/gc/FinAlloc.java (revision 483837) +++ vm/tests/smoke/gc/FinAlloc.java (working copy) @@ -25,7 +25,6 @@ /** * Exercises the allocation from finalizer. * - * @keyword X_Linux_bug_6084 X_Windows_bug_6475 */ public class FinAlloc { Index: vm/tests/smoke/gc/PhantomReferenceQueueTest.java =================================================================== --- vm/tests/smoke/gc/PhantomReferenceQueueTest.java (revision 483837) +++ vm/tests/smoke/gc/PhantomReferenceQueueTest.java (working copy) @@ -25,9 +25,6 @@ import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; -/** - * @keyword XXX ref X_ipf_bug_6361 - */ public class PhantomReferenceQueueTest { static boolean passed = false; Index: vm/tests/smoke/gc/Mark.java =================================================================== --- vm/tests/smoke/gc/Mark.java (revision 483837) +++ vm/tests/smoke/gc/Mark.java (working copy) @@ -25,11 +25,8 @@ /** * Measures the throughput and the pause times on * random object allocation. - * - * @keyword slow gc X_int_slow - * * The test is very slow on interpreter and may take more than 5 minutes - * to complete. X_int_slow prevents false alerts on 'make rel-check'. + * to complete. */ public class Mark extends Thread { Index: vm/tests/smoke/gc/LOS.java =================================================================== --- vm/tests/smoke/gc/LOS.java (revision 483837) +++ vm/tests/smoke/gc/LOS.java (working copy) @@ -18,11 +18,6 @@ * @author Salikh Zakirov * @version $Revision: 1.4.12.2.4.4 $ */ -/** - * Excluded from acceptance test set on Windows. - * - * @keyword X_Windows_bug - */ package gc; import java.util.ArrayList; Index: vm/tests/smoke/gc/ThreadSuspension.java =================================================================== --- vm/tests/smoke/gc/ThreadSuspension.java (revision 483837) +++ vm/tests/smoke/gc/ThreadSuspension.java (working copy) @@ -25,8 +25,6 @@ * * VM currently is not able to suspend thread which is running * a computation loop. - * - * @keyword XXX */ public class ThreadSuspension implements Runnable { Index: vm/tests/smoke/perf/MultiThreadsSimple.java =================================================================== --- vm/tests/smoke/perf/MultiThreadsSimple.java (revision 483837) +++ vm/tests/smoke/perf/MultiThreadsSimple.java (working copy) @@ -28,8 +28,6 @@ * that allocate small objects. The purpose of this benchmark is to stress * module responsible for thread suspension. Threads should be suspended before gc starts its work. * That is the reason of long delays. - * - * @keyword perf threads */ public class MultiThreadsSimple extends Thread { Index: vm/tests/smoke/perf/StressCornerSize.java =================================================================== --- vm/tests/smoke/perf/StressCornerSize.java (revision 483837) +++ vm/tests/smoke/perf/StressCornerSize.java (working copy) @@ -24,8 +24,6 @@ * This test should stress gc_v4 (mark-compact) algorithm * because off "corner" size of allocated objects (64kb). Set heap size 128Mb. * Garbage is interleaved with live objects. - * - * @keyword perf gc */ public class StressCornerSize { Index: vm/tests/smoke/perf/StressCornerSize_a.java =================================================================== --- vm/tests/smoke/perf/StressCornerSize_a.java (revision 483837) +++ vm/tests/smoke/perf/StressCornerSize_a.java (working copy) @@ -28,7 +28,6 @@ * because off "corner" sizes of allocated objects(30kb and 60kb). Set heap size 128Mb. * Garbage is interleaved with small amount of live objects. Live objects are saved in massive. * - * @keyword perf gc */ public class StressCornerSize_a { static class CornerObject { Index: vm/tests/smoke/perf/ThrowMany.java =================================================================== --- vm/tests/smoke/perf/ThrowMany.java (revision 483837) +++ vm/tests/smoke/perf/ThrowMany.java (working copy) @@ -21,9 +21,6 @@ package perf; -/** - * @keyword perf exc - */ public class ThrowMany { private final static int MAX_THROW = 100000; Index: vm/tests/smoke/perf/CreateManyExceptions.java =================================================================== --- vm/tests/smoke/perf/CreateManyExceptions.java (revision 483837) +++ vm/tests/smoke/perf/CreateManyExceptions.java (working copy) @@ -21,9 +21,6 @@ package perf; -/* - * @keyword perf exc - */ public class CreateManyExceptions{ private final static int MAX_THROW = 100000; Index: vm/tests/smoke/perf/ThrowManyExceptions.java =================================================================== --- vm/tests/smoke/perf/ThrowManyExceptions.java (revision 483837) +++ vm/tests/smoke/perf/ThrowManyExceptions.java (working copy) @@ -21,9 +21,6 @@ package perf; -/** - * @keyword perf exc - */ public class ThrowManyExceptions { private final static int MAX_THROW = 100000; Index: vm/tests/smoke/perf/SeveralThreads.java =================================================================== --- vm/tests/smoke/perf/SeveralThreads.java (revision 483837) +++ vm/tests/smoke/perf/SeveralThreads.java (working copy) @@ -24,8 +24,6 @@ /** * This is a programm that generates 5 threads * that allocate objects of different sizes. - * - * @keyword perf gc */ class NewThread extends Thread { static class CornerObject { Index: vm/tests/smoke/perf/ThrowMany_depth.java =================================================================== --- vm/tests/smoke/perf/ThrowMany_depth.java (revision 483837) +++ vm/tests/smoke/perf/ThrowMany_depth.java (working copy) @@ -21,9 +21,6 @@ package perf; -/* - * @keyword perf exc - */ public class ThrowMany_depth { private final static int MAX_THROW = 100000; Index: vm/tests/smoke/perf/CreateManyExceptions_depth.java =================================================================== --- vm/tests/smoke/perf/CreateManyExceptions_depth.java (revision 483837) +++ vm/tests/smoke/perf/CreateManyExceptions_depth.java (working copy) @@ -21,9 +21,6 @@ package perf; -/* - * @keyword perf exc - */ public class CreateManyExceptions_depth{ private final static int MAX_THROW = 100000; Index: vm/tests/smoke/perf/ThrowManyExceptions_depth.java =================================================================== --- vm/tests/smoke/perf/ThrowManyExceptions_depth.java (revision 483837) +++ vm/tests/smoke/perf/ThrowManyExceptions_depth.java (working copy) @@ -21,9 +21,6 @@ package perf; -/* - * @keyword perf exc - */ public class ThrowManyExceptions_depth{ private final static int MAX_THROW = 100000; Index: vm/tests/smoke/classloader/ClassTestGetDeclaringClass.java =================================================================== --- vm/tests/smoke/classloader/ClassTestGetDeclaringClass.java (revision 483837) +++ vm/tests/smoke/classloader/ClassTestGetDeclaringClass.java (working copy) @@ -22,7 +22,6 @@ /** * @tested class: java.lang.Class * @tested method: getDeclaringClass - * @keyword XXX_bug_4071 */ public class ClassTestGetDeclaringClass { Index: vm/tests/smoke/classloader/ExceptionInInitializerTest.java =================================================================== --- vm/tests/smoke/classloader/ExceptionInInitializerTest.java (revision 483837) +++ vm/tests/smoke/classloader/ExceptionInInitializerTest.java (working copy) @@ -23,8 +23,6 @@ * Test on class loader. It should throw ExceptionInInitializerError * and propagate it up the class loading chaing. Instead of it * on interpreter it throws NoClassDefFoundError. - * @keyword XXX_bug_4071 X_ipf_bug_6095 - * */ public class ExceptionInInitializerTest { public static void main(String[] args) { Index: vm/tests/smoke/io/Integers.java =================================================================== --- vm/tests/smoke/io/Integers.java (revision 483837) +++ vm/tests/smoke/io/Integers.java (working copy) @@ -18,13 +18,10 @@ * @author Alexei Fedotov * @version $Revision: 1.4.8.1.4.3 $ */ + package io; import java.io.*; - -/** - * @keyword XXX_bug_2509 - */ import java.util.*; class Spaghetti implements Serializable { @@ -36,19 +33,13 @@ } } - public class Integers { private static final int SPAGHETTI_NUM = 1000; private static final Random rnd = new Random(); - public static void main(String[] args) throws Exception { - if("-out".equals(args[0])) { - ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream -(args[1])); - - - + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); Spaghetti[] sa = new Spaghetti[SPAGHETTI_NUM]; //fill array with empty objects @@ -63,17 +54,11 @@ } oos.writeObject(sa); - - oos.close(); - } - if("-in".equals(args[0])) { - ObjectInputStream ois = new ObjectInputStream(new FileInputStream(args -[1])); - ois.readObject(); - ois.close(); - } - System.out.println("PASSED"); + ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray())); + ois.readObject(); + ois.close(); + System.out.println("PASSED"); } } Index: vm/tests/smoke/io/ArrayList.java =================================================================== --- vm/tests/smoke/io/ArrayList.java (revision 483837) +++ vm/tests/smoke/io/ArrayList.java (working copy) @@ -22,9 +22,6 @@ import java.io.*; -/** - * @keyword XXX_bug_6363 - */ public class ArrayList { public static void main(String[] args) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Index: build/make/excludes/exclude.drlvm_smoke.linux.x86.jit =================================================================== --- build/make/excludes/exclude.drlvm_smoke.linux.x86.jit (revision 483837) +++ build/make/excludes/exclude.drlvm_smoke.linux.x86.jit (working copy) @@ -1,45 +1,6 @@ Check.java -Hi.java PerfCheck.java -classloader/ClassTestGetDeclaringClass.java -classloader/ExceptionInInitializerTest.java classloader/StressLoader.java -gc/FinAlloc.java -gc/Finalizer.java -gc/Fragment.java -gc/Mark.java -gc/MultiThreads.java -gc/PhantomReferenceQueueTest.java -gc/RunFinalizersOnExitTest.java -gc/ThreadSuspension.java -gc/StressRef.java gc/SynchronizedFinilazersTest.java init/ErrorInInitializer.java -io/ArrayList.java -io/Integers.java -outofmemory/Double.java -outofmemory/Int.java -outofmemory/Plain.java -outofmemory/Ref.java -outofmemory/Throw.java -outofmemory/Vector.java -outofmemory/VectorDouble.java -outofmemory/VectorInt.java -perf/CreateManyExceptions.java -perf/CreateManyExceptions_depth.java -perf/MultiThreadsSimple.java -perf/SeveralThreads.java -perf/StressCornerSize.java -perf/StressCornerSize_a.java -perf/ThrowMany.java -perf/ThrowManyExceptions.java -perf/ThrowManyExceptions_depth.java -perf/ThrowMany_depth.java -stress/BigStringBuffer.java -stress/Finalizer.java -stress/Mix.java -stress/Stack.java -stress/Sync.java -stress/Threads.java thread/InfiniteFinalizer.java - Index: build/make/excludes/exclude.drlvm_smoke.windows.x86.interpreter =================================================================== --- build/make/excludes/exclude.drlvm_smoke.windows.x86.interpreter (revision 483837) +++ build/make/excludes/exclude.drlvm_smoke.windows.x86.interpreter (working copy) @@ -1,46 +1,9 @@ Check.java -Hi.java PerfCheck.java -classloader/ClassTestGetDeclaringClass.java -classloader/ExceptionInInitializerTest.java classloader/StressLoader.java -gc/FinAlloc.java -gc/Finalizer.java -gc/Fragment.java -gc/LOS.java gc/Mark.java -gc/MultiThreads.java -gc/PhantomReferenceQueueTest.java -gc/RunFinalizersOnExitTest.java -gc/ThreadSuspension.java -gc/StressRef.java gc/SynchronizedFinilazersTest.java init/ErrorInInitializer.java -io/ArrayList.java io/Integers.java -outofmemory/Double.java -outofmemory/Int.java -outofmemory/Plain.java -outofmemory/Ref.java -outofmemory/Throw.java -outofmemory/Vector.java -outofmemory/VectorDouble.java -outofmemory/VectorInt.java -perf/CreateManyExceptions.java -perf/CreateManyExceptions_depth.java -perf/MultiThreadsSimple.java -perf/SeveralThreads.java -perf/StressCornerSize.java -perf/StressCornerSize_a.java -perf/ThrowMany.java -perf/ThrowManyExceptions.java -perf/ThrowManyExceptions_depth.java -perf/ThrowMany_depth.java -stress/BigStringBuffer.java -stress/Finalizer.java -stress/Mix.java stress/Stack.java -stress/Sync.java -stress/Threads.java thread/InfiniteFinalizer.java - Index: build/make/excludes/exclude.drlvm_smoke.linux.x86.interpreter =================================================================== --- build/make/excludes/exclude.drlvm_smoke.linux.x86.interpreter (revision 483837) +++ build/make/excludes/exclude.drlvm_smoke.linux.x86.interpreter (working copy) @@ -1,45 +1,9 @@ Check.java -Hi.java PerfCheck.java -classloader/ClassTestGetDeclaringClass.java -classloader/ExceptionInInitializerTest.java classloader/StressLoader.java -gc/FinAlloc.java -gc/Finalizer.java -gc/Fragment.java gc/Mark.java -gc/MultiThreads.java -gc/PhantomReferenceQueueTest.java -gc/RunFinalizersOnExitTest.java -gc/ThreadSuspension.java -gc/StressRef.java gc/SynchronizedFinilazersTest.java init/ErrorInInitializer.java -io/ArrayList.java io/Integers.java -outofmemory/Double.java -outofmemory/Int.java -outofmemory/Plain.java -outofmemory/Ref.java -outofmemory/Throw.java -outofmemory/Vector.java -outofmemory/VectorDouble.java -outofmemory/VectorInt.java -perf/CreateManyExceptions.java -perf/CreateManyExceptions_depth.java -perf/MultiThreadsSimple.java -perf/SeveralThreads.java -perf/StressCornerSize.java -perf/StressCornerSize_a.java -perf/ThrowMany.java -perf/ThrowManyExceptions.java -perf/ThrowManyExceptions_depth.java -perf/ThrowMany_depth.java -stress/BigStringBuffer.java -stress/Finalizer.java -stress/Mix.java stress/Stack.java -stress/Sync.java -stress/Threads.java thread/InfiniteFinalizer.java - Index: build/make/excludes/exclude.drlvm_smoke.windows.x86.jit =================================================================== --- build/make/excludes/exclude.drlvm_smoke.windows.x86.jit (revision 483837) +++ build/make/excludes/exclude.drlvm_smoke.windows.x86.jit (working copy) @@ -1,46 +1,8 @@ Check.java -Hi.java PerfCheck.java -classloader/ClassTestGetDeclaringClass.java -classloader/ExceptionInInitializerTest.java classloader/StressLoader.java -gc/FinAlloc.java -gc/Finalizer.java -gc/Fragment.java -gc/LOS.java -gc/Mark.java -gc/MultiThreads.java -gc/PhantomReferenceQueueTest.java -gc/RunFinalizersOnExitTest.java -gc/ThreadSuspension.java -gc/StressRef.java gc/SynchronizedFinilazersTest.java init/ErrorInInitializer.java -io/ArrayList.java io/Integers.java -outofmemory/Double.java -outofmemory/Int.java -outofmemory/Plain.java -outofmemory/Ref.java -outofmemory/Throw.java -outofmemory/Vector.java -outofmemory/VectorDouble.java -outofmemory/VectorInt.java -perf/CreateManyExceptions.java -perf/CreateManyExceptions_depth.java -perf/MultiThreadsSimple.java -perf/SeveralThreads.java -perf/StressCornerSize.java -perf/StressCornerSize_a.java -perf/ThrowMany.java -perf/ThrowManyExceptions.java -perf/ThrowManyExceptions_depth.java -perf/ThrowMany_depth.java -stress/BigStringBuffer.java -stress/Finalizer.java -stress/Mix.java stress/Stack.java -stress/Sync.java -stress/Threads.java thread/InfiniteFinalizer.java -