[runtime] Clean up configure.ac a bit.
[mono.git] / mono / tests / Makefile.am
index 0492bad7b5390d6cd03a112b8d51b32a15a4fdd8..aa6c3529afe59ef0814e1e0b259ac46157742325 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS = cas assemblyresolve gc-descriptors
+SUBDIRS = assemblyresolve gc-descriptors
 
 check-local: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test-cattr-type-load test-reflection-load-with-context test_platform test-process-exit test-messages rm-empty-logs
 check-full: test-sgen check-local
@@ -18,19 +18,21 @@ JITTEST_PROG_RUN = MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode
 
 RUNTIME_ARGS=--config tests-config --optimize=all --debug
 
-with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_4_5
+CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
+
+with_mono_path = MONO_PATH=$(CLASS)
 
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper
 
 MKBUNDLE = \
        PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
-       $(RUNTIME) $(mcs_topdir)/class/lib/net_4_5/mkbundle.exe
+       $(RUNTIME) $(CLASS)/mkbundle.exe
 
 MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -debug \
        -nowarn:0162 -nowarn:0168 -nowarn:0219 -nowarn:0414 -nowarn:0618 \
        -nowarn:0169 -nowarn:1690 -nowarn:0649 -nowarn:0612 -nowarn:3021 \
        -nowarn:0197
-ILASM = $(RUNTIME) $(mcs_topdir)/class/lib/net_4_5/ilasm.exe
+ILASM = $(RUNTIME) $(CLASS)/ilasm.exe
 
 BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs
 
@@ -90,6 +92,7 @@ BASE_TEST_CS_SRC=             \
        exception15.cs          \
        exception16.cs          \
        exception17.cs          \
+       exception18.cs          \
        typeload-unaligned.cs   \
        struct.cs               \
        valuetype-gettype.cs    \
@@ -139,6 +142,7 @@ BASE_TEST_CS_SRC=           \
        many-locals.cs          \
        string-compare.cs       \
        test-prime.cs           \
+       test-tls.cs             \
        params.cs               \
        reflection.cs           \
        interface.cs            \
@@ -178,6 +182,8 @@ BASE_TEST_CS_SRC=           \
        delegate7.cs            \
        delegate8.cs            \
        delegate9.cs            \
+       delegate10.cs           \
+       delegate11.cs           \
        remoting1.cs            \
        remoting2.cs            \
        remoting3.cs            \
@@ -408,6 +414,7 @@ BASE_TEST_CS_SRC=           \
        thread_static_gc_layout.cs \
        sleep.cs \
        bug-27147.cs    \
+       bug-30085.cs    \
        bug-17537.cs
 
 TEST_CS_SRC_DIST=      \
@@ -454,6 +461,11 @@ if POWERPC
 PLATFORM_DISABLED_TESTS=finalizer-abort.exe finalizer-exception.exe finalizer-exit.exe
 endif
 
+if POWERPC64
+# These tests hang
+PLATFORM_DISABLED_TESTS=monitor.exe finalizer-abort.exe finalizer-exception.exe finalizer-exit.exe
+endif
+
 if ARM
 PLATFORM_DISABLED_TESTS=filter-stack.exe
 endif
@@ -727,7 +739,7 @@ test-messages:
 else
 test-messages: w32message.exe
        > test_messages.zero
-       $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe >& w32message.allout && cmp test_messages.zero w32message.allout
+       $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe > w32message.allout 2>&1 && cmp test_messages.zero w32message.allout
 endif
 endif
 
@@ -1082,7 +1094,7 @@ test-aot:
        @failed=0; \
        passed=0; \
        failed_tests="";\
-       profile=net_4_5;        \
+       profile=$(DEFAULT_PROFILE);     \
        tmpfile=`mktemp -t mono_aot_output` || exit 1;  \
        rm -f test-aot-$${name}.stdout test-aot-$${name}.stderr; \
        for assembly in $(mcs_topdir)/class/lib/$$profile/*.dll ; do    \
@@ -1276,11 +1288,11 @@ GSHARED_TESTS = \
 test-generic-sharing-normal: $(GSHARED_TESTS)
        @for fn in $+ ; do      \
                echo "Testing $$fn ...";        \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared                $$fn > $$fn.stdout || exit 1;     \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared,shared         $$fn > $$fn.stdout || exit 1;     \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared,-inline        $$fn > $$fn.stdout || exit 1;     \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared,-inline,shared $$fn > $fn.stdout || exit 1;      \
-               if [ x$(AOT) = x1 ]; then MONO_GENERIC_SHARING=all $(with_mono_path) $(JITTEST_PROG_RUN) --aot --debug $$fn > /dev/null || exit 1; MONO_GENERIC_SHARING=all $(RUNTIME) $$fn > $$fn.stdout || exit 1; fi; \
+               $(RUNTIME) -O=gshared                $$fn > $$fn.stdout || exit 1;      \
+               $(RUNTIME) -O=gshared,shared         $$fn > $$fn.stdout || exit 1;      \
+               $(RUNTIME) -O=gshared,-inline        $$fn > $$fn.stdout || exit 1;      \
+               $(RUNTIME) -O=gshared,-inline,shared $$fn > $fn.stdout || exit 1;       \
+               if [ x$(AOT) = x1 ]; then $(with_mono_path) $(JITTEST_PROG_RUN) --aot --debug $$fn > /dev/null || exit 1; $(RUNTIME) $$fn > $$fn.stdout || exit 1; fi; \
        done
 
 test-generic-sharing-managed: test-runner.exe $(GSHARED_TESTS)
@@ -1290,7 +1302,7 @@ if NACL_CODEGEN
 test-generic-sharing:
 else
 test-generic-sharing:
-       @if test x$(M) != x; then $(MAKE) test-generic-sharing-managed; else $(MAKE) test-generic-sharing-normal; fi
+       @if test x$(M) != x0; then $(MAKE) test-generic-sharing-managed; else $(MAKE) test-generic-sharing-normal; fi
 endif
 
 EXTRA_DIST += async-exceptions.cs
@@ -1340,7 +1352,7 @@ test-oom: $(OOM_TESTS)
 
 noinst_LTLIBRARIES = libtest.la
 
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
+AM_CPPFLAGS = $(GLIB_CFLAGS)
 
 if HOST_WIN32
 # gcc-3.4.4 emits incorrect code when making indirect calls to stdcall functions using a tail call