aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-09 15:57:53 +0000
committerJustin Clarke Casey2009-02-09 15:57:53 +0000
commitf95b8b386321be6b8fc51f3321ce1ff00395a13b (patch)
tree42f8d6da898b9d6b212ecc2ba53c5e54895d4506
parent* Fixing refactoring +1 (Fixes Mantis #3113) (diff)
downloadopensim-SC_OLD-f95b8b386321be6b8fc51f3321ce1ff00395a13b.zip
opensim-SC_OLD-f95b8b386321be6b8fc51f3321ce1ff00395a13b.tar.gz
opensim-SC_OLD-f95b8b386321be6b8fc51f3321ce1ff00395a13b.tar.bz2
opensim-SC_OLD-f95b8b386321be6b8fc51f3321ce1ff00395a13b.tar.xz
* Reinstate tests that are now in CoreModules
-rw-r--r--.nant/bamboo.build1
-rw-r--r--.nant/local.include2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs1
-rw-r--r--prebuild.xml58
4 files changed, 61 insertions, 1 deletions
diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 196d04f..c8756f8 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -42,6 +42,7 @@
42 <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll"/> 42 <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll"/>
43 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll"/> 43 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll"/>
44 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll"/> 44 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll"/>
45 <include name="../bin/OpenSim.Region.CoreModules.Tests.dll"/>
45 <include name="../bin/OpenSim.Region.Environment.Tests.dll"/> 46 <include name="../bin/OpenSim.Region.Environment.Tests.dll"/>
46 <include name="../bin/OpenSim.Region.Framework.Tests.dll"/> 47 <include name="../bin/OpenSim.Region.Framework.Tests.dll"/>
47 <include name="../bin/OpenSim.Data.SQLite.Tests.dll"/> 48 <include name="../bin/OpenSim.Data.SQLite.Tests.dll"/>
diff --git a/.nant/local.include b/.nant/local.include
index 41e0742..d2a8c7c 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -41,6 +41,7 @@
41 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 41 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
42 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 42 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
43 <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> 43 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
44 <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
44 <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> 45 <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
45 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 46 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
46 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> 47 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" />
@@ -168,6 +169,7 @@
168 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 169 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
169 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 170 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
170 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 171 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
172 <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
171 <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> 173 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
172 <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> 174 <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
173 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 175 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index f0587bb..df553ac 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.CoreModules.Agent.TextureSender;
34using OpenSim.Tests.Common.Mock; 35using OpenSim.Tests.Common.Mock;
35 36
36namespace OpenSim.Region.CoreModules.Agent.TextureSender 37namespace OpenSim.Region.CoreModules.Agent.TextureSender
diff --git a/prebuild.xml b/prebuild.xml
index 8031b46..0cdb59e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2608,6 +2608,63 @@
2608 </Files> 2608 </Files>
2609 </Project> 2609 </Project>
2610 2610
2611 <Project name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
2612 <Configuration name="Debug">
2613 <Options>
2614 <OutputPath>../../../bin/</OutputPath>
2615 </Options>
2616 </Configuration>
2617 <Configuration name="Release">
2618 <Options>
2619 <OutputPath>../../../bin/</OutputPath>
2620 </Options>
2621 </Configuration>
2622
2623 <ReferencePath>../../../bin/</ReferencePath>
2624 <Reference name="System" localCopy="false"/>
2625 <Reference name="System.Xml"/>
2626 <Reference name="System.Drawing"/>
2627 <Reference name="System.Runtime.Remoting"/>
2628 <Reference name="OpenMetaverseTypes.dll"/>
2629 <Reference name="OpenMetaverse.dll"/>
2630 <Reference name="OpenSim.Data"/>
2631 <Reference name="OpenSim.Framework"/>
2632 <Reference name="OpenSim.Framework.Communications"/>
2633 <Reference name="OpenSim.Framework.Console"/>
2634 <Reference name="OpenSim.Framework.Servers"/>
2635 <Reference name="OpenSim.Framework.Statistics"/>
2636 <Reference name="OpenSim.Region.Communications.Local"/>
2637 <Reference name="OpenSim.Region.CoreModules"/>
2638 <Reference name="OpenSim.Region.Framework"/>
2639 <Reference name="OpenSim.Region.Environment"/>
2640 <Reference name="OpenSim.Region.Physics.Manager"/>
2641
2642 <!-- Unit tests -->
2643 <!-- <Reference name="OpenSim.Tests.Common"/> -->
2644 <Reference name="OpenSim.Tests.Common"/>
2645 <Reference name="Nini.dll"/>
2646 <Reference name="nunit.framework.dll"/>
2647
2648 <!-- For scripting in funny languages by default -->
2649 <Reference name="Microsoft.JScript"/>
2650 <Reference name="XMLRPC.dll"/>
2651 <Reference name="OpenSim.Framework.Communications"/>
2652 <Reference name="Nini.dll" />
2653 <Reference name="log4net.dll"/>
2654 <Reference name="DotNetOpenMail.dll"/>
2655
2656 <!--
2657 TODO: this is kind of lame, we basically build a duplicate
2658 assembly but with tests added in, just so that we don't
2659 need to hard code in a bunch of Test directories here. If
2660 pattern="Tests/*.cs" worked, we wouldn't need this.
2661 -->
2662 <Files>
2663 <!-- SADLY the way this works means you need to keep adding these paths -->
2664 <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
2665 </Files>
2666 </Project>
2667
2611 <Project name="OpenSim.Region.Environment.Tests" path="OpenSim/Region/Environment" type="Library"> 2668 <Project name="OpenSim.Region.Environment.Tests" path="OpenSim/Region/Environment" type="Library">
2612 <Configuration name="Debug"> 2669 <Configuration name="Debug">
2613 <Options> 2670 <Options>
@@ -2662,7 +2719,6 @@
2662 <!-- SADLY the way this works means you need to keep adding these paths --> 2719 <!-- SADLY the way this works means you need to keep adding these paths -->
2663 <Match path="Modules/World/Terrain/Tests" pattern="*.cs" recurse="true" /> 2720 <Match path="Modules/World/Terrain/Tests" pattern="*.cs" recurse="true" />
2664 <Match path="Modules/World/Archiver/Tests" pattern="*.cs" recurse="true" /> 2721 <Match path="Modules/World/Archiver/Tests" pattern="*.cs" recurse="true" />
2665 <Match path="Modules/Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
2666 </Files> 2722 </Files>
2667 </Project> 2723 </Project>
2668 2724