make test: less verbose plzkkthx

... and, there is something broken @ Fac.java :-(
stay tuned... *sigh*

diff --git a/Makefile b/Makefile
index 4346835679378aea58ccd1819c072d1fba3a858a..fb4b5bcda9b4040ed5858b06c20ae4e373ae665a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,16 +18,15 @@ all: mate $(CLASS_FILES)
 
 test: mate $(CLASS_FILES)
        ./$< tests/Fib | grep mainresult
-       @printf "should be:  0x%08x\n" 0x09de8d6d
+       @printf "should be:  0x%08x\n" 0x2ac2
        ./$< tests/Fac | grep mainresult
-       @printf "should be:  0x%08x\n" 0x58980
+       @printf "should be:  0x%08x\n" 0x63e1a
        ./$< tests/ArgumentPassing1 | grep mainresult
-       @printf "should be:  0x%08x\n" 0x92
-       @printf "should be:  0x%08x\n" $$(((0 - 0x1337) & 0xffffffff))
+       @printf "should be:  0x%08x 0x%08x\n" 0x92 $$(((0 - 0x1337) & 0xffffffff))
        ./$< tests/DifferentClass1 | grep mainresult
-       @printf "should be:  0x%08x\n" 8
-       @printf "should be:  0x%08x\n" 13
+       @printf "should be:  0x%08x 0x%08x\n" 8 13
        ./$< tests/Native1 | egrep -i -e '^printsomething: '
+       @printf "should be:  woot 0x%08x 0x%08x woot 0x%08x\n" 0x1337 0x1338 0x15a5
        ./$< tests/Static1 | grep mainresult
        @printf "should be:  0x%08x\n" 0x33
        ./$< tests/Static2 | grep mainresult

diff --git a/tests/Fac.java b/tests/Fac.java
index e1cf18878379741c4e65f7c79d612ed3057d7dc5..9929dcbbbff3a0dcc5c317bdd4d9d8437170a60a 100644 (file)
--- a/tests/Fac.java
+++ b/tests/Fac.java
@@ -2,10 +2,17 @@ package tests;
 
 public class Fac {
        public static void main(String args[]) {
+               int sum = 0;
                for (int i = 0; i < 10; i++) {
-                       fac(i);
-                       //System.out.printf("fac(%d): 0x%08x\n", i, fac(i));
+                       // fac(i);
+                       sum += fac(i);
                }
+               id(sum);
+               // System.out.printf("fac: 0x%08x\n", sum);
+       }
+
+       public static int id(int i) {
+               return i;
        }
 
        public static int fac(int a) {

diff --git a/tests/Fib.java b/tests/Fib.java
index 65ed04cdf4870eaabc3aa344b4b62f7025d72b0a..11522e7057ab2bd3b1c6ec625b2a92081cc8c9ad 100644 (file)
--- a/tests/Fib.java
+++ b/tests/Fib.java
@@ -7,6 +7,7 @@ public class Fib {
        }
 
        public static void main(String[] args) {
-               fib(40);
+               fib(20);
+               // System.out.printf("%x\n", fib(20));
        }
 }

diff --git a/tests/Native1.java b/tests/Native1.java
index 3226aecc36b16acaab5879e482b060cb5de46a3f..d35c1a0e0fdaa411deef13ffb7f48e2edfa1dcfc 100644 (file)
--- a/tests/Native1.java
+++ b/tests/Native1.java
@@ -3,10 +3,9 @@ package tests;
 public class Native1 {
        public static void main(String []args) {
                printSomething();
-               for (int i = 0; i < 10; i++)
+               for (int i = 0; i < 2; i++)
                        printNumber(0x1337 + i);
                printSomething();
-               printSomething();
                printNumber(0x15a5);
        }