2006-04-27 Atsushi Enomoto <atsushi@ximian.com>

	* t16.exe.result
	  t17.exe.result
	  t18.exe.result : removed.
	* t32.cs
	  t32.exe.expected
	  t32.exe.config : new test from bug #77957.
	* Makefile : use diff --strip-trailing-cr instead of cmp so that
	  it works fine on windows.

	(added ChangeLog as well.)

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

diff --git a/mcs/class/System.Configuration/Test/standalone/ChangeLog b/mcs/class/System.Configuration/Test/standalone/ChangeLog
new file mode 100644 (file)
index 0000000..9637eba
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/standalone/ChangeLog
@@ -0,0 +1,10 @@
+2006-04-27  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * t16.exe.result
+         t17.exe.result
+         t18.exe.result : removed.
+       * t32.cs
+         t32.exe.expected
+         t32.exe.config : new test from bug #77957.
+       * Makefile : use diff --strip-trailing-cr instead of cmp so that
+         it works fine on windows.

diff --git a/mcs/class/System.Configuration/Test/standalone/Makefile b/mcs/class/System.Configuration/Test/standalone/Makefile
index 4a4ad17000a7b7f3c33c37f7af24529709d2742a..a5414f8377e2bdee07d1b72b821d311e3aefe946 100644 (file)
--- a/mcs/class/System.Configuration/Test/standalone/Makefile
+++ b/mcs/class/System.Configuration/Test/standalone/Makefile
@@ -1,17 +1,17 @@
-TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe t15.exe t16.exe t17.exe t18.exe t19.exe t20.exe t21.exe t22.exe t23.exe t24.exe t25.exe t26.exe t27.exe t28.exe t29.exe t30.exe t31.exe
+TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe t15.exe t16.exe t17.exe t18.exe t19.exe t20.exe t21.exe t22.exe t23.exe t24.exe t25.exe t26.exe t27.exe t28.exe t29.exe t30.exe t31.exe t32.exe
 
 check: local compare
 
 local: $(TESTS)
        @for i in $(TESTS); do \
                echo running test $$i; \
-               mono --debug $$i > $$i.result; \
+               MONO_PATH=../../../lib/net_2_0 mono --debug $$i > $$i.result; \
        done
 
 compare:
        @for i in $(TESTS); do \
                echo -n "$$i: "; \
-               if cmp $$i.expected $$i.result >/dev/null ; then echo "  OK"; else echo "  FAILED"; fi; \
+               if diff --strip-trailing-cr $$i.expected $$i.result >/dev/null ; then echo "  OK"; else echo "  FAILED"; fi; \
        done
 
 clean:

diff --git a/mcs/class/System.Configuration/Test/standalone/t16.exe.result b/mcs/class/System.Configuration/Test/standalone/t16.exe.result
deleted file mode 100644 (file)
index 9b0fc8b..0000000
--- a/mcs/class/System.Configuration/Test/standalone/t16.exe.result
+++ /dev/null
@@ -1,2 +0,0 @@
-aloha = aloha
-lockAttributes = 'file'

diff --git a/mcs/class/System.Configuration/Test/standalone/t17.exe.result b/mcs/class/System.Configuration/Test/standalone/t17.exe.result
deleted file mode 100644 (file)
index 04e07b2..0000000
--- a/mcs/class/System.Configuration/Test/standalone/t17.exe.result
+++ /dev/null
@@ -1,2 +0,0 @@
-aloha = aloha
-lockAllElementsExcept = 'add'

diff --git a/mcs/class/System.Configuration/Test/standalone/t18.exe.result b/mcs/class/System.Configuration/Test/standalone/t18.exe.result
deleted file mode 100644 (file)
index 76bdc5a..0000000
--- a/mcs/class/System.Configuration/Test/standalone/t18.exe.result
+++ /dev/null
@@ -1,2 +0,0 @@
-aloha = aloha
-lockElements = 'clear'

diff --git a/mcs/class/System.Configuration/Test/standalone/t32.cs b/mcs/class/System.Configuration/Test/standalone/t32.cs
new file mode 100644 (file)
index 0000000..637676f
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/standalone/t32.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Configuration;
+class TESt
+{
+       public static void Main ()
+       {
+               try {
+                       Configuration c = ConfigurationManager.OpenExeConfiguration (
+                               ConfigurationUserLevel.None);
+                       ApplicationSettingsGroup g = c.SectionGroups ["applicationSettings"]
+                               as ApplicationSettingsGroup;
+                       ConfigurationSection s = g.Sections ["test.Properties.Settings"];
+                       Console.WriteLine ("RequirePermission: {0}", s.SectionInformation.RequirePermission);
+               } catch (Exception e) {
+                       Console.WriteLine (e);
+               }
+       }
+}
+

diff --git a/mcs/class/System.Configuration/Test/standalone/t32.exe.config b/mcs/class/System.Configuration/Test/standalone/t32.exe.config
new file mode 100644 (file)
index 0000000..e0ec51e
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/standalone/t32.exe.config
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+       <!-- Register a section handler for the log4net section -->
+       <configSections>
+               <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+        <sectionGroup name="applicationSettings"
+type="System.Configuration.ApplicationSettingsGroup, System,
+Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+   <section name="test.Properties.Settings"
+type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </sectionGroup>
+ </configSections>
+       <!-- This section contains the log4net configuration settings -->       
+       <log4net>
+               <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+                       <layout type="log4net.Layout.PatternLayout">
+                               <conversionPattern value="%date [%thread] %-5level %logger
+(%property{log4net:HostName}) [%ndc] - %message%newline" />
+                       </layout>
+               </appender>
+               <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+                       <file value="test.log" />
+                       <appendToFile value="true" />
+                       <layout type="log4net.Layout.PatternLayout">
+                               <header value="FILE HEADER&#xD;&#xA;" />
+                               <footer value="FILE FOOTER&#xD;&#xA;" />
+                               <conversionPattern value="%date [%thread] %-5level %logger
+(%property{log4net:HostName}) [%ndc] - %message%newline" />
+                       </layout>
+               </appender>
+               <root>
+                       <level value="DEBUG" />
+                       <appender-ref ref="ConsoleAppender" />
+                       <appender-ref ref="LogFileAppender" />
+               </root>
+       </log4net>
+       <system.runtime.remoting>
+               <application name="Log4netRemotingServer">
+                       <!-- We need to define the remoting channels on which we will publish
+           the remote logging sink. -->
+                       <channels>
+                               <channel displayName="Server Channel" ref="tcp server" port="8085" />
+                       </channels>
+               </application>
+       </system.runtime.remoting>
+  <system.web>
+    <customErrors defaultRedirect="url" mode="Off">
+    </customErrors>
+  </system.web>
+ <applicationSettings>
+  <test.Properties.Settings>
+   <setting name="ConfigurationFile" serializeAs="String">
+    <value>config.xml</value>
+   </setting>
+   <setting name="ConfigurationSchema" serializeAs="String">
+    <value>config.xsd</value>
+   </setting>
+   <setting name="ConfigurationDirectory" serializeAs="String">
+    <value>..\Configuration</value>
+   </setting>
+  </test.Properties.Settings>
+ </applicationSettings>
+</configuration>
+

diff --git a/mcs/class/System.Configuration/Test/standalone/t32.exe.expected b/mcs/class/System.Configuration/Test/standalone/t32.exe.expected
new file mode 100644 (file)
index 0000000..318d58f
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/standalone/t32.exe.expected
@@ -0,0 +1 @@
+RequirePermission: False\r