Author: wade
Date: 2006-06-27 13:46:14 -0400 (Tue, 27 Jun 2006)
New Revision: 62087

Modified:
   trunk/mono/mono/tests/cas/ChangeLog
   trunk/mono/mono/tests/cas/Makefile.am
   trunk/mono/mono/tests/cas/assembly/ChangeLog
   trunk/mono/mono/tests/cas/assembly/Makefile.am
   trunk/mono/mono/tests/cas/demand/ChangeLog
   trunk/mono/mono/tests/cas/demand/Makefile.am
   trunk/mono/mono/tests/cas/inheritance/ChangeLog
   trunk/mono/mono/tests/cas/inheritance/Makefile.am
   trunk/mono/mono/tests/cas/linkdemand/ChangeLog
   trunk/mono/mono/tests/cas/linkdemand/Makefile.am
   trunk/mono/mono/tests/cas/threads/ChangeLog
   trunk/mono/mono/tests/cas/threads/Makefile.am
Log:
* Makefile.am: Rename 'all' target so tests aren't compiled at build time.
Remove 'clean' target so that clean gets propogated to SUBDIRS.

For assembly, linkdemand, demand, inhereitance, threads:
* Makefile.am: Use mcs, permview, and sn from the mcs tree instead of
what's in the path.  Rename targets so tests are not compiled at
build time.



Modified: trunk/mono/mono/tests/cas/ChangeLog
===================================================================
--- trunk/mono/mono/tests/cas/ChangeLog 2006-06-27 17:30:44 UTC (rev 62086)
+++ trunk/mono/mono/tests/cas/ChangeLog 2006-06-27 17:46:14 UTC (rev 62087)
@@ -1,3 +1,8 @@
+2006-06-27  Wade Berrier <[EMAIL PROTECTED]>
+
+       * Makefile.am: Rename 'all' target so tests aren't compiled at build 
time.
+       Remove 'clean' target so that clean gets propogated to SUBDIRS.
+
 2006-06-22  Wade Berrier <[EMAIL PROTECTED]>
 
        * svn:ignore: Ignore Makefile and Makefile.in for this and 

Modified: trunk/mono/mono/tests/cas/Makefile.am
===================================================================
--- trunk/mono/mono/tests/cas/Makefile.am       2006-06-27 17:30:44 UTC (rev 
62086)
+++ trunk/mono/mono/tests/cas/Makefile.am       2006-06-27 17:46:14 UTC (rev 
62087)
@@ -9,10 +9,8 @@
 
 SUBDIRS = assembly linkdemand inheritance demand threads
 
-all:
+check-local: test
 
-clean:
-
 test:
        @failed=0;      \
        passed=0;       \

Modified: trunk/mono/mono/tests/cas/assembly/ChangeLog
===================================================================
--- trunk/mono/mono/tests/cas/assembly/ChangeLog        2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/assembly/ChangeLog        2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -1,3 +1,9 @@
+2006-06-27  Wade Berrier <[EMAIL PROTECTED]>
+
+       * Makefile.am: Use mcs and permview from the mcs tree instead of
+       what's in the path.  Rename targets so tests are not compiled at
+       build time.
+
 2006-06-26  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * Makefile.am: Use mono-wrapper (and not the installed mono).

Modified: trunk/mono/mono/tests/cas/assembly/Makefile.am
===================================================================
--- trunk/mono/mono/tests/cas/assembly/Makefile.am      2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/assembly/Makefile.am      2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -4,11 +4,14 @@
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 RUNTIME2 = $(with_mono_path2) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 
-CSCOMPILE = mcs -debug
 PROFILE = net_1_1
+CSCOMPILE = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -debug
+PERMVIEW = $(RUNTIME) $(mcs_topdir)/tools/security/permview.exe
 
-all: all.exe min.exe opt.exe ref.exe none.exe
+check-local: test
 
+tests: all.exe min.exe opt.exe ref.exe none.exe
+
 aot: all.exe.so min.exe.so opt.exe.so ref.exe.so none.exe.so
 
 TEST_FILES = all min opt ref none
@@ -25,14 +28,14 @@
 # That's why they aren't removed by "make clean"
 templates: all
        @for i in $(TEST_FILES); do     \
-               permview /output $$i.$(PROFILE).txt $$i.exe > /dev/null;        
\
+               $(PERMVIEW) /output $$i.$(PROFILE).txt $$i.exe > /dev/null;     
\
        done;
 
-test: all
+test: tests
        @failed=0; \
        passed=0; \
        for i in $(TEST_FILES); do      \
-               permview /output $$i.$(PROFILE).tmp $$i.exe > /dev/null;        
\
+               $(PERMVIEW) /output $$i.$(PROFILE).tmp $$i.exe > /dev/null;     
\
                cmp -s $$i.$(PROFILE).tmp $$i.$(PROFILE).txt;   \
                if [ "$$?" = "0" ]; then        \
                        echo -e "$$i\tpass";    \

