2008-02-06 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / tests / Makefile.am

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 2d2213167582b7f09e851c6083ee2c55e0ded818..4440f9f64c88f4e1f18ef7d642904274d17f0f41 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -40,7 +40,7 @@ STRESS_TESTS_SRC=     \
        thread-stress.cs        \
        gc-stress.cs
 
-TEST_CS_SRC=                   \
+BASE_TEST_CS_SRC=              \
        array-init.cs           \
        arraylist.cs            \
        assemblyresolve_event.cs        \
@@ -167,7 +167,6 @@ TEST_CS_SRC=                        \
        remoting3.cs            \
        remoting4.cs            \
        remoting5.cs            \
-       nonvirt.cs              \
        largeexp.cs             \
        largeexp2.cs            \
        marshalbyref1.cs        \
@@ -215,6 +214,7 @@ TEST_CS_SRC=                        \
        bug-78653.cs            \
        bug-78656.cs            \
        bug-77127.cs            \
+       bug-323114.cs           \
        bug-331958.cs           \
        interlocked.cs          \
        cross-domain.cs         \
@@ -240,7 +240,23 @@ TEST_CS_SRC=                       \
        transparentproxy.cs \
        imt_big_iface_test.cs \
        dbnull-missing.cs       \
-       soft-float-tests.cs
+       test-type-ctor.cs       \
+       soft-float-tests.cs     \
+       thread-exit.cs
+
+if AMD64
+TEST_CS_SRC = $(BASE_TEST_CS_SRC) async-exc-compilation.cs
+else
+if X86
+TEST_CS_SRC = $(BASE_TEST_CS_SRC) async-exc-compilation.cs
+else
+TEST_CS_SRC = $(BASE_TEST_CS_SRC)
+endif
+endif
+
+if IA64
+TEST_CS_SRC+=async-exc-compilation.cs
+endif
 
 if X86
 # bug #71274
@@ -256,6 +272,8 @@ DISABLED_TESTS=                     \
        delegate-async-exception.exe    \
        delegate-delegate-exception.exe \
        appdomain-unload.exe            \
+       bug-77127.exe \
+       bug-348522.exe  \
        $(PLATFORM_DISABLED_TESTS)
 
 # These only compile with MS CSC
@@ -286,7 +304,8 @@ TEST_IL_SRC=                        \
        even-odd.il             \
        bug-82022.il    \
        vt-sync-method.il       \
-       enum_types.il
+       enum_types.il   \
+       invalid-token.il
 
 #      bug-318677.il
 
@@ -316,6 +335,7 @@ TEST_CS2_SRC = \
        bug-333798-tb.2.cs              \
        bug-335131.2.cs         \
        bug-322722_patch_bx.2.cs                \
+       bug-348522.2.cs         \
        bug-322722_dyn_method_throw.2.cs
 
 TEST_IL2_SRC = find-method.2.il        \
@@ -645,7 +665,7 @@ EXTRA_DIST += make_imt_test.sh
 imt_big_iface_test.cs: $(srcdir)/make_imt_test.sh
        $(srcdir)/make_imt_test.sh > imt_big_iface_test.cs
 
-EXTRA_DIST += custom-modifiers-lib.il
+EXTRA_DIST += custom-modifiers.2.cs custom-modifiers-lib.il
 custom-modifiers-lib.dll: custom-modifiers-lib.il
        $(ILASM) /dll /output:custom-modifiers-lib.dll $(srcdir)/custom-modifiers-lib.il
 custom-modifiers.exe: custom-modifiers.2.cs custom-modifiers-lib.dll