diff options
| author | Melanie | 2012-11-22 03:17:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-22 03:17:33 +0000 |
| commit | c4c612175271d146f4afe133cdb42ca430df445b (patch) | |
| tree | 3b49ec8e0d8e2cfe2c514b620f34d941bfba5f3e /.nant | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | If an asset POST does not contain well-formed XML, return a 400 (Bad Request)... (diff) | |
| download | opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.zip opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.tar.gz opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.tar.bz2 opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '.nant')
| -rw-r--r-- | .nant/local.include | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/.nant/local.include b/.nant/local.include index 9c9aa28..5185717 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -132,6 +132,11 @@ | |||
| 132 | </exec> | 132 | </exec> |
| 133 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> | 133 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> |
| 134 | 134 | ||
| 135 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.server.handlers.tests"> | ||
| 136 | <arg value="./bin/OpenSim.Server.Handlers.Tests.dll" /> | ||
| 137 | </exec> | ||
| 138 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.server.handlers.tests)==0}" /> | ||
| 139 | |||
| 135 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.services.inventoryservice.tests"> | 140 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.services.inventoryservice.tests"> |
| 136 | <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" /> | 141 | <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" /> |
| 137 | </exec> | 142 | </exec> |
| @@ -240,6 +245,11 @@ | |||
| 240 | <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" /> | 245 | <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" /> |
| 241 | </exec> | 246 | </exec> |
| 242 | 247 | ||
| 248 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.server.handlers.tests"> | ||
| 249 | <arg value="./bin/OpenSim.Server.Handlers.Tests.dll" /> | ||
| 250 | <arg value="-xml=test-results/OpenSim.Server.Handlers.Tests.dll-Results.xml" /> | ||
| 251 | </exec> | ||
| 252 | |||
| 243 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.services.inventoryservice.tests"> | 253 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.services.inventoryservice.tests"> |
| 244 | <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" /> | 254 | <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" /> |
| 245 | <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" /> | 255 | <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" /> |