Author: gert
Date: 2008-02-10 15:53:16 -0500 (Sun, 10 Feb 2008)
New Revision: 95406
Modified:
trunk/gert/standalone/bug80715/default.build
Log:
Fixed test.
Modified: trunk/gert/standalone/bug80715/default.build
===================================================================
--- trunk/gert/standalone/bug80715/default.build 2008-02-10 20:30:02 UTC
(rev 95405)
+++ trunk/gert/standalone/bug80715/default.build 2008-02-10 20:53:16 UTC
(rev 95406)
@@ -1,21 +1,31 @@
<project name="bug80715" default="rebuild">
- <target name="mono-1.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,ONLY_1_1,MONO" />
+ <include buildfile="../../build/common.build" />
+
+ <target name="mono-1.0-init">
+ <property name="expected.error" value="CS0117" />
</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 name="mono-2.0-init">
+ <property name="expected.error" value="CS1061" />
</target>
- <target name="net-1.1">
- <property name="csc.defines" value="NET_1_0,NET_1_1,ONLY_1_1" />
+ <target name="mono-3.5-init">
+ <property name="expected.error" value="CS1061" />
</target>
- <target name="net-2.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" />
+ <target name="net-1.1-init">
+ <property name="expected.error" value="CS0117" />
</target>
- <property name="frameworks" value="mono-1.0,mono-2.0,net-1.1,net-2.0" />
+ <target name="net-2.0-init">
+ <property name="expected.error" value="CS0117" />
+ </target>
+
+ <target name="net-3.5-init">
+ <property name="expected.error" value="CS1061" />
+ </target>
+
+ <property name="frameworks"
value="mono-1.0,mono-2.0,mono-3.5,net-1.1,net-2.0,net-3.5" />
<target name="clean">
<delete>
@@ -26,22 +36,7 @@
</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">
+ <target name="run-test" depends="init">
<record action="Start" name="out" />
<csc target="exe" define="${csc.defines}" output="test.exe"
warnaserror="true" warninglevel="4" failonerror="false">
<sources>
@@ -52,8 +47,6 @@
<fail if="${file::exists('test.exe')}">#1</fail>
<loadfile file="out" property="csc.output" />
<fail
if="${string::index-of(csc.output,'NullReferenceException')!=-1}">#2</fail>
- <fail
if="${string::index-of(csc.output,'CS0117')==-1}">#3</fail>
+ <fail
if="${string::index-of(csc.output,expected.error)==-1}">#3</fail>
</target>
-
- <target name="rebuild" depends="clean, build" />
</project>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
