diff options
author | BlueWall | 2011-12-07 07:52:24 -0500 |
---|---|---|
committer | BlueWall | 2011-12-07 07:52:24 -0500 |
commit | 6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch) | |
tree | 6a71504761c3bfc1fedcf77d6c8467330e874fe1 /.nant | |
parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
parent | Stop accidentally setting up the UploadTexture caps handler with the same url... (diff) | |
download | opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2 opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.xz |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to '.nant')
-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"> --> |