* tests/Makefile.am: Cleanup, removed checkall, added build target.

* tests/A2.java: Removed.
* tests/AA.java,
tests/AA1.java,
tests/AA2.java,
tests/BB.java,
tests/C.java,
tests/C2.java,
tests/C3.java,
tests/CC.java,
tests/D.java,
tests/DD.java,
tests/EE.java,
tests/GG.java,
tests/HI2.java,
tests/II.java,
tests/IIAA.java,
tests/IIBB.java,
tests/IICC.java,
tests/IIexample.java,
tests/n.java,
tests/scribble.java: Likewise.

diff --git a/tests/A2.java b/tests/A2.java
deleted file mode 100644 (file)
index c79e2d3..0000000
--- a/tests/A2.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class A2 {
-static A a2 = new A();
-static int myZero;
-
-}
-
-

diff --git a/tests/AA.java b/tests/AA.java
deleted file mode 100644 (file)
index 0f2ecbc..0000000
--- a/tests/AA.java
+++ /dev/null
@@ -1,25 +0,0 @@
-public class AA
-{
-static int xx;
-
-public void f9() {
-  int x = 1;
-}
-public static void main(String[] s) {
-AA2 a;
-DD d = new DD();
-EE e = new EE();
-int x = 1;
-
-for (int i=1;i<5;i++) {
-xx = 5;
-if (x==1)
-  a=d;
-else
-  a=e;
-a.f();
-
-
-}
-}
-}

diff --git a/tests/AA1.java b/tests/AA1.java
deleted file mode 100644 (file)
index d51b96a..0000000
--- a/tests/AA1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class AA1 extends AA
-{
-public void f() {
-  int x = 3;
-}
-}

diff --git a/tests/AA2.java b/tests/AA2.java
deleted file mode 100644 (file)
index 3649622..0000000
--- a/tests/AA2.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class AA2 extends AA1
-{
-public void f3() {
-  int x = 3;
-}
-}

diff --git a/tests/BB.java b/tests/BB.java
deleted file mode 100644 (file)
index d58e253..0000000
--- a/tests/BB.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class BB extends AA 
-{
-public void f() {
-  int x = 2;
-  GG g = new GG();
-}
-}

diff --git a/tests/C.java b/tests/C.java
deleted file mode 100644 (file)
index fd982e7..0000000
--- a/tests/C.java
+++ /dev/null
@@ -1,18 +0,0 @@
-class C extends A {
-static int cx = 1;
-
-void m1( ) {ax = 100; cx=1;
-}
-
-public static void main(String[] s) {
-  A a;
-  B b = new B();
-  a=b;
-  b.m1();
-  b.m2();
-  cx++;
-//  System.out.println("Hello World"));
-//  System.out.println("C: "+ ax +"; B: "+b.ax +"; A: "+a.ax);
- } 
-}
-

diff --git a/tests/C2.java b/tests/C2.java
deleted file mode 100644 (file)
index abe17b7..0000000
--- a/tests/C2.java
+++ /dev/null
@@ -1,19 +0,0 @@
-class C2 extends A {
-int cx;
-void m1( ) {ax = 100; cx=1;
-//D d = new D();
-}
-public static void main(String[] s) {
-  A a;
-  B b;
-  int i=1;
-if (i==1)
-  a = new A();
-else
-  a = new D();
-
-  a.m1();
-  a.m2();
- } 
-}
-

diff --git a/tests/C3.java b/tests/C3.java
deleted file mode 100644 (file)
index 0ba2d9d..0000000
--- a/tests/C3.java
+++ /dev/null
@@ -1,18 +0,0 @@
-class C3 extends A {
-int cx;
-void m1( ) {ax = 100; cx=1;
-}
-public static void main(String[] s) {
-  A a = A2.a2;
-  B b = new B();
-  int x = A2.myZero;
-  a=b;
-  b.m1();
-  b.m2();
-
-//  System.out.println("Hello World"));
-//  System.out.println("C: "+ ax +"; B: "+b.ax +"; A: "+a.ax);
- } 
-}
-
-

diff --git a/tests/CC.java b/tests/CC.java
deleted file mode 100644 (file)
index 1896ab3..0000000
--- a/tests/CC.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class CC extends AA2
-{
-public void f() {
-  int x = 3;
-}
-}

diff --git a/tests/D.java b/tests/D.java
deleted file mode 100644 (file)
index 0447487..0000000
--- a/tests/D.java
+++ /dev/null
@@ -1,13 +0,0 @@
-class D extends A {
-int ax = 133;
-
-void m1( ) {ax = ax + 10; 
-  // System.out.println("In D.m1: "+ax);
-  }
-
-B m3( ) {
-B b = new B();
-b.bx++;
-return b;
-}
-}

diff --git a/tests/DD.java b/tests/DD.java
deleted file mode 100644 (file)
index 1d1f109..0000000
--- a/tests/DD.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class DD extends CC 
-{
-public void f2() {
-  int x = 4;
-}
-}

diff --git a/tests/EE.java b/tests/EE.java
deleted file mode 100644 (file)
index 3c2b06c..0000000
--- a/tests/EE.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class EE extends CC
-{
-public void f2() {
-  int x = 6;
-}
-}

diff --git a/tests/GG.java b/tests/GG.java
deleted file mode 100644 (file)
index 30c2a9c..0000000
--- a/tests/GG.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class GG extends BB
-{
-public void f() {
-  int x = 5;
-}
-}

