Renaming existing 'torture' tests to 'performance' tests instead, since this better matches what they really do.
nant target name changes to test-perf instead of torture, to match test-stress still not run by defaultintegration
parent
1f88179a65
commit
adce58b33a
|
@ -146,14 +146,14 @@
|
||||||
<delete dir="%temp%"/>
|
<delete dir="%temp%"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="torture" depends="build, find-nunit">
|
<target name="test-perf" depends="build, find-nunit">
|
||||||
<setenv name="MONO_THREADS_PER_CPU" value="100" />
|
<setenv name="MONO_THREADS_PER_CPU" value="100" />
|
||||||
|
|
||||||
<exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture">
|
<exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.performance">
|
||||||
<arg value="./bin/OpenSim.Tests.Torture.dll" />
|
<arg value="./bin/OpenSim.Tests.Performance.dll" />
|
||||||
</exec>
|
</exec>
|
||||||
|
|
||||||
<fail message="Failures reported in torture tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" />
|
<fail message="Failures reported in performance tests." unless="${int::parse(testresult.opensim.tests.performance)==0}" />
|
||||||
<delete dir="%temp%"/>
|
<delete dir="%temp%"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
|
@ -47,10 +47,10 @@ using OpenSim.Services.AvatarService;
|
||||||
using OpenSim.Tests.Common;
|
using OpenSim.Tests.Common;
|
||||||
using OpenSim.Tests.Common.Mock;
|
using OpenSim.Tests.Common.Mock;
|
||||||
|
|
||||||
namespace OpenSim.Tests.Torture
|
namespace OpenSim.Tests.Performance
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// NPC torture tests
|
/// NPC performance tests
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
|
/// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
|
||||||
|
@ -58,7 +58,7 @@ namespace OpenSim.Tests.Torture
|
||||||
/// earlier tests.
|
/// earlier tests.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class NPCTortureTests
|
public class NPCPerformanceTests
|
||||||
{
|
{
|
||||||
private TestScene scene;
|
private TestScene scene;
|
||||||
private AvatarFactoryModule afm;
|
private AvatarFactoryModule afm;
|
|
@ -36,10 +36,10 @@ using OpenSim.Region.Framework.Scenes;
|
||||||
using OpenSim.Tests.Common;
|
using OpenSim.Tests.Common;
|
||||||
using OpenSim.Tests.Common.Mock;
|
using OpenSim.Tests.Common.Mock;
|
||||||
|
|
||||||
namespace OpenSim.Tests.Torture
|
namespace OpenSim.Tests.Performance
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Object torture tests
|
/// Object performance tests
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
|
/// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
|
||||||
|
@ -47,7 +47,7 @@ namespace OpenSim.Tests.Torture
|
||||||
/// earlier tests.
|
/// earlier tests.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class ObjectTortureTests
|
public class ObjectPerformanceTests
|
||||||
{
|
{
|
||||||
[TearDown]
|
[TearDown]
|
||||||
public void TearDown()
|
public void TearDown()
|
|
@ -42,10 +42,10 @@ using OpenSim.Region.ScriptEngine.XEngine;
|
||||||
using OpenSim.Tests.Common;
|
using OpenSim.Tests.Common;
|
||||||
using OpenSim.Tests.Common.Mock;
|
using OpenSim.Tests.Common.Mock;
|
||||||
|
|
||||||
namespace OpenSim.Tests.Torture
|
namespace OpenSim.Tests.Performance
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Script torture tests
|
/// Script performance tests
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
|
/// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
|
||||||
|
@ -53,7 +53,7 @@ namespace OpenSim.Tests.Torture
|
||||||
/// earlier tests.
|
/// earlier tests.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class ScriptTortureTests
|
public class ScriptPerformanceTests
|
||||||
{
|
{
|
||||||
private TestScene m_scene;
|
private TestScene m_scene;
|
||||||
private XEngine m_xEngine;
|
private XEngine m_xEngine;
|
|
@ -3290,7 +3290,7 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Tests.Torture" path="OpenSim/Tests/Torture" type="Library">
|
<Project frameworkVersion="v3_5" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
<OutputPath>../../../bin/</OutputPath>
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
|
Loading…
Reference in New Issue