aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.nant/local.include
diff options
context:
space:
mode:
authorMelanie2012-11-17 02:03:24 +0000
committerMelanie2012-11-17 02:03:24 +0000
commite4659a83f15acc85a7207a1ff60460cae0b86b78 (patch)
treed0fc79b1cbdb15ce9296f05aacf696c9ad43bc41 /.nant/local.include
parentMerge branch 'master' into careminster (diff)
parentRemove old InventoryService, which has for a long time been replaced by XInve... (diff)
downloadopensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.zip
opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.gz
opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.bz2
opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '.nant/local.include')
-rw-r--r--.nant/local.include11
1 files changed, 11 insertions, 0 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 35f0058..9c9aa28 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.services.inventoryservice.tests">
136 <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" />
137 </exec>
138 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" />
139
135 <delete dir="%temp%"/> 140 <delete dir="%temp%"/>
136</target> 141</target>
137 142
@@ -235,6 +240,11 @@
235 <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" /> 240 <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" />
236 </exec> 241 </exec>
237 242
243 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.services.inventoryservice.tests">
244 <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" />
245 <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
246 </exec>
247
238 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 248 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" />
239 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 249 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
240 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 250 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />
@@ -245,6 +255,7 @@
245 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 255 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />
246 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 256 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" />
247 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 257 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" />
258 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" />
248</target> 259</target>
249 260
250<target name="doxygen"> 261<target name="doxygen">