diff options
| -rw-r--r-- | mcs/class/System/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System/Makefile | 5 | ||||
| -rw-r--r-- | mcs/class/System/Test/ChangeLog | 7 | ||||
| -rw-r--r-- | mcs/class/System/Test/test-config-file | 9 | ||||
| -rw-r--r-- | mcs/class/System/Test/test-config-file-net-2.0 | 35 |
5 files changed, 51 insertions, 9 deletions
diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog index 3091a804316..7a9113a291d 100644 --- a/mcs/class/System/ChangeLog +++ b/mcs/class/System/ChangeLog @@ -1,3 +1,7 @@ +2009-05-13 Jonathan Pryor <jpryor@novell.com> + + * Makefile: $(test_lib).config needs to be profile-specific. + 2009-04-23 Sebastien Pouliot <sebastien@ximian.com> * net_2_1_raw_System.dll.sources: Remove some unneeded files. diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 71e19482e67..d21343ceff1 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -129,8 +129,13 @@ $(the_lib): $(CYCLIC_DEP_FILES) $(test_lib): $(test_lib).config $(TEST_RESOURCES) +ifeq (net_2_0, $(PROFILE)) +$(test_lib).config: Test/test-config-file-net-2.0 + cp $< $@ +else $(test_lib).config: Test/test-config-file cp $< $@ +endif CLEAN_FILES = $(test_lib).config diff --git a/mcs/class/System/Test/ChangeLog b/mcs/class/System/Test/ChangeLog index fd12e321456..173ca43ad03 100644 --- a/mcs/class/System/Test/ChangeLog +++ b/mcs/class/System/Test/ChangeLog @@ -1,3 +1,10 @@ +2009-05-14 Jonathan Pryor <jpryor@novell.com> + + * test-config-file: Revert the prior change, as this breaks 1.0 + profile testing. + * test-config-file-net-2.0: Added; config file to use when testing + under the .NET 2.0+ profile, for #502944. + 2009-05-12 Jonathan Pryor <jpryor@novell.com> * test-config-file: Add a /configuration/system.diagnostics/source diff --git a/mcs/class/System/Test/test-config-file b/mcs/class/System/Test/test-config-file index 03940481236..d2eea338663 100644 --- a/mcs/class/System/Test/test-config-file +++ b/mcs/class/System/Test/test-config-file @@ -1,15 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <system.diagnostics> - <sources> - <source name="source1" switchName="switch" switchType="System.Diagnostics.SourceSwitch"> - <!-- - <listeners> - <add name="console" type="System.Diagnostics.ConsoleTraceListener"/> - </listeners> - --> - </source> - </sources> <switches> <!-- Boolean switches: any non-zero value is true --> <add name="bool-true" value="1"/> diff --git a/mcs/class/System/Test/test-config-file-net-2.0 b/mcs/class/System/Test/test-config-file-net-2.0 new file mode 100644 index 00000000000..03940481236 --- /dev/null +++ b/mcs/class/System/Test/test-config-file-net-2.0 @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <system.diagnostics> + <sources> + <source name="source1" switchName="switch" switchType="System.Diagnostics.SourceSwitch"> + <!-- + <listeners> + <add name="console" type="System.Diagnostics.ConsoleTraceListener"/> + </listeners> + --> + </source> + </sources> + <switches> + <!-- Boolean switches: any non-zero value is true --> + <add name="bool-true" value="1"/> + <add name="bool-true-2" value="4"/> + <add name="bool-true-3" value="-2"/> + <add name="bool-false" value="0"/> + + <!-- trace switches: --> + <add name="trace-off" value="0"/> + <add name="trace-error" value="1"/> + <add name="trace-warning" value="2"/> + <add name="trace-info" value="3"/> + <add name="trace-verbose" value="4"/> + + <!-- custom switches: --> + <add name="custom-switch" value="42"/> + + <!-- this causes problems on .NET --> + <add name="trace-negative" value="-1"/> + </switches> + </system.diagnostics> +</configuration> + |