diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-12-03 18:14:37 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-12-03 18:14:37 +0300 |
| commit | 10065f4006070ac9571e1bc06c863e42a73d192c (patch) | |
| tree | a1ee1954606dffd842df27a0b899ebe53949f219 | |
| parent | ebd4a7df44504aff5e034edb6765eb4042a7480d (diff) | |
* configure.in (ENABLE_NUNIT_TESTS): New.
* runtime/Makefile.am (check-local): Use it to disable nunit
tests. Ensure that the test dlls are always built, however.
svn path=/trunk/mono/; revision=37026
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | runtime/Makefile.am | 14 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index dac021becf7..e64dbf421c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-12-03 Raja R Harinath <rharinath@novell.com> + * configure.in (ENABLE_NUNIT_TESTS): New. + * runtime/Makefile.am (check-local): Use it to disable nunit + tests. Ensure that the test dlls are always built, however. + +2004-12-03 Raja R Harinath <rharinath@novell.com> + * Makefile.am (dist-hook): Ensure we use the 'default' profile. * mono/Makefile.am (HANDLES): New. Disable 'handles' dir on Win32. (SUBDIRS): Use it. Move 'cil' before 'metadata'. diff --git a/configure.in b/configure.in index ea8bb4dbaca..36c54bde6bf 100644 --- a/configure.in +++ b/configure.in @@ -1232,6 +1232,9 @@ fi AC_SUBST(ICU_CFLAGS) AC_SUBST(ICU_LIBS) +AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests Run the nunit tests of the class library on 'make check']) +AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes]) + TARGET="unknown" ACCESS_UNALIGNED="yes" diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 1944612be07..df54e44b83e 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -54,13 +54,25 @@ else TEST_SUPPORT_FILES = $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm endif -check-local: +if ENABLE_NUNIT_TESTS +test_select = +else +test_select = TEST_SUBDIRS='tests errors' +endif + +mcs-do-test-profiles: + d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' test-profiles + +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 ; \ rm -fr $(tmpinst) ; $$ret +check-local: mcs-do-test-profiles + $(MAKE) $(test_select) mcs-do-run-test-profiles + $(tmpinst)/bin/mcs: $(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe |