diff options
| author | Melanie | 2011-10-26 01:27:24 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-26 01:27:24 +0100 |
| commit | fd22159d0c7d7b149d35747cbaa436f3b1e6f579 (patch) | |
| tree | bbe8cdc63dd1f98346a6afb844f4b4d3caf336a8 /.nant | |
| parent | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge (diff) | |
| parent | Restart the event queue worker threads that I accidentally disabled earlier t... (diff) | |
| download | opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.zip opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.gz opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.bz2 opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Framework/Watchdog.cs
Diffstat (limited to '.nant')
| -rw-r--r-- | .nant/local.include | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.nant/local.include b/.nant/local.include index 955c2e5..698af3f 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -303,6 +303,11 @@ | |||
| 303 | <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" /> | 303 | <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" /> |
| 304 | </exec> | 304 | </exec> |
| 305 | 305 | ||
| 306 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindencaps.tests"> | ||
| 307 | <arg value="./bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll" /> | ||
| 308 | <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenCaps.Tests.dll-Results.xml" /> | ||
| 309 | </exec> | ||
| 310 | |||
| 306 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> | 311 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> |
| 307 | <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> | 312 | <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> |
| 308 | <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" /> | 313 | <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" /> |