Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

1 files changed, 15 insertions, 4 deletions

diff --git a/.nant/local.include b/.nant/local.include
index 6d3e972..35f0058 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -135,14 +135,25 @@
   <delete dir="%temp%"/>
 </target>
 
-<target name="torture" depends="build, find-nunit">
+<target name="test-stress" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
 
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture">
-    <arg value="./bin/OpenSim.Tests.Torture.dll" />
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.stress">
+    <arg value="./bin/OpenSim.Tests.Stress.dll" />
   </exec>
 
-  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> 
+  <fail message="Failures reported in stress tests." unless="${int::parse(testresult.opensim.tests.stress)==0}" /> 
+  <delete dir="%temp%"/>
+</target>
+
+<target name="test-perf" depends="build, find-nunit">
+  <setenv name="MONO_THREADS_PER_CPU" value="100" />
+
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.performance">
+    <arg value="./bin/OpenSim.Tests.Performance.dll" />
+  </exec>
+
+  <fail message="Failures reported in performance tests." unless="${int::parse(testresult.opensim.tests.performance)==0}" /> 
   <delete dir="%temp%"/>
 </target>