diff options
| author | Melanie | 2012-01-31 20:53:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-31 20:53:49 +0000 |
| commit | 1b63b21a4db192cdfb24748be523dd53bbba47a9 (patch) | |
| tree | a9c45afd55fb652e35c9a703560c7e35af2cdfa6 /.nant | |
| parent | Make parcel sale overlays work. No auction support. (diff) | |
| parent | Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl... (diff) | |
| download | opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.zip opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.gz opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.bz2 opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
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 0c23e50..4fa3e4d 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -111,6 +111,17 @@ | |||
| 111 | <delete dir="%temp%"/> | 111 | <delete dir="%temp%"/> |
| 112 | </target> | 112 | </target> |
| 113 | 113 | ||
| 114 | <target name="torture" depends="build, find-nunit"> | ||
| 115 | <setenv name="MONO_THREADS_PER_CPU" value="100" /> | ||
| 116 | |||
| 117 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture"> | ||
| 118 | <arg value="./bin/OpenSim.Tests.Torture.dll" /> | ||
| 119 | </exec> | ||
| 120 | |||
| 121 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> | ||
| 122 | <delete dir="%temp%"/> | ||
| 123 | </target> | ||
| 124 | |||
| 114 | <target name="find-nunit"> | 125 | <target name="find-nunit"> |
| 115 | <exec program="which" failonerror="false" | 126 | <exec program="which" failonerror="false" |
| 116 | resultproperty="hasnunit2"> | 127 | resultproperty="hasnunit2"> |