* library.make ($(test_nunit_dep)): Make sure NUnit is built for

the profile being tested.
(nunit-$(PROFILE).stamp): Rename from nunit.stamp.
* config-default.make (TEST_HARNESS): Look for 'nunit-console' in
profile-specific directory.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 9121b31fafa0c6e370ec056a2e348407ca1cccd8..3a58d75b7d1fc39f9bd3deaef95f1eb8f9b59fb4 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-27  Raja R Harinath  <rharinath@novell.com>
+
+       * library.make ($(test_nunit_dep)): Make sure NUnit is built for
+       the profile being tested.
+       (nunit-$(PROFILE).stamp): Rename from nunit.stamp.
+       * config-default.make (TEST_HARNESS): Look for 'nunit-console' in
+       profile-specific directory.
+
 2004-09-21  Raja R Harinath  <rharinath@novell.com>
 
        * profiles/net_2_0_bootstrap.make: New file.

diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make
index e37df7438e8e3f659aba8051d767e416097e6066..76edf1adb05fca34e0fae5b22872aac09062eb4c 100644 (file)
--- a/mcs/build/config-default.make
+++ b/mcs/build/config-default.make
@@ -7,7 +7,7 @@
 # there.
 
 RUNTIME_FLAGS = 
-TEST_HARNESS = $(topdir)/class/lib/nunit-console.exe
+TEST_HARNESS = $(topdir)/class/lib/$(PROFILE)/nunit-console.exe
 MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
 MBAS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
 LIBRARY_FLAGS = /noconfig

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 4b8c603dd7e8fef3054c1f92b3f204a865a5d51a..a1f352ee6115e64289d236c8d3c96922c185303e 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -133,9 +133,9 @@ test-local run-test-local run-test-ondotnet-local:
        @:
 
 ifndef NO_TEST
-$(test_nunit_dep): $(topdir)/build/deps/nunit.stamp
+$(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
        @if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi
-$(topdir)/build/deps/nunit.stamp:
+$(topdir)/build/deps/nunit-$(PROFILE).stamp:
        cd ${topdir}/nunit20 && $(MAKE)
        echo "stamp" >$@
 endif