From: <dgr...@us...> - 2006-12-05 17:57:59
|
Revision: 11129 http://svn.sourceforge.net/jikesrvm/?rev=11129&view=rev Author: dgrove-oss Date: 2006-12-05 09:57:54 -0800 (Tue, 05 Dec 2006) Log Message: ----------- patch 1608959: cleanup test code to remove unnecessary warnings Modified Paths: -------------- rvmroot/trunk/testing/tests/bytecodeTests/src/TestClassInitializer.java rvmroot/trunk/testing/tests/bytecodeTests/src/TestFieldAccess.java rvmroot/trunk/testing/tests/bytecodeTests/src/TestThrow.java rvmroot/trunk/testing/tests/bytecodeTests/src/TestVirtualCall.java rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java rvmroot/trunk/testing/tests/iterationDriver/VM_Callbacks.java rvmroot/trunk/testing/tests/jni/src/CriticalCopy.java rvmroot/trunk/testing/tests/jni/src/JNI12.java rvmroot/trunk/testing/tests/jni/src/MonitorTest.java rvmroot/trunk/testing/tests/jni/src/NativeException.java rvmroot/trunk/testing/tests/jni/src/TestGC.java rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java rvmroot/trunk/testing/tests/jni/src/t3GT3.java rvmroot/trunk/testing/tests/jni/src/t3GTWorker2.java rvmroot/trunk/testing/tests/opttests/src/TestConstants.java rvmroot/trunk/testing/tests/opttests/src/TestConversions.java rvmroot/trunk/testing/tests/opttests/src/TestExceptionThrow.java rvmroot/trunk/testing/tests/opttests/src/TestFieldAccess.java rvmroot/trunk/testing/tests/opttests/src/TestFinally.java rvmroot/trunk/testing/tests/opttests/src/TestThrow.java rvmroot/trunk/testing/tests/opttests/src/TestThrow2.java rvmroot/trunk/testing/tests/opttests/src/interf.java rvmroot/trunk/testing/tests/opttests/src/stPutGet.java rvmroot/trunk/testing/tests/opttests/src/tak_db.java rvmroot/trunk/testing/tests/opttests/src/tak_fp.java rvmroot/trunk/testing/tests/opttests/src/threadTest1.java rvmroot/trunk/testing/tests/opttests/src/unresolved.java rvmroot/trunk/testing/tests/opttests/src/virtUnPutGet.java rvmroot/trunk/testing/tests/opttests/src/virtUnresolved.java rvmroot/trunk/testing/tests/opttests/src/virtual.java rvmroot/trunk/testing/tests/opttests/src/whet.java rvmroot/trunk/testing/tests/reflect/src/tClass.java rvmroot/trunk/testing/tests/threads/src/TestDispatch.java rvmroot/trunk/testing/tests/threads/src/TestNotification.java rvmroot/trunk/testing/tests/threads/src/TestTimedWait.java Modified: rvmroot/trunk/testing/tests/bytecodeTests/src/TestClassInitializer.java =================================================================== --- rvmroot/trunk/testing/tests/bytecodeTests/src/TestClassInitializer.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/bytecodeTests/src/TestClassInitializer.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -48,6 +48,6 @@ SystemOut.println("TestClassInitializer"); int i = TestClassInitializerA.i; SystemOut.println(i); // test initialization before first field reference TestClassInitializerB b = new TestClassInitializerB(); SystemOut.println(b.f()); // test initialization before first instance creation - TestClassInitializerD d = new TestClassInitializerD(); SystemOut.println(d.i); // test order of superclass initialization + SystemOut.println(TestClassInitializerD.i); // test order of superclass initialization } } Modified: rvmroot/trunk/testing/tests/bytecodeTests/src/TestFieldAccess.java =================================================================== --- rvmroot/trunk/testing/tests/bytecodeTests/src/TestFieldAccess.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/bytecodeTests/src/TestFieldAccess.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -46,15 +46,15 @@ TestFieldAccess b = new TestFieldAccess(); - SystemOut.print("\nwant: true\n got: "); SystemOut.println(b.s0); - SystemOut.print("\nwant: -1\n got: "); SystemOut.println(b.s1); - SystemOut.print("\nwant: A\n got: "); SystemOut.println(b.s2); - SystemOut.print("\nwant: -3\n got: "); SystemOut.println(b.s3); - SystemOut.print("\nwant: -4\n got: "); SystemOut.println(b.s4); - SystemOut.print("\nwant: -5\n got: "); SystemOut.println(b.s5); - SystemOut.print("\nwant: -6.0\n got: "); SystemOut.println(b.s6); - SystemOut.print("\nwant: -7.0\n got: "); SystemOut.println(b.s7); - SystemOut.print("\nwant: Instance of TestFieldAccess\n got: "); SystemOut.println(b.s8); + SystemOut.print("\nwant: true\n got: "); SystemOut.println(TestFieldAccess.s0); + SystemOut.print("\nwant: -1\n got: "); SystemOut.println(TestFieldAccess.s1); + SystemOut.print("\nwant: A\n got: "); SystemOut.println(TestFieldAccess.s2); + SystemOut.print("\nwant: -3\n got: "); SystemOut.println(TestFieldAccess.s3); + SystemOut.print("\nwant: -4\n got: "); SystemOut.println(TestFieldAccess.s4); + SystemOut.print("\nwant: -5\n got: "); SystemOut.println(TestFieldAccess.s5); + SystemOut.print("\nwant: -6.0\n got: "); SystemOut.println(TestFieldAccess.s6); + SystemOut.print("\nwant: -7.0\n got: "); SystemOut.println(TestFieldAccess.s7); + SystemOut.print("\nwant: Instance of TestFieldAccess\n got: "); SystemOut.println(TestFieldAccess.s8); SystemOut.print("\nwant: true\n got: "); SystemOut.println(b.x0); SystemOut.print("\nwant: -1\n got: "); SystemOut.println(b.x1); Modified: rvmroot/trunk/testing/tests/bytecodeTests/src/TestThrow.java =================================================================== --- rvmroot/trunk/testing/tests/bytecodeTests/src/TestThrow.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/bytecodeTests/src/TestThrow.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -10,18 +10,23 @@ /* * @author unascribed */ -import java.io.*; +import java.io.FileInputStream; +import java.io.IOException; + class MyTestErrorBase extends Throwable { + private static final long serialVersionUID = 0L; } class MyTestError extends MyTestErrorBase { + private static final long serialVersionUID = 0L; } class NotMyTestError extends Throwable { + private static final long serialVersionUID = 0L; } class TestThrow Modified: rvmroot/trunk/testing/tests/bytecodeTests/src/TestVirtualCall.java =================================================================== --- rvmroot/trunk/testing/tests/bytecodeTests/src/TestVirtualCall.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/bytecodeTests/src/TestVirtualCall.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -50,8 +50,8 @@ } SystemOut.println(); - TestVirtualC c = new TestVirtualC(); + new TestVirtualC(); SystemOut.print("\nwant: 3\n got: "); - SystemOut.println(c.g()); + SystemOut.println(TestVirtualC.g()); } } Modified: rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java =================================================================== --- rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -87,9 +87,23 @@ public static Reference [] allocateReferenceArray (int type, double amt, ReferenceQueue rq) { // amt in Mb int rounds = MBtoUnits(amt); Reference [] ra = new Reference[rounds]; - for (int i=0; i<rounds; i++) - ra[i] = (type == WEAK) ? (Reference) new WeakReference(allocateUnit(), rq) : - ((type == SOFT) ? (Reference) new SoftReference(allocateUnit(), rq) : null); + for (int i=0; i<rounds; i++) + { + final Reference reference; + if(type == WEAK) + { + reference = new WeakReference(allocateUnit(), rq); + } + else if(type == SOFT) + { + reference = new SoftReference(allocateUnit(), rq); + } + else + { + reference = null; + } + ra[i] = reference; + } return ra; } @@ -160,7 +174,7 @@ // ------ Finish up ----------- System.out.println(); - double finalHeapSize = getHeapSize(); + getHeapSize(); System.out.print("\nOverall: "); System.out.println((failCount == 0) ? "SUCCESS" : (failCount + " FAILURES")); } Modified: rvmroot/trunk/testing/tests/iterationDriver/VM_Callbacks.java =================================================================== --- rvmroot/trunk/testing/tests/iterationDriver/VM_Callbacks.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/iterationDriver/VM_Callbacks.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -15,7 +15,6 @@ * @author Peter F. Sweeney * @date April 2, 2002 */ -import java.util.Enumeration; public final class VM_Callbacks { Modified: rvmroot/trunk/testing/tests/jni/src/CriticalCopy.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/CriticalCopy.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/CriticalCopy.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -45,8 +45,6 @@ public static void main(String args[]) { int returnValue; - Object returnObject; - boolean checkFlag = false; System.loadLibrary("CriticalCopy"); @@ -60,7 +58,7 @@ returnValue = primitiveIntegerArray(intArray); // check that the array has new values - checkFlag = true; + boolean checkFlag = true; if (verbose) System.out.println("Updated copy"); Modified: rvmroot/trunk/testing/tests/jni/src/JNI12.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/JNI12.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/JNI12.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -57,7 +57,6 @@ Object returnObj; // Reflected Methods - Class stringClass = String.class; Class myClass =JNI12.class; Method dummyM = myClass.getMethod("dummyFunc", new Class[0]); Modified: rvmroot/trunk/testing/tests/jni/src/MonitorTest.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/MonitorTest.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/MonitorTest.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -55,7 +55,6 @@ } public static void main(String args[]) { - int returnValue; System.loadLibrary("MonitorTest"); Modified: rvmroot/trunk/testing/tests/jni/src/NativeException.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/NativeException.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/NativeException.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -42,7 +42,6 @@ public static void main(String args[]) { - int returnValue; boolean returnFlag; int intArray[] = new int[10]; Modified: rvmroot/trunk/testing/tests/jni/src/TestGC.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/TestGC.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/TestGC.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -31,10 +31,7 @@ public static void main(String args[]) { - int returnValue; - boolean returnFlag; boolean runningUnderJDK = true; - boolean copyingGC=false; String str1 = new String("string 1"); String str2 = new String("string 2"); @@ -68,10 +65,8 @@ Address newAddress1 = VM_Magic.objectAsAddress(str1); Address newAddress2 = VM_Magic.objectAsAddress(str2); if (oldAddress1!=newAddress1 && oldAddress2!=newAddress2) { - copyingGC = true; printVerbose("Objects have been moved by GC:"); } else { - copyingGC = false; printVerbose("Objects have NOT been moved by GC:"); } printVerbose(" str1 address = " + VM.addressAsHexString(newAddress1)); Modified: rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -37,7 +37,6 @@ long address = getStaticNativeAddress(); long capacity = getStaticNativeCapacity(); - int returnVal = 0; ByteBuffer native_buffer = newByteBuffer(address, capacity); if (capacity != native_buffer.capacity()) { printVerbose("Wrong capacity: " + capacity + " != " + native_buffer.capacity()); Modified: rvmroot/trunk/testing/tests/jni/src/t3GT3.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/t3GT3.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/t3GT3.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -8,8 +8,6 @@ */ //$Id$ -import com.ibm.jikesrvm.*; - /** * Driver for thread management test in * the face of long-running native calls; @@ -29,8 +27,8 @@ static final boolean FORCE_GC = false; static int NUMBER_OF_WORKERS; - static Object syncher = new Object(); - static Object syncher2 = new Object(); + static final Object syncher = new Object(); + static final Object syncher2 = new Object(); static boolean sanity = false; public static native void nativeBlocking(int time); @@ -60,8 +58,7 @@ long starttime; int arg1 = Integer.parseInt(args[1]); int arg2 = Integer.parseInt(args[2]); - t3GTWorker2 w2 = null; - + System.loadLibrary("t3GT3"); t3GT3Worker.allocate(1,10); @@ -103,7 +100,7 @@ for ( int i = 0; i < NUMBER_OF_WORKERS; i++ ) { while( ! a[i].isReady) { try { - Thread.currentThread().sleep(100); + Thread.sleep(100); } catch (InterruptedException e) { } Modified: rvmroot/trunk/testing/tests/jni/src/t3GTWorker2.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/t3GTWorker2.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/jni/src/t3GTWorker2.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -41,7 +41,7 @@ isReady = true; while (isReady) { try { - Thread.currentThread().sleep(arg1); + Thread.sleep(arg1); } catch (InterruptedException e) { System.out.println(" GC thread returning"); Modified: rvmroot/trunk/testing/tests/opttests/src/TestConstants.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/TestConstants.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/TestConstants.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -22,8 +22,6 @@ public static boolean run() { - boolean retSuccess = true; - System.out.print("TestConstants"); aconst(); Modified: rvmroot/trunk/testing/tests/opttests/src/TestConversions.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/TestConversions.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/TestConversions.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -193,7 +193,7 @@ static void i2b() { - byte x; int i; + byte x; x = i2b(0x0000007f); if (x != 127) { System.out.print("\nwant: 127\n got: "); @@ -252,7 +252,7 @@ static void i2s() { - short x; int i; + short x; x = i2s(0x00007fff); if (x != 32767) { @@ -461,7 +461,6 @@ testFloatLimits(float lo, float hi) { // System.out.println(); - String str = Float.toString(lo); if ((!Float.toString(lo).equals("-Infinity")) || (!Float.toString(hi).equals("Infinity"))) { System.out.println("\nfloat: " + lo + " .. " + hi); Modified: rvmroot/trunk/testing/tests/opttests/src/TestExceptionThrow.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/TestExceptionThrow.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/TestExceptionThrow.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -10,18 +10,23 @@ /** * @author unascribed */ -import java.io.*; +import java.io.FileInputStream; +import java.io.IOException; + class MyErrorBase extends Throwable { + private static final long serialVersionUID = 0L; } class MyError extends MyErrorBase { + private static final long serialVersionUID = 0L; } class NotMyError extends Throwable { + private static final long serialVersionUID = 0L; } class TestExceptionThrow Modified: rvmroot/trunk/testing/tests/opttests/src/TestFieldAccess.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/TestFieldAccess.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/TestFieldAccess.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -44,64 +44,62 @@ public static boolean run() { - boolean retSuccess = true; - System.out.print("TestFieldAccess"); TestFieldAccess b = new TestFieldAccess(); - if (!b.s0) { + if (!TestFieldAccess.s0) { System.out.print("\nwant: true\n got: "); - System.out.println(b.s0); + System.out.println(TestFieldAccess.s0); testSuccess = false; } - if (b.s1 != -1) { + if (TestFieldAccess.s1 != -1) { System.out.print("\nwant: -1\n got: "); - System.out.println(b.s1); + System.out.println(TestFieldAccess.s1); testSuccess = false; } - if (b.s2 != 'A') { + if (TestFieldAccess.s2 != 'A') { System.out.print("\nwant: A\n got: "); - System.out.println(b.s2); + System.out.println(TestFieldAccess.s2); testSuccess = false; } - - if (b.s3 != -3) { - System.out.print("\nwant: -3\n got: "); - System.out.println(b.s3); + + if (TestFieldAccess.s3 != -3) { + System.out.print("\nwant: -3\n got: "); + System.out.println(TestFieldAccess.s3); testSuccess = false; } - - if (b.s4 != -4) { + + if (TestFieldAccess.s4 != -4) { System.out.print("\nwant: -4\n got: "); - System.out.println(b.s4); + System.out.println(TestFieldAccess.s4); testSuccess = false; } - if (b.s5 != -5) { + if (TestFieldAccess.s5 != -5) { System.out.print("\nwant: -5\n got: "); - System.out.println(b.s5); + System.out.println(TestFieldAccess.s5); testSuccess = false; } - - if (b.s6 != -6.0) { - System.out.print("\nwant: -6.0\n got: "); - System.out.println(b.s6); + + if (TestFieldAccess.s6 != -6.0) { + System.out.print("\nwant: -6.0\n got: "); + System.out.println(TestFieldAccess.s6); testSuccess = false; } - - if (b.s7 != -7.0D) { + + if (TestFieldAccess.s7 != -7.0D) { System.out.print("\nwant: -7.0\n got: "); - System.out.println(b.s7); + System.out.println(TestFieldAccess.s7); testSuccess = false; } - String str = b.s8.toString(); + String str = TestFieldAccess.s8.toString(); if (!str.equals("Instance of TestFieldAccess")) { System.out.print("\nwant: Instance of TestFieldAccess\n got: "); - System.out.println(b.s8); + System.out.println(TestFieldAccess.s8); testSuccess = false; } Modified: rvmroot/trunk/testing/tests/opttests/src/TestFinally.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/TestFinally.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/TestFinally.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -57,7 +57,6 @@ static boolean foo2(int a) { - int b; synchronized(lock) { return foo2a(a) == 1; } Modified: rvmroot/trunk/testing/tests/opttests/src/TestThrow.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/TestThrow.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/TestThrow.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -10,8 +10,10 @@ /** * @author unascribed */ -import java.io.*; +import java.io.FileInputStream; +import java.io.IOException; + class MyErrorBase extends Throwable { } Modified: rvmroot/trunk/testing/tests/opttests/src/TestThrow2.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/TestThrow2.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/TestThrow2.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -10,8 +10,10 @@ /** * @author unascribed */ -import java.io.*; +import java.io.FileInputStream; +import java.io.IOException; + class MyErrorBase extends Throwable { } Modified: rvmroot/trunk/testing/tests/opttests/src/interf.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/interf.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/interf.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -11,8 +11,6 @@ * @author unascribed */ -import java.io.*; - public class interf { static boolean run() { int i = test(10000); Modified: rvmroot/trunk/testing/tests/opttests/src/stPutGet.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/stPutGet.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/stPutGet.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -12,8 +12,6 @@ * * @author unascribed */ -import java.io.*; - public class stPutGet { static boolean run() { int i = test(6000); @@ -22,29 +20,11 @@ } public static int test(int n) { - - // TestC2.ppp(); - - int f1 = TestC2.tval; - // System.out.println(" In test: tval = " + f1); - TestC2.tval += n; - - // TestC2.ppp(); - - f1 = TestC2.tval; - // System.out.println(" In test: tval = " + f1); - return TestC2.tval; } - } class TestC2 { - static int tval = 1000; - - static void ppp() { - // System.out.println(" tval = " + tval); - } } Modified: rvmroot/trunk/testing/tests/opttests/src/tak_db.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/tak_db.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/tak_db.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -16,14 +16,9 @@ public static void main(String argv[]) { - int i; System.out.println("Tak is running\n"); - //for (i=0; i<1000; i++){ double result = tak(18,12,6); System.out.println(result + "\n"); - //} - - //System.exit(0); } static boolean run() { Modified: rvmroot/trunk/testing/tests/opttests/src/tak_fp.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/tak_fp.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/tak_fp.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -16,12 +16,9 @@ public static void main(String argv[]) { - int i; System.out.println("Tak is running\n"); - // for (i=0; i<1000; i++){ float result = tak(18,12,6); System.out.println(result + "\n"+test2(18)); -// } } Modified: rvmroot/trunk/testing/tests/opttests/src/threadTest1.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/threadTest1.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/threadTest1.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -7,9 +7,6 @@ * (C) Copyright IBM Corp. 2001 */ //$Id$ -import java.io.*; -import java.util.*; -import java.lang.*; /** * Just lots of unsynchronized read/write to static shared variables. Modified: rvmroot/trunk/testing/tests/opttests/src/unresolved.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/unresolved.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/unresolved.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -13,8 +13,6 @@ * @author unascribed */ -import java.io.*; - public class unresolved { static int[] num = new int[4]; static int cnt; Modified: rvmroot/trunk/testing/tests/opttests/src/virtUnPutGet.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/virtUnPutGet.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/virtUnPutGet.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -11,8 +11,6 @@ * @author unascribed */ -import java.io.*; - public class virtUnPutGet { static boolean run() { int i = test(6000); Modified: rvmroot/trunk/testing/tests/opttests/src/virtUnresolved.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/virtUnresolved.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/virtUnresolved.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -11,8 +11,6 @@ * @author unascribed */ -import java.io.*; - public class virtUnresolved { static boolean run() { int i = test(20); @@ -23,17 +21,9 @@ static int f1 = 0; public static int test(int n) { - - virtUnresolved vur = new virtUnresolved(); - + new virtUnresolved(); virtTest vt = new virtTest(); - vt.ppp(n); - - // vt.tval = 1000; - // vt.ppp(); - - // vt.tval += 2000; vt.ppp(); return f1; @@ -45,14 +35,10 @@ int tval = 0; void ppp(int tv) { - - // System.out.println(" tv = " + tv); tval = tv; virtUnresolved.f1 = tv + 100; } void ppp() { - // System.out.println(" tval = " + tval); } - } Modified: rvmroot/trunk/testing/tests/opttests/src/virtual.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/virtual.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/virtual.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -11,8 +11,6 @@ * @author unascribed */ -import java.io.*; - public class virtual { static boolean run() { int i = iter(5); Modified: rvmroot/trunk/testing/tests/opttests/src/whet.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/whet.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/opttests/src/whet.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -21,9 +21,6 @@ * @author unascribed */ -import java.lang.*; -import java.io.*; - public class whet { Modified: rvmroot/trunk/testing/tests/reflect/src/tClass.java =================================================================== --- rvmroot/trunk/testing/tests/reflect/src/tClass.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/reflect/src/tClass.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -75,7 +75,7 @@ System.out.println(c); try { - Class c_not_found = Class.forName("NotAClassSoThrowAnExceptionPlease"); + Class.forName("NotAClassSoThrowAnExceptionPlease"); } catch (ClassNotFoundException e) { @@ -236,7 +236,7 @@ } // ------------------------------ newInstance - tClass tc = new tClass("Hi!"); + new tClass("Hi!"); String initargs[] = {"I'm dynamic!"}; tClass tc_dyn = (tClass)ctors[0].newInstance(initargs); Modified: rvmroot/trunk/testing/tests/threads/src/TestDispatch.java =================================================================== --- rvmroot/trunk/testing/tests/threads/src/TestDispatch.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/threads/src/TestDispatch.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -28,7 +28,7 @@ workers[i].start(); boolean done = false; while (!done) { - Thread.currentThread().yield(); + Thread.yield(); done = true; for (int i=0; i<threadCount; i++) if (!workers[i].isFinished) Modified: rvmroot/trunk/testing/tests/threads/src/TestNotification.java =================================================================== --- rvmroot/trunk/testing/tests/threads/src/TestNotification.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/threads/src/TestNotification.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -126,7 +126,7 @@ // pause to allow tasks to queue up on flag System.out.println("main: sleeping"); - try { Thread.currentThread().sleep(1000); } catch (InterruptedException e) {} + try { Thread.sleep(1000); } catch (InterruptedException e) {} System.out.println("main: running"); // release tasks waiting on flag, letting them terminate Modified: rvmroot/trunk/testing/tests/threads/src/TestTimedWait.java =================================================================== --- rvmroot/trunk/testing/tests/threads/src/TestTimedWait.java 2006-12-05 16:57:09 UTC (rev 11128) +++ rvmroot/trunk/testing/tests/threads/src/TestTimedWait.java 2006-12-05 17:57:54 UTC (rev 11129) @@ -133,7 +133,7 @@ // pause to allow tasks to queue up on flag System.out.println("main: sleeping"); - try { Thread.currentThread().sleep(1000); } catch (InterruptedException e) {} + try { Thread.sleep(1000); } catch (InterruptedException e) {} System.out.println("main: running"); // release tasks waiting on flag, letting them terminate This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-22 03:57:26
|
Revision: 11337 http://svn.sourceforge.net/jikesrvm/?rev=11337&view=rev Author: peter_donald Date: 2007-01-21 19:57:25 -0800 (Sun, 21 Jan 2007) Log Message: ----------- Remove some warnings caused when varargs became a language feature and some classes becam varargs methods. Modified Paths: -------------- rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java rvmroot/trunk/testing/tests/opttests/src/InvokeReflect.java Modified: rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java =================================================================== --- rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java 2007-01-22 01:33:47 UTC (rev 11336) +++ rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java 2007-01-22 03:57:25 UTC (rev 11337) @@ -87,11 +87,11 @@ */ public static void main(String[] args) throws Exception { Class clazz = Class.forName("InlineAllocation"); - Method trivialJ = clazz.getDeclaredMethod("trivial", new Class[] { clazz }); - Method alloc1J = clazz.getDeclaredMethod("alloc1", null); - Method alloc2J = clazz.getDeclaredMethod("alloc2", null); - Method alloc3J = clazz.getDeclaredMethod("alloc3", null); - Method alloc4J = clazz.getDeclaredMethod("alloc4", new Class[] {Integer.TYPE}); + Method trivialJ = clazz.getDeclaredMethod("trivial", clazz); + Method alloc1J = clazz.getDeclaredMethod("alloc1", (Class[])null); + Method alloc2J = clazz.getDeclaredMethod("alloc2", (Class[])null); + Method alloc3J = clazz.getDeclaredMethod("alloc3", (Class[])null); + Method alloc4J = clazz.getDeclaredMethod("alloc4", Integer.TYPE); VM_Method trivial = java.lang.reflect.JikesRVMSupport.getMethodOf(trivialJ); VM_Method alloc1 = java.lang.reflect.JikesRVMSupport.getMethodOf(alloc1J); Modified: rvmroot/trunk/testing/tests/opttests/src/InvokeReflect.java =================================================================== --- rvmroot/trunk/testing/tests/opttests/src/InvokeReflect.java 2007-01-22 01:33:47 UTC (rev 11336) +++ rvmroot/trunk/testing/tests/opttests/src/InvokeReflect.java 2007-01-22 03:57:25 UTC (rev 11337) @@ -34,7 +34,7 @@ methodToRun + " " + signatureToPrintOut + " ****."); Class klass = Class.forName(arg); Method method = klass.getDeclaredMethod(methodToRun, noparams); - Object result = method.invoke(null, noparams); + Object result = method.invoke(null, (Object[])noparams); System.out.println("**** RESULT: " + result); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 04:07:51
|
Revision: 12071 http://svn.sourceforge.net/jikesrvm/?rev=12071&view=rev Author: peter_donald Date: 2007-04-27 21:07:50 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Increase time so that stress testing can run for longer (which it will if you force optimization level, extreme assertions and extremely frequent gcs) Modified Paths: -------------- rvmroot/trunk/testing/tests/basic/build.xml rvmroot/trunk/testing/tests/opttests/build.xml Modified: rvmroot/trunk/testing/tests/basic/build.xml =================================================================== --- rvmroot/trunk/testing/tests/basic/build.xml 2007-04-28 04:06:46 UTC (rev 12070) +++ rvmroot/trunk/testing/tests/basic/build.xml 2007-04-28 04:07:50 UTC (rev 12071) @@ -1,6 +1,9 @@ <project name="basic" default="test" basedir="."> - <property name="test.time.limit" value="400"/> + <condition property="test.time.limit" value="1000" else="400"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + <property name="test.max.heapsize" value="150"/> <import file="../../../build/tests.xml"/> Modified: rvmroot/trunk/testing/tests/opttests/build.xml =================================================================== --- rvmroot/trunk/testing/tests/opttests/build.xml 2007-04-28 04:06:46 UTC (rev 12070) +++ rvmroot/trunk/testing/tests/opttests/build.xml 2007-04-28 04:07:50 UTC (rev 12071) @@ -1,6 +1,9 @@ <project name="opttests" default="test" basedir="."> - <property name="test.time.limit" value="400"/> + <condition property="test.time.limit" value="1000" else="400"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + <property name="test.max.heapsize" value="150"/> <import file="../../../build/tests.xml"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 23:39:25
|
Revision: 12084 http://svn.sourceforge.net/jikesrvm/?rev=12084&view=rev Author: peter_donald Date: 2007-04-28 16:39:23 -0700 (Sat, 28 Apr 2007) Log Message: ----------- Increase time during gcstress mode Modified Paths: -------------- rvmroot/trunk/testing/tests/CaffeineMark/build.xml rvmroot/trunk/testing/tests/dacapo/build.xml rvmroot/trunk/testing/tests/jBYTEmark/build.xml rvmroot/trunk/testing/tests/javalex/build.xml rvmroot/trunk/testing/tests/jni/build.xml rvmroot/trunk/testing/tests/soot/build.xml rvmroot/trunk/testing/tests/xerces/build.xml Modified: rvmroot/trunk/testing/tests/CaffeineMark/build.xml =================================================================== --- rvmroot/trunk/testing/tests/CaffeineMark/build.xml 2007-04-28 13:06:24 UTC (rev 12083) +++ rvmroot/trunk/testing/tests/CaffeineMark/build.xml 2007-04-28 23:39:23 UTC (rev 12084) @@ -1,8 +1,12 @@ <project name="CaffeineMark" default="test" basedir="."> - <condition property="test.time.limit" value="600" else="300"> + <condition property="test.time.limit" value="600"> <equals arg1="${test.mode}" arg2="performance"/> </condition> + <condition property="test.time.limit" value="1500" else="300"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + <property name="test.max.heapsize" value="200"/> <import file="../../../build/tests.xml"/> Modified: rvmroot/trunk/testing/tests/dacapo/build.xml =================================================================== --- rvmroot/trunk/testing/tests/dacapo/build.xml 2007-04-28 13:06:24 UTC (rev 12083) +++ rvmroot/trunk/testing/tests/dacapo/build.xml 2007-04-28 23:39:23 UTC (rev 12084) @@ -1,8 +1,12 @@ <project name="dacapo" default="test" basedir="."> - <condition property="test.time.limit" value="1800" else="480"> + <condition property="test.time.limit" value="1800"> <equals arg1="${test.mode}" arg2="performance"/> </condition> + <condition property="test.time.limit" value="3000" else="480"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + <property name="test.max.heapsize" value="150"/> <import file="../../../build/tests.xml"/> Modified: rvmroot/trunk/testing/tests/jBYTEmark/build.xml =================================================================== --- rvmroot/trunk/testing/tests/jBYTEmark/build.xml 2007-04-28 13:06:24 UTC (rev 12083) +++ rvmroot/trunk/testing/tests/jBYTEmark/build.xml 2007-04-28 23:39:23 UTC (rev 12084) @@ -1,6 +1,8 @@ <project name="jBYTEmark" default="test" basedir="."> - <property name="test.time.limit" value="900"/> + <condition property="test.time.limit" value="2900" else="900"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> <property name="test.max.heapsize" value="150"/> <import file="../../../build/tests.xml"/> Modified: rvmroot/trunk/testing/tests/javalex/build.xml =================================================================== --- rvmroot/trunk/testing/tests/javalex/build.xml 2007-04-28 13:06:24 UTC (rev 12083) +++ rvmroot/trunk/testing/tests/javalex/build.xml 2007-04-28 23:39:23 UTC (rev 12084) @@ -1,6 +1,8 @@ <project name="javalex" default="test" basedir="."> - <property name="test.time.limit" value="600"/> + <condition property="test.time.limit" value="1900" else="600"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> <property name="test.max.heapsize" value="200"/> <import file="../../../build/tests.xml"/> Modified: rvmroot/trunk/testing/tests/jni/build.xml =================================================================== --- rvmroot/trunk/testing/tests/jni/build.xml 2007-04-28 13:06:24 UTC (rev 12083) +++ rvmroot/trunk/testing/tests/jni/build.xml 2007-04-28 23:39:23 UTC (rev 12084) @@ -1,7 +1,9 @@ <project name="jni" default="test" basedir="."> <property name="test.max.heapsize" value="64"/> - <property name="test.time.limit" value="180"/> + <condition property="test.time.limit" value="1000" else="180"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> <import file="../../../build/tests.xml"/> Modified: rvmroot/trunk/testing/tests/soot/build.xml =================================================================== --- rvmroot/trunk/testing/tests/soot/build.xml 2007-04-28 13:06:24 UTC (rev 12083) +++ rvmroot/trunk/testing/tests/soot/build.xml 2007-04-28 23:39:23 UTC (rev 12084) @@ -1,8 +1,12 @@ <project name="soot" default="test" basedir="."> - <condition property="test.time.limit" value="1200" else="600"> + <condition property="test.time.limit" value="1200"> <equals arg1="${test.mode}" arg2="performance"/> </condition> + <condition property="test.time.limit" value="22000" else="600"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + <property name="test.max.heapsize" value="200"/> <import file="../../../build/tests.xml"/> Modified: rvmroot/trunk/testing/tests/xerces/build.xml =================================================================== --- rvmroot/trunk/testing/tests/xerces/build.xml 2007-04-28 13:06:24 UTC (rev 12083) +++ rvmroot/trunk/testing/tests/xerces/build.xml 2007-04-28 23:39:23 UTC (rev 12084) @@ -1,8 +1,12 @@ <project name="xerces" default="test" basedir="."> - <condition property="test.time.limit" value="900" else="300"> + <condition property="test.time.limit" value="900"> <equals arg1="${test.mode}" arg2="performance"/> </condition> + <condition property="test.time.limit" value="1900" else="300"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + <!-- TODO: when in performance run Use iteration driver and execute twice --> <property name="test.max.heapsize" value="200"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-08-31 23:45:25
|
Revision: 13427 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13427&view=rev Author: peter_donald Date: 2007-08-31 16:45:22 -0700 (Fri, 31 Aug 2007) Log Message: ----------- Add License headers Modified Paths: -------------- rvmroot/trunk/testing/tests/perf-dacapo/dacapo.properties rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties rvmroot/trunk/testing/tests/perf-jvm98/jvm98.properties Modified: rvmroot/trunk/testing/tests/perf-dacapo/dacapo.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-dacapo/dacapo.properties 2007-08-31 23:41:12 UTC (rev 13426) +++ rvmroot/trunk/testing/tests/perf-dacapo/dacapo.properties 2007-08-31 23:45:22 UTC (rev 13427) @@ -1,3 +1,15 @@ +# +# This file is part of the Jikes RVM project (http://jikesrvm.org). +# +# This file is licensed to You under the Common Public License (CPL); +# You may not use this file except in compliance with the License. You +# may obtain a copy of the License at +# +# http://www.opensource.org/licenses/cpl1.0.php +# +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. +# antlr.smallHeap=30 antlr.largeHeap=126 bloat.smallHeap=43 Modified: rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties 2007-08-31 23:41:12 UTC (rev 13426) +++ rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties 2007-08-31 23:45:22 UTC (rev 13427) @@ -1,3 +1,15 @@ +# +# This file is part of the Jikes RVM project (http://jikesrvm.org). +# +# This file is licensed to You under the Common Public License (CPL); +# You may not use this file except in compliance with the License. You +# may obtain a copy of the License at +# +# http://www.opensource.org/licenses/cpl1.0.php +# +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. +# smallHeap=375 largeHeap=1500 smallHeap-true.timeLimit=2100 Modified: rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties 2007-08-31 23:41:12 UTC (rev 13426) +++ rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties 2007-08-31 23:45:22 UTC (rev 13427) @@ -1,3 +1,15 @@ +# +# This file is part of the Jikes RVM project (http://jikesrvm.org). +# +# This file is licensed to You under the Common Public License (CPL); +# You may not use this file except in compliance with the License. You +# may obtain a copy of the License at +# +# http://www.opensource.org/licenses/cpl1.0.php +# +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. +# smallHeap=360 largeHeap=1440 smallHeap-true.timeLimit=2100 Modified: rvmroot/trunk/testing/tests/perf-jvm98/jvm98.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-jvm98/jvm98.properties 2007-08-31 23:41:12 UTC (rev 13426) +++ rvmroot/trunk/testing/tests/perf-jvm98/jvm98.properties 2007-08-31 23:45:22 UTC (rev 13427) @@ -1,3 +1,15 @@ +# +# This file is part of the Jikes RVM project (http://jikesrvm.org). +# +# This file is licensed to You under the Common Public License (CPL); +# You may not use this file except in compliance with the License. You +# may obtain a copy of the License at +# +# http://www.opensource.org/licenses/cpl1.0.php +# +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. +# _201_compress.smallHeap=29 _201_compress.largeHeap=120 _202_jess.smallHeap=17 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dfr...@us...> - 2007-09-04 23:43:32
|
Revision: 13495 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13495&view=rev Author: dframpton-oss Date: 2007-09-04 16:43:29 -0700 (Tue, 04 Sep 2007) Log Message: ----------- More fixes for test system under new multi-execution style. Modified Paths: -------------- rvmroot/trunk/testing/tests/perf-jbb2000/build.xml rvmroot/trunk/testing/tests/perf-jbb2005/build.xml Modified: rvmroot/trunk/testing/tests/perf-jbb2000/build.xml =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2000/build.xml 2007-09-04 20:59:45 UTC (rev 13494) +++ rvmroot/trunk/testing/tests/perf-jbb2000/build.xml 2007-09-04 23:43:29 UTC (rev 13495) @@ -87,9 +87,10 @@ <outputExecutionStart tag="@{tag}" execution="@{execution}"/> <outputStatisticStart/> <extractMMTkStatistics tag="@{tag}" execution="@{execution}" statistics="time.mu time.gc GC majorGC"/> - <findStatistic tag="@{tag}" pattern="Run will be COMPLIANT" key="compliant.check"/> - <findStatistic tag="@{tag}" pattern="No errors. Valid run." key="errors.check"/> + <findStatistic tag="@{tag}" execution="@{execution}" pattern="Run will be COMPLIANT" key="compliant.check"/> + <findStatistic tag="@{tag}" execution="@{execution}" pattern="No errors. Valid run." key="errors.check"/> <extractStatistic tag="@{tag}" + execution="@{execution}" pattern="Valid run, Score is\s*(\S*)" key="score"/> <outputStatisticEnd/> Modified: rvmroot/trunk/testing/tests/perf-jbb2005/build.xml =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2005/build.xml 2007-09-04 20:59:45 UTC (rev 13494) +++ rvmroot/trunk/testing/tests/perf-jbb2005/build.xml 2007-09-04 23:43:29 UTC (rev 13495) @@ -90,10 +90,10 @@ <outputExecutionStart tag="@{tag}" execution="@{execution}"/> <outputStatisticStart/> <extractMMTkStatistics tag="@{tag}" execution="@{execution}" statistics="time.mu time.gc GC majorGC"/> - <findStatistic tag="@{tag}" pattern="JVM Check OK" key="jvm.check"/> - <findStatistic tag="@{tag}" pattern="Run will be COMPLIANT" key="compliant.check"/> - <findStatistic tag="@{tag}" pattern="No errors. Valid run." key="errors.check"/> - <extractStatistic tag="@{tag}" pattern="Valid run, Score is\s*(\S*)" key="score"/> + <findStatistic tag="@{tag}" execution="@{execution}" pattern="JVM Check OK" key="jvm.check"/> + <findStatistic tag="@{tag}" execution="@{execution}" pattern="Run will be COMPLIANT" key="compliant.check"/> + <findStatistic tag="@{tag}" execution="@{execution}" pattern="No errors. Valid run." key="errors.check"/> + <extractStatistic tag="@{tag}" execution="@{execution}" pattern="Valid run, Score is\s*(\S*)" key="score"/> <outputStatisticEnd/> <outputExecutionResults tag="@{tag}" execution="@{execution}"/> <outputExecutionEnd/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-18 01:22:47
|
Revision: 11305 http://svn.sourceforge.net/jikesrvm/?rev=11305&view=rev Author: peter_donald Date: 2007-01-17 17:22:45 -0800 (Wed, 17 Jan 2007) Log Message: ----------- This is a reorganization of some of the existing integration tests. It incorporates the tests that existed in the following directories; * bytecodeTests * javaagent * nio * reflect * serialization * threads * utf8 The existing tests were modified in a number of circumstances. In particular * some of the tests in bytecodeTests were merged, renamed and more tests were added. * the threads tests were non deterministic in both the output order AND the output results and as a result many were disabled. The output has been made deterministic and all the tests reworked until they produced results reliably. * More tests were added. The new tests should remove the need for Veiovis test and the independent xalan test. * the tests were placed in packages. Added Paths: ----------- rvmroot/trunk/testing/tests/basic/ rvmroot/trunk/testing/tests/basic/build.xml rvmroot/trunk/testing/tests/basic/src/ rvmroot/trunk/testing/tests/basic/src/test/ rvmroot/trunk/testing/tests/basic/src/test/org/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/data/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/data/SubClassInDifferentPackage.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/AgentX.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.dat rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Flag.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Mailbox.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Task.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/XThread.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.expected rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.java Added: rvmroot/trunk/testing/tests/basic/build.xml =================================================================== --- rvmroot/trunk/testing/tests/basic/build.xml (rev 0) +++ rvmroot/trunk/testing/tests/basic/build.xml 2007-01-18 01:22:45 UTC (rev 11305) @@ -0,0 +1,100 @@ +<project name="basic" default="test" basedir="."> + + <property name="test.time.limit" value="400"/> + <property name="test.max.heapsize" value="150"/> + + <property name="jikesrvm.dir" location="${basedir}/../../.."/> + <import file="${jikesrvm.dir}/build/properties.xml"/> + <import file="${jikesrvm.dir}/build/tests.xml"/> + + <property name="main.java" location="${basedir}/src"/> + + <property name="build.classes" location="${build.dir}/classes"/> + + <property name="test.class.path" value="${build.classes}"/> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Compile the tests * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <target name="compile" depends="init"> + <mkdir dir="${build.classes}"/> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true"> + <!-- need extra classpath for vmmagic --> + <classpath> + <pathelement path="${test.rvm.dir}/jksvm.jar"/> + </classpath> + </javac> + + <jar file="${build.dir}/AgentX.jar" basedir="${build.classes}" includes="**/AgentX.class"> + <manifest> + <attribute name="Premain-Class" value="test.org.jikesrvm.basic.core.instrument.AgentX"/> + </manifest> + </jar> + </target> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Run the tests * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <target name="test" depends="compile"> + <startResults/> + <outputGroupStart/> + + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestArithmetic"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestArrayAccess"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestCompare"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestThrownException"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestSwitch"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestInvoke"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestClassInitializer"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestMiranda"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestInstanceOf"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestClone"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestFinally"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestReturn"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestFieldAccess"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestFloatingRem"/> + <runCompareTest class="test.org.jikesrvm.basic.core.bytecode.TestConstants"/> + + <runCompareTest class="test.org.jikesrvm.basic.core.reflect.tClass"/> + <runCompareTest class="test.org.jikesrvm.basic.core.reflect.tArray"/> + <runCompareTest class="test.org.jikesrvm.basic.core.reflect.TestFieldReflection"/> + <runCompareTest class="test.org.jikesrvm.basic.core.reflect.tInstance"/> + <runCompareTest class="test.org.jikesrvm.basic.core.reflect.tNewInstance"/> + + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestDispatch"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestBackEdgeGC"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestNotification"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestTimedWait"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestInterruptAndSpin"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestInterruptedSleep"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestInterruptedWait"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestStop"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestSuspend" timeLimit="20"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestTimeSlicing"/> + <runCompareTest class="test.org.jikesrvm.basic.core.threads.TestVolatiles"/> + + <runCompareTest class="test.org.jikesrvm.basic.core.serialization.TestSerialization" + classpath="${build.classes}:${main.java}"/> + + <runCompareTest class="test.org.jikesrvm.basic.core.classloading.TestUTF8"/> + <runCompareTest class="test.org.jikesrvm.basic.core.classloading.TestClassLoading"/> + <runCompareTest class="test.org.jikesrvm.basic.core.classloading.TestLoadingWithoutName"/> + + <runCompareTest class="test.org.jikesrvm.basic.java.lang.TestMath"/> + <runCompareTest class="test.org.jikesrvm.basic.java.nio.TestFileChannel"/> + + <runCompareTest class="test.org.jikesrvm.basic.core.instrument.TestAgent" + rvmArgs='-javaagent:${build.dir}/AgentX.jar="Option1"'/> + + <outputGroupEnd/> + <finishResults/> + </target> + +</project> Property changes on: rvmroot/trunk/testing/tests/basic/build.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected =================================================================== --- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected (rev 0) +++ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected 2007-01-18 01:22:45 UTC (rev 11305) @@ -0,0 +1,85 @@ + +-- itest -- +Expected: 4 Actual: 4 +Expected: 2 Actual: 2 +Expected: 9 Actual: 9 +Expected: 1 Actual: 1 +Expected: 1 Actual: 1 +Expected: -3 Actual: -3 +Expected: 4 Actual: 4 +Expected: 1 Actual: 1 +Expected: 273 Actual: 273 +Expected: 272 Actual: 272 +Expected: -6 Actual: -6 +Expected: -2 Actual: -2 +Expected: 2147483646 Actual: 2147483646 + +-- ltest -- +Expected: 10000000002 Actual: 10000000002 +Expected: 9999999998 Actual: 9999999998 +Expected: 20000000000 Actual: 20000000000 +Expected: 5000000000 Actual: 5000000000 +Expected: 0 Actual: 0 +Expected: -2 Actual: -2 +Expected: -10000000000 Actual: -10000000000 +Expected: 4503599627370497 Actual: 4503599627370497 +Expected: 1229482698272145681 Actual: 1229482698272145681 +Expected: 1224979098644775184 Actual: 1224979098644775184 +Expected: -6 Actual: -6 +Expected: -2 Actual: -2 +Expected: -1 Actual: -1 +Expected: 9223372036854775806 Actual: 9223372036854775806 + +-- ftest -- +Expected: 40400000 Actual: 40400000 +Expected: bf800000 Actual: bf800000 +Expected: 40000000 Actual: 40000000 +Expected: 3f000000 Actual: 3f000000 +Expected: bf800000 Actual: bf800000 +Expected: 3f19999a Actual: 3f19999a + +-- dtest -- +Expected: 4008000000000000 Actual: 4008000000000000 +Expected: bff0000000000000 Actual: bff0000000000000 +Expected: 4000000000000000 Actual: 4000000000000000 +Expected: 3fe0000000000000 Actual: 3fe0000000000000 +Expected: bff0000000000000 Actual: bff0000000000000 +Expected: 3fe3333333333333 Actual: 3fe3333333333333 + +-- nanTestFloat -- + expr expected got +---------- -------- ---------- +NaN < NaN false false +NaN <= NaN false false +NaN == NaN false false +NaN != NaN true true +NaN >= NaN false false +NaN > NaN false false + +-- nanTestDouble -- + expr expected got +---------- -------- ---------- +NaN < NaN false false +NaN <= NaN false false +NaN == NaN false false +NaN != NaN true true +NaN >= NaN false false +NaN > NaN false false + +-- remTest -- +2.0 / 3.0=3fe5555555555555 +2.0 % 3.0=4000000000000000 +2.0 rem 3.0=bff0000000000000 + +2.0 / -3.0=bfe5555555555555 +2.0 % -3.0=4000000000000000 +2.0 rem -3.0=bff0000000000000 + +-2.0 / 3.0=bfe5555555555555 +-2.0 % 3.0=c000000000000000 +-2.0 rem 3.0=3ff0000000000000 + +-2.0 / -3.0=3fe5555555555555 +-2.0 % -3.0=c000000000000000 +-2.0 rem -3.0=3ff0000000000000 + Added: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java =================================================================== --- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java (rev 0) +++ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java 2007-01-18 01:22:45 UTC (rev 11305) @@ -0,0 +1,208 @@ +/* + * This file is part of Jikes RVM (http://jikesrvm.sourceforge.net). + * The Jikes RVM project is distributed under the Common Public License (CPL). + * A copy of the license is included in the distribution, and is also + * available at http://www.opensource.org/licenses/cpl1.0.php + * + * (C) Copyright IBM Corp. 2001 + */ +package test.org.jikesrvm.basic.core.bytecode; + +/** + * @author unascribed + */ +class TestArithmetic { + public static void main(String args[]) { + System.out.println(); + System.out.println("-- itest --"); + itest(); + System.out.println(); + System.out.println("-- ltest --"); + ltest(); + System.out.println(); + System.out.println("-- ftest --"); + ftest(); + System.out.println(); + System.out.println("-- dtest --"); + dtest(); + System.out.println(); + System.out.println("-- nanTestFloat --"); + nanTestFloat(); + System.out.println(); + System.out.println("-- nanTestDouble --"); + nanTestDouble(); + System.out.println(); + System.out.println("-- remTest --"); + remTest(); + } + + private static void itest() { + int a = 3; + System.out.print("Expected: 4 Actual: "); + System.out.println(a + 1); // iadd + System.out.print("Expected: 2 Actual: "); + System.out.println(a - 1); // isub + System.out.print("Expected: 9 Actual: "); + System.out.println(a * 3); // imul + System.out.print("Expected: 1 Actual: "); + System.out.println(a / 2); // idiv + System.out.print("Expected: 1 Actual: "); + System.out.println(a % 2); // irem + System.out.print("Expected: -3 Actual: "); + System.out.println(-a); // ineg + System.out.print("Expected: 4 Actual: "); + System.out.println(++a); // iinc + + a = 0x00000011; + int b = 0x00000101; + + System.out.print("Expected: 1 Actual: "); + System.out.println(a & b); // iand + System.out.print("Expected: 273 Actual: "); + System.out.println(a | b); // ior + System.out.print("Expected: 272 Actual: "); + System.out.println(a ^ b); // ixor + + a = 0xfffffffd; // -3 + + System.out.print("Expected: -6 Actual: "); + System.out.println(a << 1); // ishl + System.out.print("Expected: -2 Actual: "); + System.out.println(a >> 1); // ishr + System.out.print("Expected: 2147483646 Actual: "); + System.out.println(a >>> 1); // iushr + } + + private static void ltest() { + long a = 10000000000L; + long b = 2; + + System.out.print("Expected: 10000000002 Actual: "); + System.out.println(a + b); // ladd + System.out.print("Expected: 9999999998 Actual: "); + System.out.println(a - b); // lsub + System.out.print("Expected: 20000000000 Actual: "); + System.out.println(a * b); // lmul + System.out.print("Expected: 5000000000 Actual: "); + System.out.println(a / b); // ldiv + System.out.print("Expected: 0 Actual: "); + System.out.println(a % b); // lrem + System.out.print("Expected: -2 Actual: "); + System.out.println(-b); // lneg + System.out.print("Expected: -10000000000 Actual: "); + System.out.println(-a); // lneg + + a = 0x0110000000000011L; + b = 0x1010000000000101L; + + System.out.print("Expected: 4503599627370497 Actual: "); + System.out.println(a & b); // land + System.out.print("Expected: 1229482698272145681 Actual: "); + System.out.println(a | b); // lor + System.out.print("Expected: 1224979098644775184 Actual: "); + System.out.println(a ^ b); // lxor + + a = 0xfffffffffffffffdL; // -3 + + System.out.print("Expected: -6 Actual: "); + System.out.println(a << 1); // lshl + System.out.print("Expected: -2 Actual: "); + System.out.println(a >> 1); // lshr + System.out.print("Expected: -1 Actual: "); + System.out.println(a >> 33); // lshr, count > 32 + System.out.print("Expected: 9223372036854775806 Actual: "); + System.out.println(a >>> 1); // lushr + } + + private static void ftest() { + float a = 1; + float b = 2; + + System.out.print("Expected: " + Integer.toHexString(Float.floatToIntBits(3.0F)) + " Actual: "); + System.out.println(Integer.toHexString(Float.floatToIntBits(a + b))); // fadd + + System.out.print("Expected: " + Integer.toHexString(Float.floatToIntBits(-1.0F)) + " Actual: "); + System.out.println(Integer.toHexString(Float.floatToIntBits(a - b))); // fsub + + System.out.print("Expected: " + Integer.toHexString(Float.floatToIntBits(2.0F)) + " Actual: "); + System.out.println(Integer.toHexString(Float.floatToIntBits(a * b))); // fmul + + System.out.print("Expected: " + Integer.toHexString(Float.floatToIntBits(0.5F)) + " Actual: "); + System.out.println(Integer.toHexString(Float.floatToIntBits(a / b))); // fdiv + + System.out.print("Expected: " + Integer.toHexString(Float.floatToIntBits(-1.0F)) + " Actual: "); + System.out.println(Integer.toHexString(Float.floatToIntBits(-a))); // fneg + + a = 1.5F; + b = 0.9F; + System.out.print("Expected: " + Integer.toHexString(Float.floatToIntBits(0.6F)) + " Actual: "); + System.out.println(Integer.toHexString(Float.floatToIntBits(a % b))); // frem + } + + private static void dtest() { + double a = 1; + double b = 2; + + System.out.print("Expected: " + Long.toHexString(Double.doubleToLongBits(3.0D)) + " Actual: "); + System.out.println(Long.toHexString(Double.doubleToLongBits(a + b))); // dadd + + System.out.print("Expected: " + Long.toHexString(Double.doubleToLongBits(-1.0D)) + " Actual: "); + System.out.println(Long.toHexString(Double.doubleToLongBits(a - b))); // dsub + + System.out.print("Expected: " + Long.toHexString(Double.doubleToLongBits(2.0D)) + " Actual: "); + System.out.println(Long.toHexString(Double.doubleToLongBits(a * b))); // dmul + + System.out.print("Expected: " + Long.toHexString(Double.doubleToLongBits(0.5D)) + " Actual: "); + System.out.println(Long.toHexString(Double.doubleToLongBits(a / b))); // ddiv + + System.out.print("Expected: " + Long.toHexString(Double.doubleToLongBits(-1.0D)) + " Actual: "); + System.out.println(Long.toHexString(Double.doubleToLongBits(-a))); // dneg + + a = 1.5; + b = 0.9; + System.out.print("Expected: " + Long.toHexString(Double.doubleToLongBits(0.6D)) + " Actual: "); + System.out.println(Long.toHexString(Double.doubleToLongBits(a % b))); // drem + } + + private static void nanTestFloat() { + float zero = 0; + float NaN = zero / zero; + + System.out.print(" expr expected got \n"); + System.out.print("---------- -------- ----------\n"); + System.out.print("NaN < NaN false " + (NaN < NaN) + "\n"); + System.out.print("NaN <= NaN false " + (NaN <= NaN) + "\n"); + System.out.print("NaN == NaN false " + (NaN == NaN) + "\n"); + System.out.print("NaN != NaN true " + (NaN != NaN) + "\n"); + System.out.print("NaN >= NaN false " + (NaN >= NaN) + "\n"); + System.out.print("NaN > NaN false " + (NaN > NaN) + "\n"); + } + + private static void nanTestDouble() { + double zero = 0; + double NaN = zero / zero; + + System.out.println(" expr expected got "); + System.out.println("---------- -------- ----------"); + System.out.println("NaN < NaN false " + (NaN < NaN)); + System.out.println("NaN <= NaN false " + (NaN <= NaN)); + System.out.println("NaN == NaN false " + (NaN == NaN)); + System.out.println("NaN != NaN true " + (NaN != NaN)); + System.out.println("NaN >= NaN false " + (NaN >= NaN)); + System.out.println("NaN > NaN false " + (NaN > NaN) ); + } + + private static void remTest() { + rem(+2, +3); + rem(+2, -3); + rem(-2, +3); + rem(-2, -3); + } + + private static void rem(final double a, final double b) { + System.out.println(a + " / " + b + "=" + Long.toHexString(Double.doubleToLongBits(a / b))); + System.out.println(a + " % " + b + "=" + Long.toHexString(Double.doubleToLongBits(a % b))); + System.out.println(a + " rem " + b + "=" + Long.toHexString(Double.doubleToLongBits(Math.IEEEremainder(a, b)))); + System.out.println(); + } +} Property changes on: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected =================================================================== --- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected (rev 0) +++ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected 2007-01-18 01:22:45 UTC (rev 11305) @@ -0,0 +1,70 @@ +Boolean Array Expected: false,true Actual: false,true +Byte Array Expected: 127,-1 Actual: 127,-1 +Char Array Expected: c,$ Actual: c,$ +Short Array Expected: 32767,-1 Actual: 32767,-1 +Int Array Expected: 0,1 Actual: 0,1 +Long Array Expected: 0,1 Actual: 0,1 +Float Array Expected: 0,1 Actual: 0.0,1.0 +Double Array Expected: 0,1 Actual: 0.0,1.0 +Double Array Expected: null,s Actual: null,s +Double Array Expected: null,[Ljava.lang.Object; Actual: null,[Ljava.lang.Object; +Multi-dimensional Int Array +ary[0][0][0]=0 +ary[0][0][1]=1 +ary[0][0][2]=2 +ary[0][0][3]=3 +ary[0][1][0]=4 +ary[0][1][1]=5 +ary[0][1][2]=6 +ary[0][1][3]=7 +ary[0][2][0]=8 +ary[0][2][1]=9 +ary[0][2][2]=10 +ary[0][2][3]=11 +ary[1][0][0]=12 +ary[1][0][1]=13 +ary[1][0][2]=14 +ary[1][0][3]=15 +ary[1][1][0]=16 +ary[1][1][1]=17 +ary[1][1][2]=18 +ary[1][1][3]=19 +ary[1][2][0]=20 +ary[1][2][1]=21 +ary[1][2][2]=22 +ary[1][2][3]=23 + +Multi-dimensional Object Array +ary[0][0][0]=0 +ary[0][0][1]=1 +ary[0][0][2]=2 +ary[0][0][3]=3 +ary[0][1][0]=4 +ary[0][1][1]=5 +ary[0][1][2]=6 +ary[0][1][3]=7 +ary[0][2][0]=8 +ary[0][2][1]=9 +ary[0][2][2]=10 +ary[0][2][3]=11 +ary[1][0][0]=12 +ary[1][0][1]=13 +ary[1][0][2]=14 +ary[1][0][3]=15 +ary[1][1][0]=16 +ary[1][1][1]=17 +ary[1][1][2]=18 +ary[1][1][3]=19 +ary[1][2][0]=20 +ary[1][2][1]=21 +ary[1][2][2]=22 +ary[1][2][3]=23 + +Partial Multi-dimensional int Array +ary[0][0]=null +ary[0][1]=null +ary[0][2]=null +ary[1][0]=null +ary[1][1]=null +ary[1][2]=null + Added: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java =================================================================== --- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java (rev 0) +++ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java 2007-01-18 01:22:45 UTC (rev 11305) @@ -0,0 +1,178 @@ +/* + * This file is part of Jikes RVM (http://jikesrvm.sourceforge.net). + * The Jikes RVM project is distributed under the Common Public License (CPL). + * A copy of the license is included in the distribution, and is also + * available at http://www.opensource.org/licenses/cpl1.0.php + * + * (C) Copyright IBM Corp. 2001 + */ +package test.org.jikesrvm.basic.core.bytecode; + +/** + * @author unascribed + */ +class TestArrayAccess { + public static void main(String args[]) { + boolean_array(); + byte_array(); + char_array(); + short_array(); + int_array(); + long_array(); + float_array(); + double_array(); + object_array(); + array_array(); + multi_int_array(); + multi_object_array(); + multi_partial_array(); + } + + private static void boolean_array() { + final boolean[] array = new boolean[]{false, true}; + System.out.print("Boolean Array Expected: false,true Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void byte_array() { + final byte[] array = new byte[]{127, -1}; + System.out.print("Byte Array Expected: 127,-1 Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void char_array() { + final char[] array = new char[]{'c', '$'}; + System.out.print("Char Array Expected: c,$ Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void short_array() { + final short[] array = new short[]{32767, -1}; + System.out.print("Short Array Expected: 32767,-1 Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void int_array() { + final int[] array = new int[]{0, 1}; + System.out.print("Int Array Expected: 0,1 Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void long_array() { + final long[] array = new long[]{0, 1}; + System.out.print("Long Array Expected: 0,1 Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void float_array() { + final float[] array = new float[]{0, 1}; + System.out.print("Float Array Expected: 0,1 Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void double_array() { + final double[] array = new double[]{0, 1}; + System.out.print("Double Array Expected: 0,1 Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void object_array() { + final Object[] array = new Object[]{null, "s"}; + System.out.print("Double Array Expected: null,s Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1]); + System.out.println(); + } + + private static void array_array() { + final Object[] array = new Object[]{null, new Object[2]}; + System.out.print("Double Array Expected: null,[Ljava.lang.Object; Actual: "); + System.out.print(array[0]); + System.out.print(","); + System.out.print(array[1].getClass().getName()); + System.out.println(); + } + + private static void multi_int_array() { + final int outer = 2; + final int middle = 3; + final int inner = 4; + + final int[][][] ary = new int[outer][middle][inner]; // multianewarray + + int n = 0; + for (int i = 0; i < outer; ++i) + for (int j = 0; j < middle; ++j) + for (int k = 0; k < inner; ++k) + ary[i][j][k] = n++; + + System.out.println("Multi-dimensional Int Array"); + for (int i = 0; i < outer; ++i) + for (int j = 0; j < middle; ++j) + for (int k = 0; k < inner; ++k) + System.out.println("ary[" + i + "][" + j + "][" + k + "]=" + ary[i][j][k]); + + System.out.println(); + } + + private static void multi_object_array() { + final int outer = 2; + final int middle = 3; + final int inner = 4; + + final Integer[][][] ary = new Integer[outer][middle][inner]; // multianewarray + + int n = 0; + for (int i = 0; i < outer; ++i) + for (int j = 0; j < middle; ++j) + for (int k = 0; k < inner; ++k) + ary[i][j][k] = n++; + + System.out.println("Multi-dimensional Object Array"); + for (int i = 0; i < outer; ++i) + for (int j = 0; j < middle; ++j) + for (int k = 0; k < inner; ++k) + System.out.println("ary[" + i + "][" + j + "][" + k + "]=" + ary[i][j][k]); + + System.out.println(); + } + + private static void multi_partial_array() { + final int outer = 2; + final int middle = 3; + + final int[][][] ary = new int[outer][middle][]; // multianewarray + + System.out.println("Partial Multi-dimensional int Array"); + for (int i = 0; i < outer; ++i) + for (int j = 0; j < middle; ++j) + System.out.println("ary[" + i + "][" + j + "]=" + ary[i][j]); + + System.out.println(); + } +} Property changes on: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected =================================================================== --- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected (rev 0) +++ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected 2007-01-18 01:22:45 UTC (rev 11305) @@ -0,0 +1,2244 @@ +Testing new A +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$A = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$B = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$C = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$D = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$F = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$H = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$I = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$J = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_B = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_D = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_F = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_H = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J3 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J2 = false +Cast to A: Succeeded +Cast to B: Failed +Cast to C: Failed +Cast to D: Failed +Cast to E: Failed +Cast to F: Failed +Cast to G: Failed +Cast to H: Failed +Cast to I: Failed +Cast to J: Failed +Cast to P_B: Failed +Cast to P_C1: Failed +Cast to P_C2: Failed +Cast to P_D: Failed +Cast to P_E1: Failed +Cast to P_E2: Failed +Cast to P_F: Failed +Cast to P_G1: Failed +Cast to P_G2: Failed +Cast to P_H: Failed +Cast to P_I1: Failed +Cast to P_I2: Failed +Cast to P_J1: Failed +Cast to P_J2: Failed +Cast to P_J3: Failed +Cast to O_C1: Failed +Cast to O_C2: Failed +Cast to O_E: Failed +Cast to O_G: Failed +Cast to O_I1: Failed +Cast to O_I2: Failed +Cast to O_J1: Failed +Cast to O_J2: Failed +invoke magic A +Testing new B +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$A = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$B = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$C = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$D = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$F = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$H = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$I = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$J = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_B = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_D = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_F = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_H = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J3 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J2 = false +Cast to A: Succeeded +Cast to B: Succeeded +Cast to C: Failed +Cast to D: Failed +Cast to E: Failed +Cast to F: Failed +Cast to G: Failed +Cast to H: Failed +Cast to I: Failed +Cast to J: Failed +Cast to P_B: Failed +Cast to P_C1: Failed +Cast to P_C2: Failed +Cast to P_D: Failed +Cast to P_E1: Failed +Cast to P_E2: Failed +Cast to P_F: Failed +Cast to P_G1: Failed +Cast to P_G2: Failed +Cast to P_H: Failed +Cast to P_I1: Failed +Cast to P_I2: Failed +Cast to P_J1: Failed +Cast to P_J2: Failed +Cast to P_J3: Failed +Cast to O_C1: Failed +Cast to O_C2: Failed +Cast to O_E: Failed +Cast to O_G: Failed +Cast to O_I1: Failed +Cast to O_I2: Failed +Cast to O_J1: Failed +Cast to O_J2: Failed +invoke magic B +Testing new C +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$A = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$B = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$C = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$D = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$F = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$H = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$I = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$J = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_B = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_D = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_F = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_H = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J3 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J2 = false +Cast to A: Succeeded +Cast to B: Succeeded +Cast to C: Succeeded +Cast to D: Failed +Cast to E: Failed +Cast to F: Failed +Cast to G: Failed +Cast to H: Failed +Cast to I: Failed +Cast to J: Failed +Cast to P_B: Failed +Cast to P_C1: Failed +Cast to P_C2: Failed +Cast to P_D: Failed +Cast to P_E1: Failed +Cast to P_E2: Failed +Cast to P_F: Failed +Cast to P_G1: Failed +Cast to P_G2: Failed +Cast to P_H: Failed +Cast to P_I1: Failed +Cast to P_I2: Failed +Cast to P_J1: Failed +Cast to P_J2: Failed +Cast to P_J3: Failed +Cast to O_C1: Failed +Cast to O_C2: Failed +Cast to O_E: Failed +Cast to O_G: Failed +Cast to O_I1: Failed +Cast to O_I2: Failed +Cast to O_J1: Failed +Cast to O_J2: Failed +invoke magic C +Testing new D +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$A = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$B = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$C = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$D = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$F = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$H = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$I = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$J = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_B = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_D = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_F = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_H = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J3 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J2 = false +Cast to A: Succeeded +Cast to B: Failed +Cast to C: Failed +Cast to D: Succeeded +Cast to E: Failed +Cast to F: Failed +Cast to G: Failed +Cast to H: Failed +Cast to I: Failed +Cast to J: Failed +Cast to P_B: Failed +Cast to P_C1: Failed +Cast to P_C2: Failed +Cast to P_D: Failed +Cast to P_E1: Failed +Cast to P_E2: Failed +Cast to P_F: Failed +Cast to P_G1: Failed +Cast to P_G2: Failed +Cast to P_H: Failed +Cast to P_I1: Failed +Cast to P_I2: Failed +Cast to P_J1: Failed +Cast to P_J2: Failed +Cast to P_J3: Failed +Cast to O_C1: Failed +Cast to O_C2: Failed +Cast to O_E: Failed +Cast to O_G: Failed +Cast to O_I1: Failed +Cast to O_I2: Failed +Cast to O_J1: Failed +Cast to O_J2: Failed +invoke magic D +Testing new E +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$A = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$B = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$C = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$D = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$E = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$F = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$H = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$I = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$J = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_B = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_D = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_F = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_H = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J3 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J2 = false +Cast to A: Succeeded +Cast to B: Failed +Cast to C: Failed +Cast to D: Succeeded +Cast to E: Succeeded +Cast to F: Failed +Cast to G: Failed +Cast to H: Failed +Cast to I: Failed +Cast to J: Failed +Cast to P_B: Failed +Cast to P_C1: Failed +Cast to P_C2: Failed +Cast to P_D: Failed +Cast to P_E1: Failed +Cast to P_E2: Failed +Cast to P_F: Failed +Cast to P_G1: Failed +Cast to P_G2: Failed +Cast to P_H: Failed +Cast to P_I1: Failed +Cast to P_I2: Failed +Cast to P_J1: Failed +Cast to P_J2: Failed +Cast to P_J3: Failed +Cast to O_C1: Failed +Cast to O_C2: Failed +Cast to O_E: Failed +Cast to O_G: Failed +Cast to O_I1: Failed +Cast to O_I2: Failed +Cast to O_J1: Failed +Cast to O_J2: Failed +invoke magic E +Testing new F +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$A = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$B = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$C = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$D = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$F = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$H = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$I = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$J = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_B = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_D = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_F = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_G2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_H = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_J3 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_G = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_I2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$SubSubClass$O_J2 = false +Cast to A: Succeeded +Cast to B: Failed +Cast to C: Failed +Cast to D: Failed +Cast to E: Failed +Cast to F: Succeeded +Cast to G: Failed +Cast to H: Failed +Cast to I: Failed +Cast to J: Failed +Cast to P_B: Failed +Cast to P_C1: Failed +Cast to P_C2: Failed +Cast to P_D: Failed +Cast to P_E1: Failed +Cast to P_E2: Failed +Cast to P_F: Failed +Cast to P_G1: Failed +Cast to P_G2: Failed +Cast to P_H: Failed +Cast to P_I1: Failed +Cast to P_I2: Failed +Cast to P_J1: Failed +Cast to P_J2: Failed +Cast to P_J3: Failed +Cast to O_C1: Failed +Cast to O_C2: Failed +Cast to O_E: Failed +Cast to O_G: Failed +Cast to O_I1: Failed +Cast to O_I2: Failed +Cast to O_J1: Failed +Cast to O_J2: Failed +invoke magic F +Testing new G +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$A = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$B = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$C = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$D = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$E = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$F = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$G = true +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$H = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$I = false +instanceof test.org.jikesrvm.basic.core.bytecode.TestClassHierarchy$J = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_B = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_C2 = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_D = false +instanceof test.org.jikesrvm.basic.core.bytecode.data.SubClassInDifferentPackage$P_E1 = false +instanceof test.org.jikesrvm.basic.core.bytecode.dat... [truncated message content] |
From: <dfr...@us...> - 2007-06-28 07:33:50
|
Revision: 12825 http://svn.sourceforge.net/jikesrvm/?rev=12825&view=rev Author: dframpton-oss Date: 2007-06-28 00:33:47 -0700 (Thu, 28 Jun 2007) Log Message: ----------- Added a dacapo-head test. This test is for helping to ensure JikesRVM is capable of running future DaCapo releases. This is not intended to be used for any performance testing, as the benchmarks and/or loads included are not final and may be substantially different from official DaCapo benchmark releases. Added Paths: ----------- rvmroot/trunk/testing/tests/dacapo-head/ rvmroot/trunk/testing/tests/dacapo-head/build.xml Added: rvmroot/trunk/testing/tests/dacapo-head/build.xml =================================================================== --- rvmroot/trunk/testing/tests/dacapo-head/build.xml (rev 0) +++ rvmroot/trunk/testing/tests/dacapo-head/build.xml 2007-06-28 07:33:47 UTC (rev 12825) @@ -0,0 +1,84 @@ +<!-- + ~ This file is part of the Jikes RVM project (http://jikesrvm.org). + ~ + ~ This file is licensed to You under the Common Public License (CPL); + ~ You may not use this file except in compliance with the License. You + ~ may obtain a copy of the License at + ~ + ~ http://www.opensource.org/licenses/cpl1.0.php + ~ + ~ See the COPYRIGHT.txt file distributed with this work for information + ~ regarding copyright ownership. + --> +<project name="dacapo-head" default="test" basedir="."> + + <target name="dacapo-head-message"><echo> + === DaCapo Benchmarks (HEAD) ======================================== + + This test is for helping to ensure JikesRVM is capable of running + future DaCapo releases. This *must* not be used for any performance + testing, as the benchmarks and/or loads included are not final and + may be substantially different from official DaCapo benchmark + releases. + + For more information on the DaCapo benchmarks visit: + http://www.dacapobench.org + + ===================================================================== + </echo></target> + + <condition property="test.time.limit" value="1800"> + <equals arg1="${test.mode}" arg2="performance"/> + </condition> + <condition property="test.time.limit" value="3000" else="480"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + + <property name="test.max.heapsize" value="150"/> + + <import file="../../../build/tests.xml"/> + + <property name="dacapo-head.jar" value="${external.lib.dir}/dacapo/dacapo-HEAD.jar"/> + <property name="test.class.path" value="${dacapo-head.jar}"/> + + <macrodef name="dacapo"> + <attribute name="name"/> + <attribute name="timeLimit" default=""/> + <attribute name="requires-display" default="false"/> + <sequential> + <rvm tag="@{name}" class="Harness" requires-display="@{requires-display}" args="@{name}" timeLimit="@{timeLimit}"/> + <outputSingleStatisticResults tag="@{name}" key="time" pattern="===== DaCapo @{name} PASSED in (.*) msec ====="/> + </sequential> + </macrodef> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Run the tests * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <target name="test" depends="init"> + <test-property name="external.lib.dir" location="${jikesrvm.dir}/.ant.properties"/> + <test-file name="dacapo-head.jar" location="${jikesrvm.dir}/.ant.properties"/> + + <antcall target="dacapo-head-message"/> + + <startResults/> + + <dacapo name="antlr"/> + <dacapo name="bloat"/> + <dacapo name="chart" requires-display="true"/> + <dacapo name="eclipse"/> + <dacapo name="fop"/> + <dacapo name="hsqldb"/> + <dacapo name="jython"/> + <dacapo name="luindex"/> + <dacapo name="lusearch"/> + <dacapo name="pmd"/> + <dacapo name="sunflow" requires-display="true"/> + <dacapo name="xalan"/> + + <finishResults/> + </target> + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-07-03 04:09:22
|
Revision: 12888 http://svn.sourceforge.net/jikesrvm/?rev=12888&view=rev Author: peter_donald Date: 2007-07-02 21:09:02 -0700 (Mon, 02 Jul 2007) Log Message: ----------- Optimize imports Modified Paths: -------------- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java rvmroot/trunk/testing/tests/gctest/src/Exhaust.java rvmroot/trunk/testing/tests/gctest/src/FixedLive.java rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java rvmroot/trunk/testing/tests/jni/src/StackResize.java rvmroot/trunk/testing/tests/jni/src/TestGC.java rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java rvmroot/trunk/testing/tests/jni/src/TestRuntimeExec.java rvmroot/trunk/testing/tests/jni/src/tNativeThreads.java Modified: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java =================================================================== --- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -12,7 +12,11 @@ */ package test.org.jikesrvm.basic.bugs; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.RandomAccessFile; /** * [ 1722506 ] dacapo eclipse fails EOF exceptions Modified: rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java =================================================================== --- rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -13,10 +13,10 @@ package test.org.jikesrvm.basic.core.serialization; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; -import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; class TestSerialization { Modified: rvmroot/trunk/testing/tests/gctest/src/Exhaust.java =================================================================== --- rvmroot/trunk/testing/tests/gctest/src/Exhaust.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/gctest/src/Exhaust.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,9 +10,10 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ + import java.io.PrintStream; import org.jikesrvm.memorymanagers.mminterface.MM_Interface; -import org.vmmagic.pragma.*; +import org.vmmagic.pragma.NoInline; class Exhaust { Modified: rvmroot/trunk/testing/tests/gctest/src/FixedLive.java =================================================================== --- rvmroot/trunk/testing/tests/gctest/src/FixedLive.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/gctest/src/FixedLive.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,8 +10,9 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import org.vmmagic.pragma.*; +import org.vmmagic.pragma.NoInline; + class FixedLive { static int liveSize = 0; // in megabytes Modified: rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java =================================================================== --- rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/gctest/src/InlineAllocation.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,10 +10,11 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import org.jikesrvm.*; -import org.jikesrvm.classloader.*; -import java.lang.reflect.*; +import java.lang.reflect.Method; +import org.jikesrvm.VM; +import org.jikesrvm.classloader.VM_Method; + /** * A test to detect regressions in the quality of the optimizing compiler's * inline allocation sequence that is generated by inlining Modified: rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java =================================================================== --- rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/gctest/src/ReferenceTest.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,7 +10,11 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import java.lang.ref.*; + +import java.lang.ref.Reference; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.SoftReference; +import java.lang.ref.WeakReference; //import org.jikesrvm.*; /** Modified: rvmroot/trunk/testing/tests/jni/src/StackResize.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/StackResize.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/jni/src/StackResize.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,7 +10,8 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import org.jikesrvm.*; + +import org.jikesrvm.VM; import org.jikesrvm.runtime.VM_Magic; /** Modified: rvmroot/trunk/testing/tests/jni/src/TestGC.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/TestGC.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/jni/src/TestGC.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,9 +10,10 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import org.jikesrvm.*; + +import org.jikesrvm.VM; import org.jikesrvm.runtime.VM_Magic; -import org.vmmagic.unboxed.*; +import org.vmmagic.unboxed.Address; /** * Test GC with Native frames on stack Modified: rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,8 +10,9 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import java.nio.*; +import java.nio.ByteBuffer; + public class TestJNIDirectBuffers { // set to true to get messages for each test Modified: rvmroot/trunk/testing/tests/jni/src/TestRuntimeExec.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/TestRuntimeExec.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/jni/src/TestRuntimeExec.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,9 +10,12 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import java.io.*; -import java.lang.Process; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; + /** * Test whether the Runtime.exec API works */ Modified: rvmroot/trunk/testing/tests/jni/src/tNativeThreads.java =================================================================== --- rvmroot/trunk/testing/tests/jni/src/tNativeThreads.java 2007-07-03 03:52:48 UTC (rev 12887) +++ rvmroot/trunk/testing/tests/jni/src/tNativeThreads.java 2007-07-03 04:09:02 UTC (rev 12888) @@ -10,7 +10,6 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. */ -import org.jikesrvm.*; /** * Test native method with threads This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2007-09-15 03:20:25
|
Revision: 13582 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13582&view=rev Author: dgrove-oss Date: 2007-09-14 20:20:17 -0700 (Fri, 14 Sep 2007) Log Message: ----------- try to hack around RVM-220 by reducing the heap on perf runs of jbb2000 and jbb2005 so we can at least start getting some results. Modified Paths: -------------- rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties Modified: rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties 2007-09-15 02:57:00 UTC (rev 13581) +++ rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties 2007-09-15 03:20:17 UTC (rev 13582) @@ -11,6 +11,6 @@ # regarding copyright ownership. # smallHeap=375 -largeHeap=1500 +largeHeap=1024 smallHeap-true.timeLimit=2100 smallHeap-false.timeLimit=2100 Modified: rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties 2007-09-15 02:57:00 UTC (rev 13581) +++ rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties 2007-09-15 03:20:17 UTC (rev 13582) @@ -11,6 +11,6 @@ # regarding copyright ownership. # smallHeap=360 -largeHeap=1440 +largeHeap=1024 smallHeap-true.timeLimit=2100 smallHeap-false.timeLimit=2100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dfr...@us...> - 2007-09-18 05:30:57
|
Revision: 13623 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13623&view=rev Author: dframpton-oss Date: 2007-09-17 22:30:56 -0700 (Mon, 17 Sep 2007) Log Message: ----------- Revert heap sizes now that we support them better. Modified Paths: -------------- rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties Modified: rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties 2007-09-18 05:30:50 UTC (rev 13622) +++ rvmroot/trunk/testing/tests/perf-jbb2000/jbb2000.properties 2007-09-18 05:30:56 UTC (rev 13623) @@ -11,6 +11,6 @@ # regarding copyright ownership. # smallHeap=375 -largeHeap=1024 +largeHeap=1500 smallHeap-true.timeLimit=2100 smallHeap-false.timeLimit=2100 Modified: rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties =================================================================== --- rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties 2007-09-18 05:30:50 UTC (rev 13622) +++ rvmroot/trunk/testing/tests/perf-jbb2005/jbb2005.properties 2007-09-18 05:30:56 UTC (rev 13623) @@ -11,6 +11,6 @@ # regarding copyright ownership. # smallHeap=360 -largeHeap=1024 +largeHeap=1440 smallHeap-true.timeLimit=2100 smallHeap-false.timeLimit=2100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dfr...@us...> - 2007-10-02 23:51:43
|
Revision: 13734 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13734&view=rev Author: dframpton-oss Date: 2007-10-02 16:51:42 -0700 (Tue, 02 Oct 2007) Log Message: ----------- Increase timeouts for gcstress. Modified Paths: -------------- rvmroot/trunk/testing/tests/SPECjbb2000/build.xml rvmroot/trunk/testing/tests/dacapo/build.xml rvmroot/trunk/testing/tests/ipsixql/build.xml Modified: rvmroot/trunk/testing/tests/SPECjbb2000/build.xml =================================================================== --- rvmroot/trunk/testing/tests/SPECjbb2000/build.xml 2007-10-02 22:42:21 UTC (rev 13733) +++ rvmroot/trunk/testing/tests/SPECjbb2000/build.xml 2007-10-02 23:51:42 UTC (rev 13734) @@ -12,6 +12,9 @@ --> <project name="SPECjbb2000" default="test" basedir="."> + <condition property="test.time.limit" value="4000"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> <condition property="test.time.limit" value="2700" else="1000"> <equals arg1="${test.mode}" arg2="performance"/> </condition> Modified: rvmroot/trunk/testing/tests/dacapo/build.xml =================================================================== --- rvmroot/trunk/testing/tests/dacapo/build.xml 2007-10-02 22:42:21 UTC (rev 13733) +++ rvmroot/trunk/testing/tests/dacapo/build.xml 2007-10-02 23:51:42 UTC (rev 13734) @@ -15,7 +15,7 @@ <condition property="test.time.limit" value="1800"> <equals arg1="${test.mode}" arg2="performance"/> </condition> - <condition property="test.time.limit" value="3000" else="600"> + <condition property="test.time.limit" value="4000" else="600"> <equals arg1="${test.mode}" arg2="gcstress"/> </condition> Modified: rvmroot/trunk/testing/tests/ipsixql/build.xml =================================================================== --- rvmroot/trunk/testing/tests/ipsixql/build.xml 2007-10-02 22:42:21 UTC (rev 13733) +++ rvmroot/trunk/testing/tests/ipsixql/build.xml 2007-10-02 23:51:42 UTC (rev 13734) @@ -15,7 +15,7 @@ <condition property="test.time.limit" value="600"> <equals arg1="${test.mode}" arg2="performance"/> </condition> - <condition property="test.time.limit" value="900" else="300"> + <condition property="test.time.limit" value="1200" else="300"> <equals arg1="${test.mode}" arg2="gcstress"/> </condition> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2008-03-31 15:58:23
|
Revision: 14076 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=14076&view=rev Author: captain5050 Date: 2008-03-31 08:58:18 -0700 (Mon, 31 Mar 2008) Log Message: ----------- Add a simple harness for Classpath's testsuite Added Paths: ----------- rvmroot/trunk/testing/tests/classpath-testsuite/ rvmroot/trunk/testing/tests/classpath-testsuite/build.xml rvmroot/trunk/testing/tests/classpath-testsuite/expected/ rvmroot/trunk/testing/tests/classpath-testsuite/expected/ArrayTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/BooleanTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/CastTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/ClassForNameTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/ExceptionTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/JoinTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/LongFieldTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/MessageFormatTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/NewInstanceTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/NullcastTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/StringTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/SyncronizedTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/ThreadTest.expected rvmroot/trunk/testing/tests/classpath-testsuite/expected/URLTest.expected Added: rvmroot/trunk/testing/tests/classpath-testsuite/build.xml =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/build.xml (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/build.xml 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1,90 @@ +<!-- + ~ This file is part of the Jikes RVM project (http://jikesrvm.org). + ~ + ~ This file is licensed to You under the Common Public License (CPL); + ~ You may not use this file except in compliance with the License. You + ~ may obtain a copy of the License at + ~ + ~ http://www.opensource.org/licenses/cpl1.0.php + ~ + ~ See the COPYRIGHT.txt file distributed with this work for information + ~ regarding copyright ownership. + --> +<project name="classpath-testsuite" default="test" basedir="."> + + <condition property="test.time.limit" value="1000" else="400"> + <equals arg1="${test.mode}" arg2="gcstress"/> + </condition> + + <property name="test.max.heapsize" value="150"/> + + <import file="../../../build/tests.xml"/> + <import file="../../../build/components/classpath.xml"/> + + <property name="main.java" location="${basedir}/expected"/> + + <property name="build.classes" location="${build.tests.dir}/classes"/> + + <property name="test.class.path" value="${build.classes}"/> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Compile the tests * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <target name="compile" depends="init"> + <mkdir dir="${build.classes}"/> + <javac srcdir="${classpath.dir}/gnu/test" destdir="${build.classes}" debug="true" /> + <javac srcdir="${classpath.dir}/testsuite/java.io/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" /> + <javac srcdir="${classpath.dir}/testsuite/java.lang/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" /> + <javac srcdir="${classpath.dir}/testsuite/java.net/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" /> + <javac srcdir="${classpath.dir}/testsuite/java.text/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" /> + <javac srcdir="${classpath.dir}/testsuite/java.util/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" /> + </target> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Run the tests * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <target name="test" depends="compile"> + <startResults/> + + <!-- Tests from java.io --> + <runCompareTest tag="RandomAccessFileTest" class="RandomAccessFileTest"/> + + <!-- Tests from java.lang --> + <runCompareTest tag="ArrayTest" class="ArrayTest"/> + <runCompareTest tag="BooleanTest" class="BooleanTest"/> + <runCompareTest tag="CastTest" class="CastTest"/> + <runCompareTest tag="ClassForNameTest" class="ClassForNameTest"/> + <runCompareTest tag="ExceptionTest" class="ExceptionTest"/> + <runCompareTest tag="FloatingDecimalTest" class="FloatingDecimalTest"/> + <runCompareTest tag="JoinTest" class="JoinTest"/> + <runCompareTest tag="LongFieldTest" class="JoinTest"/> + <runCompareTest tag="NewInstanceTest" class="NewInstanceTest"/> + <runCompareTest tag="NullcastTest" class="NullcastTest"/> + <runCompareTest tag="OutOfMemoryErrorTest" class="OutOfMemoryErrorTest"/> + <runCompareTest tag="StringTest" class="StringTest"/> + <runCompareTest tag="SyncronizedTest" class="SyncronizedTest"/> + <runCompareTest tag="ThreadTest" class="ThreadTest"/> + + <!-- Tests from java.net --> + <runCompareTest tag="DatagramSocketTest" class="DatagramSocketTest"/> + <runCompareTest tag="SocketSendReceiveTest" class="SocketSendReceiveTest"/> + <runCompareTest tag="SocketTest" class="SocketTest"/> + <runCompareTest tag="URLTest" class="URLTest"/> + + <!-- Tests from java.text --> + <runCompareTest tag="SimpleDateFormatTest" class="SimpleDateFormatTest"/> + <runCompareTest tag="MessageFormatTest" class="MessageFormatTest"/> + + <!-- Tests from java.util --> + <runCompareTest tag="SimpleTimeZoneTest" class="SimpleTimeZoneTest"/> + + <finishResults/> + </target> + +</project> Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/ArrayTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/ArrayTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/ArrayTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1,6 @@ +PASSED: BooleanArrayInit() boolean[] x = {true} +PASSED: ByteArrayInit() byte[] x = {42} +PASSED: CharArrayInit() char[] x = {'X'} +PASSED: ShortArrayInit() short[] x = {42} +PASSED: IntArrayInit() int[] x = {42} +PASSED: ArrayName() name=[Ljava.lang.String; Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/BooleanTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/BooleanTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/BooleanTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1,17 @@ +PASSED: Boolean(true) +PASSED: Boolean(false) +PASSED: Boolean(String) +PASSED: Boolean(String) +PASSED: Boolean(String) +PASSED: Boolean.booleanValue() +PASSED: Boolean.equals(Object) +PASSED: Boolean.getBoolean(String) +PASSED: Boolean.hashCode() +PASSED: Boolean.toString() +PASSED: Boolean.toString() +PASSED: Boolean.valueOf(String) +PASSED: Boolean.valueOf(null) +PASSED: Boolean.valueOf(String) +PASSED: Boolean.TRUE +PASSED: Boolean.FALSE +PASSED: Boolean.TYPE.getName() is boolean Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/CastTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/CastTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/CastTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1,8 @@ +PASSED: double -> double 4.2 == 4.2 +PASSED: long -> double -> long 1023 == 1023 (double)1023.0 +PASSED: double -> long -> double 123.0 == 123.0 (long)123 +PASSED: float -> double -> float 123.0 == 123.0 (double)123.0 +PASSED: double -> float -> double 123.0 == 123.0 (float)123.0 +PASSED: int -> float -> int 123 == 123 (float)123.0 +PASSED: long -> float -> long 123 == 123 (float)123.0 +PASSED: float -> long -> float 123.0 == 123.0 (long)123 Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/ClassForNameTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/ClassForNameTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/ClassForNameTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: passed both success and failure cases for Class.forName Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: new DatagramSocket() Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/ExceptionTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/ExceptionTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/ExceptionTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: java.lang.ArrayIndexOutOfBoundsException: 26 Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: Double is 1.0 and kicking Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/JoinTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/JoinTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/JoinTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1,3 @@ +PASSED: Sender completed +PASSED: Receiver completed +PASSED: Join send/receive count=1 Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/LongFieldTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/LongFieldTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/LongFieldTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: field = 1 Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/MessageFormatTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/MessageFormatTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/MessageFormatTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: MessageFormat.format() worked Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/NewInstanceTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/NewInstanceTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/NewInstanceTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: static_field = 1 Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/NullcastTest.expected =================================================================== Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: RandomAccessFile worked. Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: time=2008-03-31 16:00:01 BST Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: timezone=java.util.SimpleTimeZone[id=GMT,offset=0,dstSavings=3600000,useDaylight=false,startYear=0,startMode=0,startMonth=0,startDay=0,startDayOfWeek=0,startTime=0,startTimeMode=0,endMode=0,endMonth=0,endDay=0,endDayOfWeek=0,endTime=0,endTimeMode=0] Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: Socket send/receive count=1 message=hello Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/SocketTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: new Socket()Socket[addr=www.hungry.com/199.181.107.40,port=80,localport=21491] Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/StringTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/StringTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/StringTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: a-->????RRR has len=11 Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/SyncronizedTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/SyncronizedTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/SyncronizedTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: count=1 Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/ThreadTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/ThreadTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/ThreadTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1,3 @@ +PASSED: isAlive() working in initial thread +PASSED: isAlive() working in new thread +PASSED: Theads worked Added: rvmroot/trunk/testing/tests/classpath-testsuite/expected/URLTest.expected =================================================================== --- rvmroot/trunk/testing/tests/classpath-testsuite/expected/URLTest.expected (rev 0) +++ rvmroot/trunk/testing/tests/classpath-testsuite/expected/URLTest.expected 2008-03-31 15:58:18 UTC (rev 14076) @@ -0,0 +1 @@ +PASSED: new URL() size=1417 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2008-07-04 19:55:57
|
Revision: 14663 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=14663&view=rev Author: dgrove-oss Date: 2008-07-04 12:55:56 -0700 (Fri, 04 Jul 2008) Log Message: ----------- RVM-271 and RVM-504: Increase timeouts on selected tests. Increase DaCapo timeout under both normal and gcstress so eclipse can finish on gcstress mode and/or on slower machines in normal mode. Increase ipsixql gcstress timeout. If these timeouts aren't sufficient, we probably need to run the tests on reduced input sizes. Modified Paths: -------------- rvmroot/trunk/testing/tests/dacapo/build.xml rvmroot/trunk/testing/tests/ipsixql/build.xml Modified: rvmroot/trunk/testing/tests/dacapo/build.xml =================================================================== --- rvmroot/trunk/testing/tests/dacapo/build.xml 2008-07-04 14:58:44 UTC (rev 14662) +++ rvmroot/trunk/testing/tests/dacapo/build.xml 2008-07-04 19:55:56 UTC (rev 14663) @@ -15,7 +15,7 @@ <condition property="test.time.limit" value="1800"> <equals arg1="${test.mode}" arg2="performance"/> </condition> - <condition property="test.time.limit" value="4000" else="900"> + <condition property="test.time.limit" value="6000" else="1200"> <equals arg1="${test.mode}" arg2="gcstress"/> </condition> Modified: rvmroot/trunk/testing/tests/ipsixql/build.xml =================================================================== --- rvmroot/trunk/testing/tests/ipsixql/build.xml 2008-07-04 14:58:44 UTC (rev 14662) +++ rvmroot/trunk/testing/tests/ipsixql/build.xml 2008-07-04 19:55:56 UTC (rev 14663) @@ -15,7 +15,7 @@ <condition property="test.time.limit" value="600"> <equals arg1="${test.mode}" arg2="performance"/> </condition> - <condition property="test.time.limit" value="1200" else="300"> + <condition property="test.time.limit" value="2400" else="300"> <equals arg1="${test.mode}" arg2="gcstress"/> </condition> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |