X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2Fcas%2Fdemand%2FMakefile.am;h=9321b1d90c5fe378bf0cbc9478a1ec38ac72c00b;hb=aa6a91981b5df2d215ffdaefcfb9e92409d133ca;hp=b3ca85c82322e58714620d8d1ba4d74c7b23b44d;hpb=7015b812166d0992223b5dc4421deab637500265;p=mono.git

diff --git a/mono/tests/cas/demand/Makefile.am b/mono/tests/cas/demand/Makefile.am
index b3ca85c8232..9321b1d90c5 100644
--- a/mono/tests/cas/demand/Makefile.am
+++ b/mono/tests/cas/demand/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 = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -debug
-PROFILE = net_1_1
+CAS_RUNTIME = $(RUNTIME) --security
+
+CSCOMPILE = $(RUNTIME) $(mcs_topdir)/class/lib/basic/mcs.exe -debug
+PROFILE = net_2_0
 
 EXTRA_DIST = pinvoke1.cs pinvoke2.cs pinvoke3.cs \
 	sucs1.cs sucs2.cs sucs3.cs sucs4.cs \
@@ -27,17 +27,17 @@ UNHANDLED_TEST_FILES =
 
 run: tests
 	@for i in $(FULLTRUST_TEST_FILES); do	\
-		$(RUNTIME) $$i.exe;	\
+		$(CAS_RUNTIME) $$i.exe;	\
 	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: 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`; \
@@ -48,7 +48,7 @@ test: tests
 		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`; \