aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-09-08 21:08:01 +0000
committerSean Dague2008-09-08 21:08:01 +0000
commit5913fcc8e872912f2b71831592313a0354473103 (patch)
tree8006ac042bf2cd227827f8b29c2347fa98becedd
parentchanges to Test directory structure per opensim-dev conversation (diff)
downloadopensim-SC_OLD-5913fcc8e872912f2b71831592313a0354473103.zip
opensim-SC_OLD-5913fcc8e872912f2b71831592313a0354473103.tar.gz
opensim-SC_OLD-5913fcc8e872912f2b71831592313a0354473103.tar.bz2
opensim-SC_OLD-5913fcc8e872912f2b71831592313a0354473103.tar.xz
rejigger tests out of OpenSim.Region.Environment and into OpenSim.Region.Environment.Tests.dll
Diffstat (limited to '')
-rw-r--r--.nant/bamboo.build2
-rw-r--r--.nant/local.include2
-rw-r--r--prebuild.xml51
3 files changed, 52 insertions, 3 deletions
diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index fcb22b1..7e4a9fc 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -39,7 +39,7 @@
39 <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" /> 39 <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" />
40 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 40 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
41 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 41 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
42 <include name="../bin/OpenSim.Region.Environment.dll" /> 42 <include name="../bin/OpenSim.Region.Environment.Tests.dll" />
43 </assemblies> 43 </assemblies>
44 </test> 44 </test>
45 </nunit2> 45 </nunit2>
diff --git a/.nant/local.include b/.nant/local.include
index 0328d42..1b526e6 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -36,7 +36,7 @@
36 <include name="./bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" /> 36 <include name="./bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" />
37 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 37 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
38 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 38 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
39 <include name="./bin/OpenSim.Region.Environment.dll" /> 39 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
40 </assemblies> 40 </assemblies>
41 </test> 41 </test>
42 </nunit2> 42 </nunit2>
diff --git a/prebuild.xml b/prebuild.xml
index abf83d4..46cec93 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -799,6 +799,49 @@
799 <Reference name="OpenSim.Framework.Statistics"/> 799 <Reference name="OpenSim.Framework.Statistics"/>
800 <Reference name="OpenSim.Region.Physics.Manager"/> 800 <Reference name="OpenSim.Region.Physics.Manager"/>
801 801
802 <!-- For scripting in funny languages by default -->
803 <Reference name="Microsoft.JScript"/>
804 <Reference name="XMLRPC.dll"/>
805 <Reference name="OpenSim.Framework.Communications"/>
806 <Reference name="OpenSim.Data.Base"/>
807 <Reference name="Nini.dll" />
808 <Reference name="log4net.dll"/>
809 <Reference name="DotNetOpenMail.dll"/>
810
811 <Files>
812 <Match pattern="*.cs" recurse="true">
813 <Exclude name="Tests" pattern="Tests" />
814 </Match>
815 </Files>
816 </Project>
817
818 <Project name="OpenSim.Region.Environment.Tests" path="OpenSim/Region/Environment" type="Library">
819 <Configuration name="Debug">
820 <Options>
821 <OutputPath>../../../bin/</OutputPath>
822 </Options>
823 </Configuration>
824 <Configuration name="Release">
825 <Options>
826 <OutputPath>../../../bin/</OutputPath>
827 </Options>
828 </Configuration>
829
830 <ReferencePath>../../../bin/</ReferencePath>
831 <Reference name="System" localCopy="false"/>
832 <Reference name="System.Xml"/>
833 <Reference name="System.Drawing"/>
834 <Reference name="System.Runtime.Remoting"/>
835 <Reference name="OpenMetaverseTypes.dll"/>
836 <Reference name="OpenMetaverse.dll"/>
837 <Reference name="OpenSim.Framework"/>
838 <Reference name="OpenSim.Data" />
839 <Reference name="OpenSim.Region.Interfaces" />
840 <Reference name="OpenSim.Framework.Console"/>
841 <Reference name="OpenSim.Framework.Servers"/>
842 <Reference name="OpenSim.Framework.Statistics"/>
843 <Reference name="OpenSim.Region.Physics.Manager"/>
844
802 <!-- Unit tests --> 845 <!-- Unit tests -->
803 <Reference name="OpenSim.Tests.Common"/> 846 <Reference name="OpenSim.Tests.Common"/>
804 <Reference name="nunit.framework.dll"/> 847 <Reference name="nunit.framework.dll"/>
@@ -812,8 +855,14 @@
812 <Reference name="log4net.dll"/> 855 <Reference name="log4net.dll"/>
813 <Reference name="DotNetOpenMail.dll"/> 856 <Reference name="DotNetOpenMail.dll"/>
814 857
858 <!--
859 TODO: this is kind of lame, we basically build a duplicate
860 assembly but with tests added in, just so that we don't
861 need to hard code in a bunch of Test directories here. If
862 pattern="Tests/*.cs" worked, we wouldn't need this.
863 -->
815 <Files> 864 <Files>
816 <Match pattern="*.cs" recurse="true"/> 865 <Match pattern="*.cs" recurse="true" />
817 </Files> 866 </Files>
818 </Project> 867 </Project>
819 868