Permalink
Browse files

In .:

	* runtime/mono-wrapper.in (PATH): Include _tmpinst/bin.  Ensure
	that library invocations of 'mcs' and 'gmcs' pick the in-tree versions.
	* runtime/Makefile.am (mcs-do-run-test-profiles): Don't set PATH.
	(all-local, install-local): Depend on TEST_SUPPORT_FILES too.
	(test-support-files): Move creation of _tmpinst/bin directory ...
	(test-support-file, $(tmpinst)/bin/mono): ... here.
	($(tmpinst)/bin/mbas, $(tmpinst)/bin/pedump): Remove.

In mono/tests:
	* Makefile.am (test-bug-80307): Don't set PATH.

svn path=/trunk/mono/; revision=75067
  • Loading branch information...
1 parent 3e0014c commit 300aa9de015784d08efacae4abb61852cbdf1e50 @harinath harinath committed Mar 28, 2007
Showing with 27 additions and 24 deletions.
  1. +10 −0 ChangeLog
  2. +4 −0 mono/tests/ChangeLog
  3. +2 −2 mono/tests/Makefile.am
  4. +9 −21 runtime/Makefile.am
  5. +2 −1 runtime/mono-wrapper.in
View
10 ChangeLog
@@ -1,3 +1,13 @@
+2007-03-28 Raja R Harinath <rharinath@novell.com>
+
+ * runtime/mono-wrapper.in (PATH): Include _tmpinst/bin. Ensure
+ that library invocations of 'mcs' and 'gmcs' pick the in-tree versions.
+ * runtime/Makefile.am (mcs-do-run-test-profiles): Don't set PATH.
+ (all-local, install-local): Depend on TEST_SUPPORT_FILES too.
+ (test-support-files): Move creation of _tmpinst/bin directory ...
+ (test-support-file, $(tmpinst)/bin/mono): ... here.
+ ($(tmpinst)/bin/mbas, $(tmpinst)/bin/pedump): Remove.
+
2007-03-22 Marek Habersack <mhabersack@novell.com>
* data/net_2_0/machine.config: added a few missing sections, added
View
4 mono/tests/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-28 Raja R Harinath <rharinath@novell.com>
+
+ * Makefile.am (test-bug-80307): Don't set PATH.
+
2007-03-27 Raja R Harinath <harinath@gmail.com>
* Makefile.am (JITTEST_PROG_RUN): Set MONO_CFG_DIR too.
View
4 mono/tests/Makefile.am
@@ -501,10 +501,10 @@ EXTRA_DIST += bug-80307.cs
bug-80307.exe: $(srcdir)/bug-80307.cs
$(MCS) -r:System.Web -out:$@ $(srcdir)/bug-80307.cs
-# use helper 'mcs' and 'gmcs' from $(top_builddir)/runtime/_tmpinst
+# We use 'test-support-files' to handle an ordering issue between the 'mono/' and 'runtime/' directories
test-bug-80307: bug-80307.exe
cd $(top_builddir)/runtime && $(MAKE) test-support-files
- PATH="$(mono_build_root)/runtime/_tmpinst/bin:$$PATH" $(RUNTIME) bug-80307.exe
+ $(RUNTIME) bug-80307.exe
# Useful if mono is compiled with --enable-shared=no
patch-libtool:
View
30 runtime/Makefile.am
@@ -27,15 +27,15 @@ endif
if BUILD_MCS
# The write check is to foil 'make distcheck'
-all-local: $(SUPPORT_FILES)
+all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
# override automake
install: install-exec install-data
# override automake
-install-exec: $(SUPPORT_FILES)
+install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
# override automake
@@ -54,11 +54,7 @@ clean-local:
endif BUILD_MCS
-if INSTALL_2_0
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
-else
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm
-endif
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
# now a misnomer, but it'll go away soon enough.
if ENABLE_NUNIT_TESTS
@@ -71,7 +67,6 @@ mcs-do-test-profiles:
cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles
mcs-do-run-test-profiles: test-support-files
- d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \
cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles
if PLATFORM_WIN32
@@ -110,34 +105,27 @@ etc/mono/config: ../data/config Makefile $(symlinks)
mv -f $@t $@
$(tmpinst)/bin/mono: mono-wrapper etc/mono/config
+ $(mkinstalldirs) $(tmpinst)/bin
cp mono-wrapper $@
$(tmpinst)/bin/mcs:
$(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe
-$(tmpinst)/bin/mbas:
- $(MAKE) test-support-file target=$@ file=mbas/mbas.exe
-
$(tmpinst)/bin/gmcs:
$(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe
$(tmpinst)/bin/ilasm:
$(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe
-test-support-files:
- $(mkinstalldirs) $(tmpinst)/bin
- $(MAKE) $(TEST_SUPPORT_FILES)
+test-support-files: $(TEST_SUPPORT_FILES)
+ @:
-test-support-file:
+test-support-file: $(tmpinst)/bin/mono
+ test -n '$(target)$(file)'
echo '#! /bin/sh' > $(target)
- r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/mono-wrapper"'" "'"$$m/$(file)"'" "$$@"' >> $(target)
+ r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/$(file)"'" "$$@"' >> $(target)
chmod +x $(target)
-$(tmpinst)/bin/pedump: $(srcdir)/Makefile.am
- $(mkdir_p) $(@D)
- (b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@
- chmod +x $@
-
# the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
MYDISTFILES = $(DIST_COMMON)
distdir: $(MYDISTFILES)
View
3 runtime/mono-wrapper.in
@@ -1,6 +1,7 @@
#! /bin/sh
r='@mono_build_root@'
MONO_CFG_DIR='@mono_cfg_dir@'
+PATH="$r/runtime/_tmpinst/bin:$PATH"
MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR
+export MONO_CFG_DIR MONO_SHARED_DIR PATH
exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@"

0 comments on commit 300aa9d

Please sign in to comment.