From 14e407aff304a176bb5bd8bbca061ad0960f3fc1 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 8 Dec 2011 20:55:38 +0000
Subject: [PATCH] Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into
 the test suite

---
 .nant/local.include                                           | 4 +---
 .../Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.nant/local.include b/.nant/local.include
index 94f510f96f..a9ba17d8e8 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -117,12 +117,10 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindencaps.tests)==0}" /> 
 
-<!--
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
     <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> 
--->
 
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.scriptengine.tests">
     <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
@@ -351,7 +349,7 @@
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <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.servers.tests)==0}" /> 
-<!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> -->
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index e3b0eab121..c6a5b9859c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void TestAddClient()
         {
             TestHelpers.InMethod();
-            XmlConfigurator.Configure();
+//            XmlConfigurator.Configure();
 
             TestScene scene = SceneHelpers.SetupScene();
             uint myCircuitCode = 123456;