projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[xbuild] Vbc task - make error column check a little non-specific.
[mono.git]
/
mono
/
tests
/
cas
/
demand
/
Makefile.am
diff --git
a/mono/tests/cas/demand/Makefile.am
b/mono/tests/cas/demand/Makefile.am
index b3ca85c82322e58714620d8d1ba4d74c7b23b44d..9321b1d90c5fe378bf0cbc9478a1ec38ac72c00b 100644
(file)
--- 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 \
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 \
run: tests
@for i in $(FULLTRUST_TEST_FILES); do \
- $(
RUNTIME) $$i.exe;
\
+ $(
CAS_RUNTIME) $$i.exe;
\
done;
@for i in $(INTERNET_TEST_FILES); do \
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 \
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`; \
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 \
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`; \
if [ "$$?" = "0" ]; then \
echo -e "unhandled-$$i\tFAIL ($$?)"; \
failed=`expr $${failed} + 1`; \