aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.nant
diff options
context:
space:
mode:
authorMelanie2009-10-09 17:23:18 +0100
committerMelanie2009-10-09 17:23:18 +0100
commit527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6 (patch)
tree1ecc6ce479e3041769112fec9805b11245880079 /.nant
parentSlow down the packet receiving code again after new reports of thread storms. (diff)
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.zip
opensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.gz
opensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.bz2
opensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to '.nant')
-rw-r--r--.nant/local.include14
1 files changed, 10 insertions, 4 deletions
diff --git a/.nant/local.include b/.nant/local.include
index f78c6a6..5e02665 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -58,10 +58,12 @@
58 </exec> 58 </exec>
59 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.serialization.tests)==0}" /> 59 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.serialization.tests)==0}" />
60 60
61<!--
61 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> 62 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
62 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 63 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
63 </exec> 64 </exec>
64 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> 65 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
66-->
65 67
66 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.scriptengine.tests"> 68 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.scriptengine.tests">
67 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> 69 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
@@ -115,16 +117,18 @@
115 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" /> 117 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" />
116 </exec> 118 </exec>
117 119
120<!--
118 <exec program="mono"> 121 <exec program="mono">
119 <arg value="--debug" /> 122 <arg value="&#45;&#45;debug" />
120 <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ClientStack.LindenUDP.cov,+[OpenSim.Region.ClientStack.LindenUDP]" /> 123 <arg value="&#45;&#45;profile=monocov:outfile=./cov/OpenSim.Region.ClientStack.LindenUDP.cov,+[OpenSim.Region.ClientStack.LindenUDP]" />
121 <arg value="/usr/lib/nunit/nunit-console.exe" /> 124 <arg value="/usr/lib/nunit/nunit-console.exe" />
122 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 125 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
123 </exec> 126 </exec>
124 <delete dir="./cov/OpenSim.Region.ClientStack.LindenUDP" /> 127 <delete dir="./cov/OpenSim.Region.ClientStack.LindenUDP" />
125 <exec program="monocov"> 128 <exec program="monocov">
126 <arg value="--export-html=./cov/OpenSim.Region.ClientStack.LindenUDP ./cov/OpenSim.Region.ClientStack.LindenUDP.cov" /> 129 <arg value="&#45;&#45;export-html=./cov/OpenSim.Region.ClientStack.LindenUDP ./cov/OpenSim.Region.ClientStack.LindenUDP.cov" />
127 </exec> 130 </exec>
131-->
128 132
129 <exec program="mono"> 133 <exec program="mono">
130 <arg value="--debug" /> 134 <arg value="--debug" />
@@ -238,10 +242,12 @@
238 <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" /> 242 <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" />
239 </exec> 243 </exec>
240 244
245<!--
241 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> 246 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
242 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 247 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
243 <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" /> 248 <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" />
244 </exec> 249 </exec>
250-->
245 251
246 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests"> 252 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests">
247 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> 253 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
@@ -271,7 +277,7 @@
271 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 277 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
272 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" /> 278 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
273 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 279 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />
274 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> 280<!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> -->
275 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 281 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" />
276 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 282 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" />
277 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 283 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />