diff options
| author | Melanie | 2011-12-06 19:01:05 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-06 19:01:05 +0000 |
| commit | 28da235888e6b7560d10784bf7ba8fd8298db6c0 (patch) | |
| tree | e56989ab4e96ef3d81de126498e85e7ac8ee6328 /.nant/local.include | |
| parent | Adapt GodsModule to core changes (diff) | |
| parent | Revert "Stop performing the asset save part of baked texture uploading on the... (diff) | |
| download | opensim-SC-28da235888e6b7560d10784bf7ba8fd8298db6c0.zip opensim-SC-28da235888e6b7560d10784bf7ba8fd8298db6c0.tar.gz opensim-SC-28da235888e6b7560d10784bf7ba8fd8298db6c0.tar.bz2 opensim-SC-28da235888e6b7560d10784bf7ba8fd8298db6c0.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to '.nant/local.include')
| -rw-r--r-- | .nant/local.include | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/.nant/local.include b/.nant/local.include index 698af3f..94f510f 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -149,6 +149,11 @@ | |||
| 149 | </exec> | 149 | </exec> |
| 150 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> | 150 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> |
| 151 | 151 | ||
| 152 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.capabilities.handlers.tests"> | ||
| 153 | <arg value="./bin/OpenSim.Capabilities.Handlers.Tests.dll" /> | ||
| 154 | </exec> | ||
| 155 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> | ||
| 156 | |||
| 152 | <delete dir="%temp%"/> | 157 | <delete dir="%temp%"/> |
| 153 | 158 | ||
| 154 | </target> | 159 | </target> |
| @@ -338,6 +343,11 @@ | |||
| 338 | <arg value="-xml=test-results/OpenSim.Data.Tests.dll-Results.xml" /> | 343 | <arg value="-xml=test-results/OpenSim.Data.Tests.dll-Results.xml" /> |
| 339 | </exec> | 344 | </exec> |
| 340 | 345 | ||
| 346 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.capabilities.handlers.tests"> | ||
| 347 | <arg value="./bin/OpenSim.Capabilities.Handlers.Tests.dll" /> | ||
| 348 | <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" /> | ||
| 349 | </exec> | ||
| 350 | |||
| 341 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> | 351 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> |
| 342 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> | 352 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> |
| 343 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> | 353 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> |
| @@ -347,6 +357,7 @@ | |||
| 347 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> | 357 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> |
| 348 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> | 358 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> |
| 349 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> | 359 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> |
| 360 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> | ||
| 350 | 361 | ||
| 351 | </target> | 362 | </target> |
| 352 | <!-- <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> --> | 363 | <!-- <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> --> |