2004-05-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* library.make: build NUnit if we try to run 'make test' and the dll
	is not found.

svn path=/trunk/mcs/; revision=26967

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 64b0bee7046d722b4bf5e809f98e9b8c57ca5c9c..1e7d0c6c67646ff921a1cb1a73eb4b7466127580 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-08  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * library.make: build NUnit if we try to run 'make test' and the dll
+       is not found.
+
 2004-04-29  Jackson Harper  <jackson@ximian.com>
 
        * library.make: Fix uninstall

diff --git a/mcs/build/library.make b/mcs/build/library.make
index d6663d69f0edeb4387f75a941bcc51b2b3134594..822ebd23280f6d9f4170d54cc58284ee21590ddd 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -26,7 +26,8 @@ test_sourcefile = $(test_lib).sources
 test_response = $(depsdir)/$(PROFILE)_$(test_lib).response
 test_makefrag = $(depsdir)/$(PROFILE)_$(test_lib).makefrag
 test_stampfile = $(depsdir)/$(PROFILE)_$(test_lib).stamp
-test_flags = /r:$(the_lib) /r:$(topdir)/class/lib/$(PROFILE)/NUnit.Framework.dll $(TEST_MCS_FLAGS)
+test_nunitfw = $(topdir)/class/lib/$(PROFILE)/NUnit.Framework.dll 
+test_flags = /r:$(the_lib) /r:$(test_nunitfw) $(TEST_MCS_FLAGS)
 endif
 
 gacutil = $(topdir)/tools/gacutil/gacutil.exe
@@ -53,9 +54,12 @@ ifdef PLATFORM_CHANGE_SEPARATOR_CMD
 endif
 
 ifndef NO_TEST
-test-local: $(the_lib) $(test_lib)
+$(test_nunitfw):
+       (cd ${topdir}/nunit20 && make)
 
-run-test-local:
+test-local: $(test_nunitfw) $(the_lib) $(test_lib)
+
+run-test-local: test-local
        $(TEST_RUNTIME) $(TEST_HARNESS) $(test_lib)
 
 else