diff --git a/tests/HI2.java b/tests/HI2.java
deleted file mode 100644 (file)
index 57bb837..0000000
--- a/tests/HI2.java
+++ /dev/null
@@ -1,19 +0,0 @@
-public class HI2 {
-   public   static int max1(int i, int j) {
-   
-   if (i > j)
-     return i;
-   else
-     return j;
-   }
-
-   public static void main(String[] args) {
-      int i;
-      int j;
-      int k;
-      for (i=0; i<10; i++) {
-       j = (i*2)-5;
-       k = max1(i, j);
-       }
-   }
-}

diff --git a/tests/II.java b/tests/II.java
deleted file mode 100644 (file)
index 211775d..0000000
--- a/tests/II.java
+++ /dev/null
@@ -1,4 +0,0 @@
-interface II{
-public void foo();
-public void foo2();
-}

diff --git a/tests/IIAA.java b/tests/IIAA.java
deleted file mode 100644 (file)
index 4fb53da..0000000
--- a/tests/IIAA.java
+++ /dev/null
@@ -1,18 +0,0 @@
-class IIAA implements II {
-int xx;
-int yy;
-int zz;
-
-public void foo( ) {
-  int j = xx;
-}
-
-public void foo2( ) {
-  int j = zz;
-}
-
-public void bar ( ) {
-yy=0;
-zz=1;
-}
-}

diff --git a/tests/IIBB.java b/tests/IIBB.java
deleted file mode 100644 (file)
index 593b25f..0000000
--- a/tests/IIBB.java
+++ /dev/null
@@ -1,11 +0,0 @@
-class IIBB extends IIAA  {
-public void foo() {
-  yy=0;
-  zz=0;
-  int j= zz;
-}
-
-public void bar ( ) {
-  yy=1;
-}
-}

diff --git a/tests/IICC.java b/tests/IICC.java
deleted file mode 100644 (file)
index 3c2ffc1..0000000
--- a/tests/IICC.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class IICC extends IIAA {
-public void foo( ) {
-  this.bar(); 
-}
-}

diff --git a/tests/IIexample.java b/tests/IIexample.java
deleted file mode 100644 (file)
index bad5aa4..0000000
--- a/tests/IIexample.java
+++ /dev/null
@@ -1,18 +0,0 @@
-class IIexample {
-public static void main (String[] args) {
-ff();
-gg();
-}
-
-static void ff() {
-II i1 = new IIBB();
-i1.foo();
-}
-
-static void gg() {
-//II i2 = new IICC();
-II i2 = new IIBB();  // so unique
-i2.foo();
-}
-
-}

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f5ff483c20ceeb27ec2e454ee3ff0b9d0f377ebc..18b846fc5cfe821fe06114323de27598f385633d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
+## Copyright (C) 1996-2005, 2006, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,47 +19,23 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes:
 
-## Process this file with automake to produce Makefile.in
 
-SUBDIRS = regression
+JAVA     = LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
-EXTRA_DIST = \
-       hello.java \
-       prop.java \
-       x.java \
-       x.output \
-       TestBase.java \
-       TestArrayClasses.java \
-       TestArrayClasses.output \
-       BasicToStrings.java \
-       BasicToStrings.output \
-       GCBench.java \
-       JavaPerformance.java \
-       param_test.java \
-       exception_restore_registers.java
-
-JAVA = $(top_builddir)/src/cacao/cacao
+SUBDIRS = \
+       regression
 
-checkall: x.tst TestArrayClasses.tst BasicToStrings.tst param_test.tst exception_restore_registers.tst
+EXTRA_DIST = \
+       *.java
 
-%.tst:
-       $(JAVAC) $*.java
-       sh Test.sh $(JAVA) $*
-#      $(JAVA) $* > $*.thisoutput
-#      diff --brief $*.output $*.thisoutput
-       $(RM) $*.thisoutput
-       $(RM) $*.this2output
+CLEANFILES = \
+       *.class
 
-%.tstrun:
-       $(JAVAC) $*.java
-       $(JAVA) $*
+build:
+       $(JAVACCMD) -d . $(srcdir)/*.java
 
 
 ## Local variables:

diff --git a/tests/n.java b/tests/n.java
deleted file mode 100644 (file)
index e2ea205..0000000
--- a/tests/n.java
+++ /dev/null
@@ -1,7 +0,0 @@
-
-public class n implements a {
-       public void do_a () { };
-       public void do_a2 () { };
-       public void do_b () { };
-       }
-       
\ No newline at end of file

diff --git a/tests/scribble.java b/tests/scribble.java
deleted file mode 100644 (file)
index 21dfac6..0000000
--- a/tests/scribble.java
+++ /dev/null
@@ -1,29 +0,0 @@
-import java.applet.*;
-import java.awt.*;
-
-public class scribble extends Applet {
-   private int last_x=0;
-   private int last_y=0;
-
-
-    public void init()
-    {
-       this.setBackground(Color.white);
-    }
-
-
-    public boolean mouseDown(Event e, int x, int y)
-    {
-       last_x = x; last_y=y; 
-       return true;
-    }
-
-    public boolean mouseDrag(Event e, int x, int y)
-    {
-       Graphics g = getGraphics();
-       g.setColor (Color.black);
-       g.drawLine(last_x,last_y,x,y);
-       last_x=x; last_y=y;
-       return true;
-    }
-}