Modified: trunk/mono/mono/tests/cas/demand/ChangeLog
===================================================================
--- trunk/mono/mono/tests/cas/demand/ChangeLog  2006-06-27 17:30:44 UTC (rev 
62086)
+++ trunk/mono/mono/tests/cas/demand/ChangeLog  2006-06-27 17:46:14 UTC (rev 
62087)
@@ -1,3 +1,9 @@
+2006-06-27  Wade Berrier <[EMAIL PROTECTED]>
+
+       * Makefile.am: Use mcs from the mcs tree instead of
+       what's in the path.  Rename targets so tests are not compiled at
+       build time.
+
 2006-06-26  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * Makefile.am: Use mono-wrapper (and not the installed mono).

Modified: trunk/mono/mono/tests/cas/demand/Makefile.am
===================================================================
--- trunk/mono/mono/tests/cas/demand/Makefile.am        2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/demand/Makefile.am        2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -4,14 +4,16 @@
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 RUNTIME2 = $(with_mono_path2) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 
-CSCOMPILE = mcs -debug
+CSCOMPILE = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -debug
 PROFILE = net_1_1
 
 EXTRA_DIST = pinvoke1.cs pinvoke2.cs pinvoke3.cs \
        sucs1.cs sucs2.cs sucs3.cs sucs4.cs \
        selfassert.cs selfdeny.cs selfpermit.cs
 
-all:   pinvoke1.exe pinvoke2.exe pinvoke3.exe \
+check-local: test
+
+tests: pinvoke1.exe pinvoke2.exe pinvoke3.exe \
        sucs1.exe sucs2.exe sucs3.exe sucs4.exe \
        selfassert.exe selfdeny.exe selfpermit.exe
 
@@ -25,7 +27,7 @@
 
 UNHANDLED_TEST_FILES = 
 
-run: all
+run: tests
        @for i in $(FULLTRUST_TEST_FILES); do   \
                $(RUNTIME) $$i.exe;     \
        done;
@@ -33,7 +35,7 @@
                MONO_CAS_ZONE=Internet $(RUNTIME) $$i.exe;      \
        done;
 
-test: all
+test: tests
        @failed=0; \
        passed=0; \
        for i in $(FULLTRUST_TEST_FILES); do    \

Modified: trunk/mono/mono/tests/cas/inheritance/ChangeLog
===================================================================
--- trunk/mono/mono/tests/cas/inheritance/ChangeLog     2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/inheritance/ChangeLog     2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -1,3 +1,9 @@
+2006-06-27  Wade Berrier <[EMAIL PROTECTED]>
+
+       * Makefile.am: Use mcs from the mcs tree instead of
+       what's in the path.  Rename targets so tests are not compiled at
+       build time.
+
 2006-06-26  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * Makefile.am: Use mono-wrapper (and not the installed mono).

Modified: trunk/mono/mono/tests/cas/inheritance/Makefile.am
===================================================================
--- trunk/mono/mono/tests/cas/inheritance/Makefile.am   2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/inheritance/Makefile.am   2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -4,7 +4,7 @@
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 RUNTIME2 = $(with_mono_path2) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 
-CSCOMPILE = mcs -debug
+CSCOMPILE = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -debug
 PROFILE = net_1_1
 
 EXTRA_DIST = notused.cs cas1.cs cas2.cs cas3.cs \
@@ -13,7 +13,9 @@
        reftype1.cs reftype2.cs reftype3.cs reftype4.cs \
        library1.cs library2.cs cas.snk
 
-all:   notused.exe cas1a.exe cas2a.exe cas3a.exe \
+check-local: test
+
+tests: notused.exe cas1a.exe cas2a.exe cas3a.exe \
        cas1b.exe cas2b.exe cas3b.exe \
        noncas1.exe noncas2.exe noncas3.exe noncas4.exe \
        refload1.exe refload2.exe refload3.exe refload4.exe \
@@ -35,7 +37,7 @@
 
 INTERNET_TEST_FILES = 
 
-run: all
+run: tests
        @for i in $(FULLTRUST_TEST_FILES); do   \
                $(RUNTIME) $$i.exe;     \
        done;
@@ -43,7 +45,7 @@
                MONO_CAS_ZONE=Internet $(RUNTIME) $$i.exe;      \
        done;
 
-test: all
+test: tests
        @failed=0; \
        passed=0; \
        for i in $(FULLTRUST_TEST_FILES); do    \

