Author: gert
Date: 2007-08-29 10:44:07 -0400 (Wed, 29 Aug 2007)
New Revision: 84999

Added:
   trunk/gert/standalone/bug82620/
   trunk/gert/standalone/bug82620/default.build
   trunk/gert/standalone/bug82620/test.cs
   trunk/gert/standalone/bug82622/
   trunk/gert/standalone/bug82622/default.build
   trunk/gert/standalone/bug82622/test.cs
Modified:
   trunk/gert/standalone/known-issues
Log:
Added test for bug #82620 and bug #82622.


Added: trunk/gert/standalone/bug82620/default.build
===================================================================
--- trunk/gert/standalone/bug82620/default.build        2007-08-29 14:02:54 UTC 
(rev 84998)
+++ trunk/gert/standalone/bug82620/default.build        2007-08-29 14:44:07 UTC 
(rev 84999)
@@ -0,0 +1,61 @@
+<project name="bug82620" default="rebuild">
+       <target name="mono-1.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,ONLY_1_1,MONO" />
+       </target>
+
+       <target name="mono-2.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0,MONO" />
+       </target>
+
+       <target name="net-1.1">
+               <property name="csc.defines" value="NET_1_0,NET_1_1,ONLY_1_1" />
+       </target>
+
+       <target name="net-2.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" />
+       </target>
+
+       <property name="frameworks" value="mono-1.0,mono-2.0,net-1.1,net-2.0" />
+
+       <target name="clean">
+               <delete>
+                       <fileset>
+                               <include name="out" />
+                               <include name="test.exe" />
+                       </fileset>
+               </delete>
+       </target>
+
+       <target name="build">
+               <property name="original.targetframework" 
value="${nant.settings.currentframework}" />
+
+               <foreach property="framework" item="String" in="${frameworks}" 
delim=",">
+                       <if test="${framework::exists(framework)}">
+                               <property name="nant.settings.currentframework" 
value="${framework}" />
+                               <call 
target="${nant.settings.currentframework}" />
+                               <call target="run" />
+                               <call target="clean" />
+                       </if>
+               </foreach>
+
+               <property name="nant.settings.currentframework" 
value="${original.targetframework}" />
+       </target>
+
+       <target name="compile">
+               <csc target="exe" define="${csc.defines}" output="test.exe" 
warnaserror="true" warninglevel="4">
+                       <sources>
+                               <include name="test.cs" />
+                       </sources>
+                       <references>
+                               <include name="System.Data.dll" />
+                       </references>
+               </csc>
+       </target>
+
+       <target name="run" depends="compile">
+               <exec program="test.exe" managed="true" output="out" />
+               <fail if="${file::exists('out')}" />
+       </target>
+
+       <target name="rebuild" depends="clean, build" />
+</project>


Property changes on: trunk/gert/standalone/bug82620/default.build
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/gert/standalone/bug82620/test.cs
===================================================================
--- trunk/gert/standalone/bug82620/test.cs      2007-08-29 14:02:54 UTC (rev 
84998)
+++ trunk/gert/standalone/bug82620/test.cs      2007-08-29 14:44:07 UTC (rev 
84999)
@@ -0,0 +1,14 @@
+using System;
+using System.Data;
+
+public class Test
+{
+       public static void Main ()
+       {
+               DataTable table = new DataTable ("Appointments");
+               DataRow row;
+               DataTable raw = new DataTable ();
+               row = table.NewRow ();
+               row ["provider"] += " (" + raw.Rows [0] ["ProvAbbr"].ToString 
() + ")";
+       }
+}


Property changes on: trunk/gert/standalone/bug82620/test.cs
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/gert/standalone/bug82622/default.build
===================================================================
--- trunk/gert/standalone/bug82622/default.build        2007-08-29 14:02:54 UTC 
(rev 84998)
+++ trunk/gert/standalone/bug82622/default.build        2007-08-29 14:44:07 UTC 
(rev 84999)
@@ -0,0 +1,62 @@
+<project name="bug82622" default="rebuild">
+       <target name="mono-1.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,ONLY_1_1,MONO" />
+       </target>
+
+       <target name="mono-2.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0,MONO" />
+       </target>
+
+       <target name="net-1.1">
+               <property name="csc.defines" value="NET_1_0,NET_1_1,ONLY_1_1" />
+       </target>
+
+       <target name="net-2.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" />
+       </target>
+
+       <property name="frameworks" value="mono-1.0,mono-2.0,net-1.1,net-2.0" />
+
+       <target name="clean">
+               <delete>
+                       <fileset>
+                               <include name="out" />
+                               <include name="test.exe" />
+                       </fileset>
+               </delete>
+       </target>
+
+       <target name="build">
+               <property name="original.targetframework" 
value="${nant.settings.currentframework}" />
+
+               <foreach property="framework" item="String" in="${frameworks}" 
delim=",">
+                       <if test="${framework::exists(framework)}">
+                               <property name="nant.settings.currentframework" 
value="${framework}" />
+                               <call 
target="${nant.settings.currentframework}" />
+                               <call target="compile" />
+                               <call target="clean" />
+                       </if>
+               </foreach>
+
+               <property name="nant.settings.currentframework" 
value="${original.targetframework}" />
+       </target>
+
+       <target name="compile">
+               <record name="out" action="Start" />
+               <csc target="exe" define="${csc.defines}" output="test.exe" 
warnaserror="true" warninglevel="4" failonerror="false">
+                       <sources>
+                               <include name="test.cs" />
+                       </sources>
+               </csc>
+               <record name="out" action="Close" />
+               <fail if="${file::exists('test.exe')}">#1</fail>
+               <fail unless="${file::exists('out')}">#2</fail>
+               <loadfile file="out" property="out" />
+               <fail if="${string::index-of(out,'error CS0029: Cannot 
implicitly convert type ''void'' to ''object''') == -1}">#3</fail>
+               <fail if="${string::index-of(out,'error CS0127: Since 
''Test.Run(string)'' returns void, a return keyword must not be followed by an 
object expression') == -1}">#4</fail>
+               <fail if="${string::index-of(out,'NullReferenceException') != 
-1}">#5</fail>
+               <fail if="${string::index-of(out,'Mono') != -1}">#6</fail>
+       </target>
+
+       <target name="rebuild" depends="clean, build" />
+</project>


Property changes on: trunk/gert/standalone/bug82622/default.build
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/gert/standalone/bug82622/test.cs
===================================================================
--- trunk/gert/standalone/bug82622/test.cs      2007-08-29 14:02:54 UTC (rev 
84998)
+++ trunk/gert/standalone/bug82622/test.cs      2007-08-29 14:44:07 UTC (rev 
84999)
@@ -0,0 +1,16 @@
+using System;
+using System.Collections;
+
+public class Test
+{
+       static void Main ()
+       {
+               Hashtable ht = new Hashtable ();
+               ht ["a"] = Run ("Appointments");
+       }
+
+       public static void Run (string unit)
+       {
+               return null;
+       }
+}


Property changes on: trunk/gert/standalone/bug82622/test.cs
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/gert/standalone/known-issues
===================================================================
--- trunk/gert/standalone/known-issues  2007-08-29 14:02:54 UTC (rev 84998)
+++ trunk/gert/standalone/known-issues  2007-08-29 14:44:07 UTC (rev 84999)
@@ -78,3 +78,4 @@
 bug82550/**
 bug82595/**
 bug82616/**
+bug82620/**

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to