diff options
| author | Melanie | 2011-10-25 03:26:27 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:26:27 +0100 |
| commit | 8131ad0fb61128ce1d4370f11e9bba5b32154a87 (patch) | |
| tree | 6fb01e663d12b8c7f6474d573591e75d1ffaef06 | |
| parent | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge (diff) | |
| parent | re-enable running linden udp tests in local.include, though no tests are curr... (diff) | |
| download | opensim-SC-8131ad0fb61128ce1d4370f11e9bba5b32154a87.zip opensim-SC-8131ad0fb61128ce1d4370f11e9bba5b32154a87.tar.gz opensim-SC-8131ad0fb61128ce1d4370f11e9bba5b32154a87.tar.bz2 opensim-SC-8131ad0fb61128ce1d4370f11e9bba5b32154a87.tar.xz | |
Merge commit '48295793b0d07579d9e31744ae6969df647f663c' into bigmerge
| -rw-r--r-- | .nant/local.include | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.nant/local.include b/.nant/local.include index 40224f9..955c2e5 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -303,12 +303,10 @@ | |||
| 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 | <!-- | ||
| 307 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> | 306 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> |
| 308 | <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> | 307 | <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> |
| 309 | <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" /> | 308 | <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" /> |
| 310 | </exec> | 309 | </exec> |
| 311 | --> | ||
| 312 | 310 | ||
| 313 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests"> | 311 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests"> |
| 314 | <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> | 312 | <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> |