[llvm-commits] CVS: llvm-java/test/Programs/SingleSource/UnitTests/VTable.java TableSwitch.java StaticInitializers.java LookupSwitch.java LongCompare.java If.java ForLoop.java FloatCompare.java FieldAccess.java BigConstants.java Arithm.java
Alkis Evlogimenos
alkis at cs.uiuc.edu
Wed Nov 24 01:05:18 PST 2004
Changes in directory llvm-java/test/Programs/SingleSource/UnitTests:
VTable.java updated: 1.3 -> 1.4
TableSwitch.java updated: 1.3 -> 1.4
StaticInitializers.java updated: 1.1 -> 1.2
LookupSwitch.java updated: 1.3 -> 1.4
LongCompare.java updated: 1.2 -> 1.3
If.java updated: 1.3 -> 1.4
ForLoop.java updated: 1.2 -> 1.3
FloatCompare.java updated: 1.2 -> 1.3
FieldAccess.java updated: 1.2 -> 1.3
BigConstants.java updated: 1.2 -> 1.3
Arithm.java updated: 1.4 -> 1.5
---
Log message:
Update tests to use the Test class for I/O.
---
Diffs of the changes: (+41 -34)
Index: llvm-java/test/Programs/SingleSource/UnitTests/VTable.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/VTable.java:1.3 llvm-java/test/Programs/SingleSource/UnitTests/VTable.java:1.4
--- llvm-java/test/Programs/SingleSource/UnitTests/VTable.java:1.3 Wed Sep 15 15:27:20 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/VTable.java Wed Nov 24 03:04:59 2004
@@ -1,7 +1,7 @@
class VTableBase
{
public int foo() { return 0; }
- public int bar() { return 0; }
+ public int bar() { return 1; }
}
interface VTableInterface
@@ -11,20 +11,20 @@
public class VTable extends VTableBase implements VTableInterface
{
- public int foo() { return 1; }
- public int baz() { return 2; }
+ public int foo() { return 2; }
+ public int baz() { return 3; }
public static void main(String[] args) {
VTableBase a = new VTableBase();
- a.foo();
- a.bar();
+ Test.print_int_ln(a.foo());
+ Test.print_int_ln(a.bar());
a = new VTable();
- a.foo();
- a.bar();
- ((VTableInterface)a).baz();
+ Test.print_int_ln(a.foo());
+ Test.print_int_ln(a.bar());
+ Test.print_int_ln(((VTableInterface)a).baz());
VTableInterface i = new VTable();
- i.baz();
+ Test.print_int_ln(i.baz());
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/TableSwitch.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/TableSwitch.java:1.3 llvm-java/test/Programs/SingleSource/UnitTests/TableSwitch.java:1.4
--- llvm-java/test/Programs/SingleSource/UnitTests/TableSwitch.java:1.3 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/TableSwitch.java Wed Nov 24 03:04:59 2004
@@ -2,12 +2,12 @@
{
public static void main(String[] args) {
switch (4) {
- case 0: System.out.println(4);
- case 1: System.out.println(3);
- case 2: System.out.println(2);
- case 3: System.out.println(1);
- case 4: System.out.println(0);
- default: System.out.println(-1);
+ case 0: Test.print_int_ln(4);
+ case 1: Test.print_int_ln(3);
+ case 2: Test.print_int_ln(2);
+ case 3: Test.print_int_ln(1);
+ case 4: Test.print_int_ln(0);
+ default: Test.print_int_ln(-1);
}
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/StaticInitializers.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/StaticInitializers.java:1.1 llvm-java/test/Programs/SingleSource/UnitTests/StaticInitializers.java:1.2
--- llvm-java/test/Programs/SingleSource/UnitTests/StaticInitializers.java:1.1 Sat Jul 24 15:55:43 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/StaticInitializers.java Wed Nov 24 03:04:59 2004
@@ -9,8 +9,8 @@
}
public static void main(String[] args) {
- System.out.println("foo = " + foo);
- System.out.println("bar = " + bar);
- System.out.println("baz = " + baz);
+ Test.print_int_ln(foo);
+ Test.print_int_ln(bar);
+ Test.print_int_ln(baz);
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/LookupSwitch.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/LookupSwitch.java:1.3 llvm-java/test/Programs/SingleSource/UnitTests/LookupSwitch.java:1.4
--- llvm-java/test/Programs/SingleSource/UnitTests/LookupSwitch.java:1.3 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/LookupSwitch.java Wed Nov 24 03:04:59 2004
@@ -2,10 +2,10 @@
{
public static void main(String[] args) {
switch (128) {
- case 0: System.out.println(255);
- case 128: System.out.println(128);
- case 255: System.out.println(0);
- default: System.out.println(-1);
+ case 0: Test.print_int_ln(255);
+ case 128: Test.print_int_ln(128);
+ case 255: Test.print_int_ln(0);
+ default: Test.print_int_ln(-1);
}
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/LongCompare.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/LongCompare.java:1.2 llvm-java/test/Programs/SingleSource/UnitTests/LongCompare.java:1.3
--- llvm-java/test/Programs/SingleSource/UnitTests/LongCompare.java:1.2 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/LongCompare.java Wed Nov 24 03:04:59 2004
@@ -4,8 +4,8 @@
long l1 = 123456789123456789L;
long l2 = 987654321987654321L;
- System.out.println("l1 = " + l1);
- System.out.println("l2 = " + l2);
- System.out.println("l1 == l2 = " + (l1 == l2));
+ Test.print_long_ln(l1);
+ Test.print_long_ln(l2);
+ Test.print_boolean_ln(l1 == l2);
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/If.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/If.java:1.3 llvm-java/test/Programs/SingleSource/UnitTests/If.java:1.4
--- llvm-java/test/Programs/SingleSource/UnitTests/If.java:1.3 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/If.java Wed Nov 24 03:04:59 2004
@@ -3,8 +3,8 @@
public static void main(String[] args) {
int i = 0;
if (i == 0)
- System.out.println("i == 0");
+ Test.print_int_ln(0);
else
- System.out.println("i != 0");
+ Test.print_int_ln(1);
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/ForLoop.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/ForLoop.java:1.2 llvm-java/test/Programs/SingleSource/UnitTests/ForLoop.java:1.3
--- llvm-java/test/Programs/SingleSource/UnitTests/ForLoop.java:1.2 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/ForLoop.java Wed Nov 24 03:04:59 2004
@@ -5,6 +5,6 @@
for (int i = 0; i < 100; ++i)
sum += i;
- System.out.println(sum);
+ Test.print_int_ln(sum);
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java:1.2 llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java:1.3
--- llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java:1.2 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java Wed Nov 24 03:04:59 2004
@@ -9,6 +9,6 @@
for (double d = 100; d > 0; d -= 11)
++count;
- System.out.println(count);
+ Test.print_int_ln(count);
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/FieldAccess.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/FieldAccess.java:1.2 llvm-java/test/Programs/SingleSource/UnitTests/FieldAccess.java:1.3
--- llvm-java/test/Programs/SingleSource/UnitTests/FieldAccess.java:1.2 Wed Sep 15 15:16:12 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/FieldAccess.java Wed Nov 24 03:04:59 2004
@@ -15,5 +15,11 @@
b.f = 2.0F;
((FieldAccessBase) b).i = 4;
((FieldAccessBase) b).f = 1.0F;
+
+ Test.print_int_ln(((FieldAccessBase)b).i);
+ Test.print_int_ln(b.i);
+ Test.print_float_ln(((FieldAccessBase)b).f);
+ Test.print_float_ln(b.f);
+ Test.print_double_ln(b.d);
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/BigConstants.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/BigConstants.java:1.2 llvm-java/test/Programs/SingleSource/UnitTests/BigConstants.java:1.3
--- llvm-java/test/Programs/SingleSource/UnitTests/BigConstants.java:1.2 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/BigConstants.java Wed Nov 24 03:04:59 2004
@@ -5,9 +5,10 @@
long l = 1234567890123456789L;
float f = -1.23456789e10F;
double d = 1.23456789e100;
- System.out.println("i = " + i);
- System.out.println("l = " + l);
- System.out.println("f = " + f);
- System.out.println("d = " + d);
+
+ Test.print_int_ln(i);
+ Test.print_long_ln(l);
+ Test.print_float_ln(f);
+ Test.print_double_ln(d);
}
}
Index: llvm-java/test/Programs/SingleSource/UnitTests/Arithm.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/Arithm.java:1.4 llvm-java/test/Programs/SingleSource/UnitTests/Arithm.java:1.5
--- llvm-java/test/Programs/SingleSource/UnitTests/Arithm.java:1.4 Sat Jul 24 15:02:39 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/Arithm.java Wed Nov 24 03:04:59 2004
@@ -4,6 +4,6 @@
int one = 1;
int two = 2;
- System.out.println((one + two) - (two * two) + (two / one) + (two % one) + (two << one) - (two >> 1) + (-two)); // = 2
+ Test.print_int_ln((one + two) - (two * two) + (two / one) + (two % one) + (two << one) - (two >> 1) + (-two)); // = 2
}
}
More information about the llvm-commits
mailing list