diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '.nant/local.include')
| -rw-r--r-- | .nant/local.include | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/.nant/local.include b/.nant/local.include index 97353e0..0b6f9fe 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -127,15 +127,10 @@ | |||
| 127 | </exec> | 127 | </exec> |
| 128 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> | 128 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> |
| 129 | 129 | ||
| 130 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.data.sqlite.tests"> | 130 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.data.tests"> |
| 131 | <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" /> | 131 | <arg value="./bin/OpenSim.Data.Tests.dll" /> |
| 132 | </exec> | 132 | </exec> |
| 133 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" /> | 133 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> |
| 134 | |||
| 135 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.data.mysql.tests"> | ||
| 136 | <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" /> | ||
| 137 | </exec> | ||
| 138 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" /> | ||
| 139 | 134 | ||
| 140 | <delete dir="%temp%"/> | 135 | <delete dir="%temp%"/> |
| 141 | 136 | ||
| @@ -297,14 +292,9 @@ | |||
| 297 | <arg value="-xml=test-results/OpenSim.Region.Framework.Tests.dll-Results.xml" /> | 292 | <arg value="-xml=test-results/OpenSim.Region.Framework.Tests.dll-Results.xml" /> |
| 298 | </exec> | 293 | </exec> |
| 299 | 294 | ||
| 300 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests"> | 295 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.tests"> |
| 301 | <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" /> | 296 | <arg value="./bin/OpenSim.Data.Tests.dll" /> |
| 302 | <arg value="-xml=test-results/OpenSim.Data.SQLite.Tests.dll-Results.xml" /> | 297 | <arg value="-xml=test-results/OpenSim.Data.Tests.dll-Results.xml" /> |
| 303 | </exec> | ||
| 304 | |||
| 305 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests"> | ||
| 306 | <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" /> | ||
| 307 | <arg value="-xml=test-results/OpenSim.Data.MySQL.Tests.dll-Results.xml" /> | ||
| 308 | </exec> | 298 | </exec> |
| 309 | 299 | ||
| 310 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> | 300 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> |
| @@ -313,8 +303,7 @@ | |||
| 313 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> | 303 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> |
| 314 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> | 304 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> |
| 315 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> | 305 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> |
| 316 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" /> | 306 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> |
| 317 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" /> | ||
| 318 | 307 | ||
| 319 | </target> | 308 | </target> |
| 320 | <!-- <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> --> | 309 | <!-- <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> --> |