* 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

diff --git a/ChangeLog b/ChangeLog
index dac021becf73559009ea1cd30ceaa7742f055d1c..e64dbf421c6b2df87fc47965b72a5196161022f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/configure.in b/configure.in
index ea8bb4dbacafa190ccd95c0bc2f7f8d7acf02a0f..36c54bde6bf5bb922c335613c4295edf95146c49 100644 (file)
--- 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 1944612be0706dcabeb4244ff329265633d619d8..df54e44b83e0b820bc4f0cf0d866de93c9dae01c 100644 (file)
--- 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