From 10065f4006070ac9571e1bc06c863e42a73d192c Mon Sep 17 00:00:00 2001
From: Raja R Harinath <harinath@hurrynot.org>
Date: Fri, 3 Dec 2004 15:14:37 +0000
Subject: * 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
---
 runtime/Makefile.am | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'runtime')

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
 
-- 
cgit v1.2.3