Modified: trunk/mono/mono/tests/cas/linkdemand/ChangeLog
===================================================================
--- trunk/mono/mono/tests/cas/linkdemand/ChangeLog      2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/linkdemand/ChangeLog      2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -1,3 +1,9 @@
+2006-06-27  Wade Berrier <[EMAIL PROTECTED]>
+
+       * Makefile.am: Use mcs and sn from the mcs tree instead of
+       what's in the path.  Rename targets so tests are not compiled at
+       build time.
+
 2006-06-26  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * Makefile.am: Use mono-wrapper (and not the installed mono).

Modified: trunk/mono/mono/tests/cas/linkdemand/Makefile.am
===================================================================
--- trunk/mono/mono/tests/cas/linkdemand/Makefile.am    2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/linkdemand/Makefile.am    2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -12,7 +12,8 @@
 # CSCOMPILE = gmcs -debug
 # compiler_defines += -d:NET_2_0
 # else
-CSCOMPILE = mcs -debug
+CSCOMPILE = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -debug
+SN = $(RUNTIME) $(mcs_topdir)/tools/security/sn.exe
 # endif
 
 EXTRA_DIST = icall1.cs icall2.cs icall3.cs icall4.cs icall5.cs icall6.cs \
@@ -22,7 +23,9 @@
        refcas1.cs refcas2.cs refcas3.cs refcas4.cs refcas5.cs \
        noncas1.cs noncas2.cs noncas3.cs noncas4.cs
 
-all:   icall1.exe icall2.exe icall3.exe icall4.exe icall5.exe icall6.exe \
+check-local: test
+
+tests: icall1.exe icall2.exe icall3.exe icall4.exe icall5.exe icall6.exe \
        aptc1a.exe aptc1b.exe aptc2a.exe aptc2b.exe aptclib.dll \
        pinvoke1.exe pinvoke2.exe pinvoke3.exe pinvoke4.exe \
        cas1.exe cas2.exe cas3.exe cas6.exe cas7.exe cas8.exe cas9.exe \
@@ -46,12 +49,12 @@
 
 UNHANDLED_TEST_FILES = aptc2b cas2 pinvoke3 
 
-run: all
+run: tests
        @for i in $(FULLTRUST_TEST_FILES); do   \
                $(RUNTIME) $$i.exe;     \
        done;
 
-test: all
+test: tests
        @failed=0; \
        passed=0; \
        for i in $(FULLTRUST_TEST_FILES); do    \
@@ -89,7 +92,7 @@
        rm -f *.exe* *.dll* *.snk
 
 aptc.snk:
-       sn -k aptc.snk
+       $(SN) -k aptc.snk
 
 %a.exe: %.cs
        $(CSCOMPILE) $^ /out:$@ $(compiler_defines)

Modified: trunk/mono/mono/tests/cas/threads/ChangeLog
===================================================================
--- trunk/mono/mono/tests/cas/threads/ChangeLog 2006-06-27 17:30:44 UTC (rev 
62086)
+++ trunk/mono/mono/tests/cas/threads/ChangeLog 2006-06-27 17:46:14 UTC (rev 
62087)
@@ -1,3 +1,9 @@
+2006-06-27  Wade Berrier <[EMAIL PROTECTED]>
+
+       * Makefile.am: Use mcs from the mcs tree instead of
+       what's in the path.  Rename targets so tests are not compiled at
+       build time.
+
 2006-06-26  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * Makefile.am: Use mono-wrapper (and not the installed mono). Remove

Modified: trunk/mono/mono/tests/cas/threads/Makefile.am
===================================================================
--- trunk/mono/mono/tests/cas/threads/Makefile.am       2006-06-27 17:30:44 UTC 
(rev 62086)
+++ trunk/mono/mono/tests/cas/threads/Makefile.am       2006-06-27 17:46:14 UTC 
(rev 62087)
@@ -4,7 +4,7 @@
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 RUNTIME2 = $(with_mono_path2) $(top_builddir)/runtime/mono-wrapper --debug 
--security
 
-CSCOMPILE = mcs -debug
+CSCOMPILE = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -debug
 PROFILE = net_1_1
 
 EXTRA_DIST = thread1.cs thread2.cs thread3.cs \
@@ -13,7 +13,9 @@
        delegate1.cs delegate2.cs \
        swf-control1.cs
 
-all:   thread1.exe thread2.exe thread3.exe \
+check-local: test
+
+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,7 +33,7 @@
 
 UNHANDLED_TEST_FILES = 
 
-run: all
+run: tests
        @for i in $(FULLTRUST_TEST_FILES); do   \
                $(RUNTIME) $$i.exe x;   \
        done;
@@ -39,7 +41,7 @@
                MONO_CAS_ZONE=Internet $(RUNTIME) $$i.exe;      \
        done;
 
-test: all
+test: tests
        @failed=0; \
        passed=0; \
        for i in $(FULLTRUST_TEST_FILES); do    \

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to