diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-01-25 10:36:36 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-01-25 10:36:36 +0300 |
| commit | 48e77ed1ba98c3a6c8571a1a8e3e9ee06a19564c (patch) | |
| tree | 4edf598119d8bb57e0f6e827d809444de6dd83ab /runtime | |
| parent | fb6422403cc40a65b2b5d86eb9d7d1bf3cfd0ef6 (diff) | |
* runtime/Makefile.am ($(tmpinst)/config): New test support file.
Map 'MonoPosixHelper' to in-tree version.
($(tmpinst)/bin/mono): Use it.
(mcs-do-run-test-profiles): Use $(tmpinst)/bin/mono as the RUNTIME.
svn path=/trunk/mono/; revision=39474
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index d986e62b006..2c6b89640aa 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -54,9 +54,9 @@ clean-local: -rm -fr $(symlinks) $(tmpinst) .wapi if INSTALL_2_0 -TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs +TEST_SUPPORT_FILES = $(tmpinst)/config $(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 +TEST_SUPPORT_FILES = $(tmpinst)/config $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm endif # List of NUnit testcases that should be 100% pass @@ -86,14 +86,19 @@ mcs-do-run-test-profiles: $(mkinstalldirs) $(tmpinst)/bin $(MAKE) $(TEST_SUPPORT_FILES) d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \ - ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ + ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/$(tmpinst)/bin/mono PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ rm -fr $(tmpinst) ; $$ret check-local: mcs-do-test-profiles $(MAKE) $(test_select) mcs-do-run-test-profiles +$(tmpinst)/config: ../data/config + d=`cd ../support && pwd`; \ + sed 's,<configuration>,& <dllmap dll="MonoPosixHelper" target="'$$d/MonoPosixHelper.la'" />,' ../data/config > $@ + $(tmpinst)/bin/mono: mono-wrapper - cp mono-wrapper $@ + sed 's,/data/config",/runtime/$(tmpinst)/config",' mono-wrapper > $@ + chmod +x $@ $(tmpinst)/bin/mcs: $(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe |