remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
this allows the tests to pass on my local system0.6.9-post-fixes
parent
a160b44e07
commit
0524458069
|
@ -95,11 +95,6 @@
|
||||||
</exec>
|
</exec>
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
|
||||||
|
|
||||||
<exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.communications.tests">
|
|
||||||
<arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
|
|
||||||
</exec>
|
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
|
|
||||||
|
|
||||||
<exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests">
|
<exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests">
|
||||||
<arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
|
<arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
|
||||||
</exec>
|
</exec>
|
||||||
|
@ -160,17 +155,6 @@
|
||||||
<arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
|
<arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
|
||||||
</exec>
|
</exec>
|
||||||
|
|
||||||
<exec program="mono">
|
|
||||||
<arg value="--debug" />
|
|
||||||
<arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Communications.cov,+[OpenSim.Framework.Communications]" />
|
|
||||||
<arg value="/usr/lib/nunit/nunit-console.exe" />
|
|
||||||
<arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
|
|
||||||
</exec>
|
|
||||||
<delete dir="./cov/OpenSim.Framework.Communications" />
|
|
||||||
<exec program="monocov">
|
|
||||||
<arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" />
|
|
||||||
</exec>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
<exec program="mono">
|
<exec program="mono">
|
||||||
<arg value="--debug" />
|
<arg value="--debug" />
|
||||||
|
@ -281,11 +265,6 @@
|
||||||
<arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
|
<arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
|
||||||
</exec>
|
</exec>
|
||||||
|
|
||||||
<exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
|
|
||||||
<arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
|
|
||||||
<arg value="-xml=test-results/OpenSim.Framework.Communications.Tests.dll-Results.xml" />
|
|
||||||
</exec>
|
|
||||||
|
|
||||||
<exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests">
|
<exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests">
|
||||||
<arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" />
|
<arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" />
|
||||||
<arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" />
|
<arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" />
|
||||||
|
@ -355,7 +334,6 @@
|
||||||
<!-- <test> -->
|
<!-- <test> -->
|
||||||
<!-- <assemblies> -->
|
<!-- <assemblies> -->
|
||||||
<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
|
<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
|
||||||
<!-- <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> -->
|
|
||||||
<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
|
<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
|
||||||
<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
|
<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
|
||||||
<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> -->
|
<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> -->
|
||||||
|
|
|
@ -98,6 +98,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector
|
public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector
|
||||||
{
|
{
|
||||||
|
/// <value>
|
||||||
|
/// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets).
|
||||||
|
/// </value>
|
||||||
|
protected int m_debugPacketLevel = 0;
|
||||||
|
|
||||||
#region Events
|
#region Events
|
||||||
|
|
||||||
public event GenericMessage OnGenericMessage;
|
public event GenericMessage OnGenericMessage;
|
||||||
|
@ -490,6 +495,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
public void SetDebugPacketLevel(int newDebug)
|
public void SetDebugPacketLevel(int newDebug)
|
||||||
{
|
{
|
||||||
|
m_debugPacketLevel = newDebug;
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Client Methods
|
#region Client Methods
|
||||||
|
@ -11080,7 +11086,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length);
|
LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length);
|
||||||
#endregion BinaryStats
|
#endregion BinaryStats
|
||||||
|
|
||||||
m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true);
|
OutPacket(packet, throttlePacketType, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -11093,6 +11099,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
/// handles splitting manually</param>
|
/// handles splitting manually</param>
|
||||||
protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
|
protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
|
||||||
{
|
{
|
||||||
|
if (m_debugPacketLevel >= 255)
|
||||||
|
m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type);
|
||||||
|
|
||||||
m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
|
m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11164,10 +11173,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
/// <param name="Pack">OpenMetaverse.packet</param>
|
/// <param name="Pack">OpenMetaverse.packet</param>
|
||||||
public void ProcessInPacket(Packet Pack)
|
public void ProcessInPacket(Packet Pack)
|
||||||
{
|
{
|
||||||
// m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack);
|
if (m_debugPacketLevel >= 255)
|
||||||
|
m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type);
|
||||||
|
|
||||||
if (!ProcessPacketMethod(Pack))
|
if (!ProcessPacketMethod(Pack))
|
||||||
m_log.Warn("[CLIENT]: unhandled packet " + Pack);
|
m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type);
|
||||||
|
|
||||||
PacketPool.Instance.ReturnPacket(Pack);
|
PacketPool.Instance.ReturnPacket(Pack);
|
||||||
}
|
}
|
||||||
|
|
|
@ -422,7 +422,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
if (!scenePresence.IsChildAgent)
|
if (!scenePresence.IsChildAgent)
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
|
m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
|
||||||
scenePresence.Firstname,
|
scenePresence.Firstname,
|
||||||
scenePresence.Lastname,
|
scenePresence.Lastname,
|
||||||
newDebug);
|
newDebug);
|
||||||
|
|
Loading…
Reference in New Issue