diff options
| author | Jonathan Pryor <jpryor@novell.com> | 2009-05-14 07:06:32 +0400 |
|---|---|---|
| committer | Jonathan Pryor <jpryor@novell.com> | 2009-05-14 07:06:32 +0400 |
| commit | 8c22b25395fa38c5a4ba6dbccfe98d1136cd202d (patch) | |
| tree | f92659f6fe705642678cad9664c01acf0d341092 /mcs/class/System/Test | |
| parent | 03a497665b0e65d8c6adcc38527f59f2c4560bcc (diff) | |
* Makefile: $(test_lib).config needs to be profile-specific.
* Test/test-config-file: Revert the prior change, as this breaks 1.0
profile testing.
* Test/test-config-file-net-2.0: Added; config file to use when testing
under the .NET 2.0+ profile, for #502944.
svn path=/trunk/mcs/; revision=134099
Diffstat (limited to 'mcs/class/System/Test')
| -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 |
3 files changed, 42 insertions, 9 deletions
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> + |