diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Framework/Watchdog.cs
Diffstat (limited to '.nant/local.include')
| -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" /> |