Author: gert
Date: 2008-02-10 11:06:58 -0500 (Sun, 10 Feb 2008)
New Revision: 95386
Removed:
trunk/gert/standalone/bug79988/Assert.cs
Modified:
trunk/gert/standalone/bug79988/default.build
Log:
Use common build file.
Deleted: trunk/gert/standalone/bug79988/Assert.cs
===================================================================
--- trunk/gert/standalone/bug79988/Assert.cs 2008-02-10 15:45:44 UTC (rev
95385)
+++ trunk/gert/standalone/bug79988/Assert.cs 2008-02-10 16:06:58 UTC (rev
95386)
@@ -1,59 +0,0 @@
-using System;
-using System.Globalization;
-
-public class Assert
-{
- public static void AreEqual (string a, string b, string comment)
- {
- if (a != b) {
- throw new AssertException (string.Format
(CultureInfo.InvariantCulture,
- "Expected {0} but was {1}: {2}", a, b,
comment));
- }
- }
-
- public static void AreEqual (int a, int b, string comment)
- {
- if (a != b) {
- throw new AssertException (string.Format
(CultureInfo.InvariantCulture,
- "Expected {0} but was {1}: {2}", a, b,
comment));
- }
- }
-
- public static void IsTrue (bool value, string comment)
- {
- if (!value) {
- throw new AssertException (string.Format
(CultureInfo.InvariantCulture,
- "Value is not true: {0}", comment));
- }
- }
-
- public static void IsFalse (bool value, string comment)
- {
- if (value) {
- throw new AssertException (string.Format
(CultureInfo.InvariantCulture,
- "Value is not false: {0}", comment));
- }
- }
-
- public static void IsNull (object x, string comment)
- {
- if (x != null) {
- throw new AssertException ("Value is not null: " +
comment);
- }
- }
-
- public static void IsNotNull (object x, string comment)
- {
- if (x == null) {
- throw new AssertException ("Value is null: " + comment);
- }
- }
-}
-
-public class AssertException : Exception
-{
- public AssertException (string message)
- : base (message)
- {
- }
-}
Modified: trunk/gert/standalone/bug79988/default.build
===================================================================
--- trunk/gert/standalone/bug79988/default.build 2008-02-10 15:45:44 UTC
(rev 95385)
+++ trunk/gert/standalone/bug79988/default.build 2008-02-10 16:06:58 UTC
(rev 95386)
@@ -1,20 +1,6 @@
<project name="bug79988" 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>
-
+ <include buildfile="../../build/common.build" />
+
<property name="frameworks" value="mono-1.0,mono-2.0,net-1.1,net-2.0" />
<target name="clean">
@@ -26,26 +12,10 @@
</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">
- <call target="${nant.settings.currentframework}" />
+ <target name="compile" depends="init">
<csc target="exe" define="${csc.defines}" output="test.exe"
warnaserror="true" warninglevel="4">
<sources>
- <include name="Assert.cs" />
+ <include name="../../build/common/Assert.cs" />
<include name="SocketResponder.cs" />
<include name="test.cs" />
</sources>
@@ -55,10 +25,8 @@
</csc>
</target>
- <target name="run" depends="compile">
+ <target name="run-test" depends="compile">
<exec program="test.exe" managed="true" output="out" />
<fail if="${file::exists('out')}" />
</target>
-
- <target name="rebuild" depends="clean, build" />
</project>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
