2009-10-03 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/tests/cas/threads/Makefile.am b/mono/tests/cas/threads/Makefile.am
index 7d8f6a3a62e0c0abb296fb3d273a75210bfa8bd2..e9784d00b474b571acff115fae9169be820400de 100644 (file)
--- a/mono/tests/cas/threads/Makefile.am
+++ b/mono/tests/cas/threads/Makefile.am
@@ -1,11 +1,11 @@
-with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/default
-with_mono_path2 = MONO_PATH=$(mcs_topdir)/class/lib/net_2_0
+with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_2_0
 
-RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper --debug --security
-RUNTIME2 = $(with_mono_path2) $(top_builddir)/runtime/mono-wrapper --debug --security
+RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper --debug
 
-CSCOMPILE = mcs -debug
-PROFILE = net_1_1
+CAS_RUNTIME = $(RUNTIME) --security
+
+CSCOMPILE = $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/gmcs.exe -debug
+PROFILE = net_2_0
 
 EXTRA_DIST = thread1.cs thread2.cs thread3.cs \
        tpool1.cs tpool2.cs \
@@ -13,7 +13,7 @@ EXTRA_DIST = thread1.cs thread2.cs thread3.cs \
        delegate1.cs delegate2.cs \
        swf-control1.cs
 
-all:   thread1.exe thread2.exe thread3.exe \
+tests: thread1.exe thread2.exe thread3.exe \
        tpool1.exe tpool2.exe delegate1.exe delegate2.exe \
        timer1.exe timer2.exe
 #      swf-timer3.exe swf-timer4.exe swf-control1.exe
@@ -31,19 +31,19 @@ FULLTRUST_TEST_FILES = thread1 thread2 thread3 \
 
 UNHANDLED_TEST_FILES = 
 
-run: all
+run: tests
        @for i in $(FULLTRUST_TEST_FILES); do   \
-               $(RUNTIME) $$i.exe x;   \
+               $(CAS_RUNTIME) $$i.exe x;       \
        done;
        @for i in $(INTERNET_TEST_FILES); do    \
-               MONO_CAS_ZONE=Internet $(RUNTIME) $$i.exe;      \
+               MONO_CAS_ZONE=Internet $(CAS_RUNTIME) $$i.exe;  \
        done;
 
-test: all
+test: tests
        @failed=0; \
        passed=0; \
        for i in $(FULLTRUST_TEST_FILES); do    \
-               $(RUNTIME) $$i.exe > /dev/null; \
+               $(CAS_RUNTIME) $$i.exe > /dev/null;     \
                if [ "$$?" = "0" ]; then        \
                        echo -e "fulltrust-$$i\tpass";  \
                        passed=`expr $${passed} + 1`; \
@@ -54,7 +54,7 @@ test: all
                fi;     \
        done;   \
        for i in $(UNHANDLED_TEST_FILES); do    \
-               $(RUNTIME) $$i.exe > /dev/null; \
+               $(CAS_RUNTIME) $$i.exe > /dev/null;     \
                if [ "$$?" = "0" ]; then        \
                        echo -e "unhandled-$$i\tFAIL ($$?)";    \
                        failed=`expr $${failed} + 1`; \