diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /.nant | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | .nant/local.include | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/.nant/local.include b/.nant/local.include index 7663748..7b7aaf5 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
@@ -113,10 +113,12 @@ | |||
113 | </exec> | 113 | </exec> |
114 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> | 114 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> |
115 | 115 | ||
116 | <!-- | ||
116 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.optionalmodules.tests"> | 117 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.optionalmodules.tests"> |
117 | <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> | 118 | <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> |
118 | </exec> | 119 | </exec> |
119 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> | 120 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> |
121 | --> | ||
120 | 122 | ||
121 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.framework.tests"> | 123 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.framework.tests"> |
122 | <arg value="./bin/OpenSim.Region.Framework.Tests.dll" /> | 124 | <arg value="./bin/OpenSim.Region.Framework.Tests.dll" /> |
@@ -143,7 +145,12 @@ | |||
143 | </exec> | 145 | </exec> |
144 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> | 146 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> |
145 | 147 | ||
146 | <delete dir="%temp%"/> | 148 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions"> |
149 | <arg value="./bin/OpenSim.Tests.Permissions.dll" /> | ||
150 | </exec> | ||
151 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> | ||
152 | |||
153 | <delete dir="%temp%"/> | ||
147 | </target> | 154 | </target> |
148 | 155 | ||
149 | <target name="test-stress" depends="build, find-nunit"> | 156 | <target name="test-stress" depends="build, find-nunit"> |
@@ -226,10 +233,12 @@ | |||
226 | <arg value="-xml=test-results/OpenSim.Region.CoreModules.Tests.dll-Results.xml" /> | 233 | <arg value="-xml=test-results/OpenSim.Region.CoreModules.Tests.dll-Results.xml" /> |
227 | </exec> | 234 | </exec> |
228 | 235 | ||
236 | <!-- | ||
229 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.optionalmodules.tests"> | 237 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.optionalmodules.tests"> |
230 | <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> | 238 | <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> |
231 | <arg value="-xml=test-results/OpenSim.Region.OptionalModules.Tests.dll-Results.xml" /> | 239 | <arg value="-xml=test-results/OpenSim.Region.OptionalModules.Tests.dll-Results.xml" /> |
232 | </exec> | 240 | </exec> |
241 | --> | ||
233 | 242 | ||
234 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests"> | 243 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests"> |
235 | <arg value="./bin/OpenSim.Region.Framework.Tests.dll" /> | 244 | <arg value="./bin/OpenSim.Region.Framework.Tests.dll" /> |
@@ -256,17 +265,23 @@ | |||
256 | <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" /> | 265 | <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" /> |
257 | </exec> | 266 | </exec> |
258 | 267 | ||
268 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions"> | ||
269 | <arg value="./bin/OpenSim.Tests.Permissions.dll" /> | ||
270 | <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" /> | ||
271 | </exec> | ||
272 | |||
259 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> | 273 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> |
260 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> | 274 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> |
261 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> | 275 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> |
262 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> | 276 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> |
263 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> | 277 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> |
264 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> | 278 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> |
265 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> | 279 | <!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> --> |
266 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> | 280 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> |
267 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> | 281 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> |
268 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> | 282 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> |
269 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> | 283 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> |
284 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> | ||
270 | </target> | 285 | </target> |
271 | 286 | ||
272 | <target name="doxygen"> | 287 | <target name="doxygen"> |