2005-01-31 Sebastien Pouliot <sebastien@ximian.com>

	* library.make: Exclude CAS category when running unit tests with
	Mono (they can be run manually using --security). Added a define
	for WINDOWS (only on Windows) to be used for declarative security
	attributes ONLY.

svn path=/trunk/mcs/; revision=39838

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 4698e0a422f5e5125f176e5442ce798c6acb776d..048a94cd9ad88e87ffd0dd1235899dc5fea0f0d0 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-31  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * library.make: Exclude CAS category when running unit tests with 
+       Mono (they can be run manually using --security). Added a define
+       for WINDOWS (only on Windows) to be used for declarative security
+       attributes ONLY.
+
 2005-01-24  Raja R Harinath  <rharinath@novell.com>
 
        * library.make (run-test-lib, run-test-ondotnet-lib): Print out

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 6ddcfcbff645a11a614e251034ed5f0e2979a928..7d192b0fa59d20d409b7d77e2d640e796e7e0dfe 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -92,6 +92,7 @@ libdir = $(prefix)/lib
 ifeq ($(PLATFORM), win32)
 GACDIR = `cygpath -w $(libdir)`
 GACROOT = `cygpath -w $(DESTDIR)$(libdir)`
+test_flags += -d:WINDOWS
 else
 GACDIR = $(libdir)
 GACROOT = $(DESTDIR)$(libdir)
@@ -171,7 +172,7 @@ run-test-ondotnet-local: run-test-ondotnet-lib
 ## FIXME: i18n problem in the 'sed' command below
 run-test-lib: test-local
        ok=:; \
-       $(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) /output:TestResult-$(PROFILE).log /exclude:NotWorking,ValueAdd /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
+       $(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) /output:TestResult-$(PROFILE).log /exclude:NotWorking,ValueAdd,CAS /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
        sed '1,/^Tests run: /d' TestResult-$(PROFILE).log; \
        $$ok