* config-default.make (TEST_RUNTIME): Use 'mono' by default.

* platforms/win32.make (TEST_RUNTIME): Remove.
* profiles/default.make (TEST_RUNTIME): Remove.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 22c16af11af3c1ecea43c5a351c6b427b8a4e527..59fa8b8ac53d5a9597715fb0f6deb0550087666d 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-02  Raja R Harinath  <rharinath@novell.com>
+
+       * config-default.make (TEST_RUNTIME): Use 'mono' by default.
+       * platforms/win32.make (TEST_RUNTIME): Remove.
+       * profiles/default.make (TEST_RUNTIME): Remove.
+
 2004-06-28  Raja R Harinath  <rharinath@novell.com>
 
        * platforms/linux.make (RESGEN): Define using $(INTERNAL_RESGEN).

diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make
index 49cbf7bcb63b834838c47003e458e2f1ab2a8ae9..e37df7438e8e3f659aba8051d767e416097e6066 100644 (file)
--- a/mcs/build/config-default.make
+++ b/mcs/build/config-default.make
@@ -13,9 +13,9 @@ MBAS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
 LIBRARY_FLAGS = /noconfig
 CFLAGS = -g -O2
 INSTALL = /usr/bin/install
-RUNTIME = mono $(RUNTIME_FLAGS)
-TEST_RUNTIME=$(PLATFORM_RUNTIME)
 prefix = /usr/local
+RUNTIME = mono $(RUNTIME_FLAGS)
+TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
 
 # In case you want to add MCS_FLAGS, this lets you not have to
 # keep track of the default value

diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make
index aeb784352d38d2ac5eb20a92bc543b6544724048..1229ceef979c79c21489dc79d5388bbd053b7bf1 100644 (file)
--- a/mcs/build/platforms/win32.make
+++ b/mcs/build/platforms/win32.make
@@ -16,8 +16,6 @@ PLATFORM_MAKE_CORLIB_CMP = yes
 PLATFORM_CHANGE_SEPARATOR_CMD=tr '/' '\\\\'
 PLATFORM_PATH_SEPARATOR = ;
 
-TEST_RUNTIME = mono
-
 hidden_prefix = 
 hidden_suffix = .tmp
 

diff --git a/mcs/build/profiles/default.make b/mcs/build/profiles/default.make
index e26b91a0762b7d92f5076ce1abc124857f3444e6..7b7a3e4913b45d0a83c843f9cdaed67efe8c3538 100644 (file)
--- a/mcs/build/profiles/default.make
+++ b/mcs/build/profiles/default.make
@@ -17,7 +17,6 @@
 ifdef PLATFORM_MONO_NATIVE
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS)
 MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MBAS)
-TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) --debug
 else
 MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib/$(PROFILE)
 MBAS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MBAS) /lib:$(topdir)/class/lib/$(PROFILE)