* Merged with df1b780317c3.

[cacao.git] / tests / regression / Makefile.am

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 879b3cdab4ae219aac7ec3d7c5b0168313ba5be9..b6454fce4c56d1a3c193ec874bb3fb94cdfc503f 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/regression/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, 2007, 2008
+## CACAOVM - Verein zu Foerderung der freien virtuellen Machine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,20 +19,12 @@
 ## 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
-##
-## $Id: Makefile.am 7486 2007-03-08 13:50:07Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
        codepatching \
        jasmin \
-       native \
-       resolving
+       native
 
 JAVA      = $(top_builddir)/src/cacao/cacao
 
@@ -50,11 +40,12 @@ SOURCE_FILES = \
        $(srcdir)/fptest.java \
        $(srcdir)/fp.java \
        $(srcdir)/extest.java \
-       $(srcdir)/extest_clinit.java \
        $(srcdir)/clinitexception.java \
        $(srcdir)/LoadDisplacementOverflow.java \
        $(srcdir)/FieldDisplacementOverflow.java \
-       $(srcdir)/StackDisplacementOverflow.java
+       $(srcdir)/StackDisplacementOverflow.java \
+       $(srcdir)/MinimalClassReflection.java \
+       $(srcdir)/TestAnnotations.java
 
 EXTRA_DIST = \
        $(SOURCE_FILES) \
@@ -67,7 +58,9 @@ EXTRA_DIST = \
        clinitexception.2output \
        LoadDisplacementOverflow.output \
        FieldDisplacementOverflow.output \
-       StackDisplacementOverflow.output
+       StackDisplacementOverflow.output \
+       MinimalClassReflection.output \
+       TestAnnotations.output
 
 CLEANFILES = \
        *.class \
@@ -85,7 +78,9 @@ OUTPUT_JAVA_TESTS = \
        clinitexception \
        LoadDisplacementOverflow \
        FieldDisplacementOverflow \
-       StackDisplacementOverflow
+       StackDisplacementOverflow \
+       MinimalClassReflection \
+       TestAnnotations
 
 check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)