Author: mhabersack
Date: 2007-09-19 14:49:51 -0400 (Wed, 19 Sep 2007)
New Revision: 86029
Modified:
trunk/mono/mono/tests/ChangeLog
trunk/mono/mono/tests/Makefile.am
Log:
2007-09-19 Marek Habersack <[EMAIL PROTECTED]>
* Makefile.am: assemblyresolve/ assemblies are built only when the
make test is ran.
Modified: trunk/mono/mono/tests/ChangeLog
===================================================================
--- trunk/mono/mono/tests/ChangeLog 2007-09-19 18:29:14 UTC (rev 86028)
+++ trunk/mono/mono/tests/ChangeLog 2007-09-19 18:49:51 UTC (rev 86029)
@@ -1,3 +1,8 @@
+2007-09-19 Marek Habersack <[EMAIL PROTECTED]>
+
+ * Makefile.am: assemblyresolve/ assemblies are built only when the
+ make test is ran.
+
2007-09-19 Raja R Harinath <[EMAIL PROTECTED]>
* assemblyresolve/Makefile.am: Fix srcdir != builddir issues.
Modified: trunk/mono/mono/tests/Makefile.am
===================================================================
--- trunk/mono/mono/tests/Makefile.am 2007-09-19 18:29:14 UTC (rev 86028)
+++ trunk/mono/mono/tests/Makefile.am 2007-09-19 18:49:51 UTC (rev 86029)
@@ -1,4 +1,4 @@
-SUBDIRS = cas assemblyresolve
+SUBDIRS = cas
check-local: test
@@ -336,14 +336,14 @@
# mkbundle works on ppc, but the pkg-config POC doesn't when run with make test
if POWERPC
-test: testjit test-type-load test-inline-call-stack test-bug-80307
test-bug-81673 test-bug-81691 test-bug-81466
+test: assemblyresolve/test/asm.dll testjit test-type-load
test-inline-call-stack test-bug-80307 test-bug-81673 test-bug-81691
test-bug-81466
else
# Can't use mkbundle on win32 since there is no static build there
# Can't run test-unhandled-exception on Windows because of all the debug
popups...
if PLATFORM_WIN32
-test: testjit test-type-load test-inline-call-stack test-bug-80307
test-bug-81673 test-bug-81691 test-bug-81466
+test: assemblyresolve/test/asm.dll testjit test-type-load
test-inline-call-stack test-bug-80307 test-bug-81673 test-bug-81691
test-bug-81466
else
-test: testjit testbundle test-type-load test-inline-call-stack
test-iomap-regression test-bug-80307 test-bug-81673 test-bug-81691
test-bug-81466
+test: assemblyresolve/test/asm.dll testjit testbundle test-type-load
test-inline-call-stack test-iomap-regression test-bug-80307 test-bug-81673
test-bug-81691 test-bug-81466
endif
endif
@@ -351,6 +351,9 @@
test : test-coreclr-security
endif
+assemblyresolve/test/asm.dll:
+ $(MAKE) -C assemblyresolve
+
TestDriver.dll:
$(MCS) -target:library -out:$@ $(srcdir)/../mini/TestDriver.cs
@@ -629,3 +632,6 @@
libtest_la_LIBADD = $(GLIB_LIBS)
CLEANFILES = $(TESTSI_CS) $(TESTSI_IL) $(STRESS_TESTS) *.dll *.stdout *.exe
stest.dat
+
+assemblyresolve_event3.cs:
+ echo ASSEMBLY RESOLVE
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
