aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.nant/bamboo.build8
-rw-r--r--.nant/local.include8
-rw-r--r--Makefile7
-rw-r--r--OpenSim/Framework/Tests/UtilTest.cs (renamed from OpenSim/Tests/Framework/UtilTest.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLFloat.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLInteger.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLString.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestList.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestList.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestVector3.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestList.cs)0
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs (renamed from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs)0
-rw-r--r--prebuild.xml16
17 files changed, 23 insertions, 16 deletions
diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 8fe4c63..fcb22b1 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -35,10 +35,10 @@
35 <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" /> 35 <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" />
36 <test> 36 <test>
37 <assemblies> 37 <assemblies>
38 <include name="../bin/OpenSim.Tests.Framework.dll" /> 38 <include name="../bin/OpenSim.Framework.Tests.dll" />
39 <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Common.dll" /> 39 <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" />
40 <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Shared.dll" /> 40 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
41 <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools.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.dll" />
43 </assemblies> 43 </assemblies>
44 </test> 44 </test>
diff --git a/.nant/local.include b/.nant/local.include
index 7d0b690..0328d42 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -32,10 +32,10 @@
32 <formatter type="Plain" /> 32 <formatter type="Plain" />
33 <test> 33 <test>
34 <assemblies> 34 <assemblies>
35 <include name="./bin/OpenSim.Tests.Framework.dll" /> 35 <include name="./bin/OpenSim.Framework.Tests.dll" />
36 <include name="./bin/OpenSim.Tests.Region.ScriptEngine.Common.dll" /> 36 <include name="./bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" />
37 <include name="./bin/OpenSim.Tests.Region.ScriptEngine.Shared.dll" /> 37 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
38 <include name="./bin/OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools.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.dll" />
40 </assemblies> 40 </assemblies>
41 </test> 41 </test>
diff --git a/Makefile b/Makefile
index af504ac..a1858b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
1NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi) 1NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
2 2
3all: 3all:
4 @export PATH=/usr/local/bin:$(PATH) 4 # @export PATH=/usr/local/bin:$(PATH)
5 ./runprebuild.sh 5 ./runprebuild.sh
6 ${NANT} 6 ${NANT}
7 find OpenSim -name \*.mdb -exec cp {} bin \; 7 find OpenSim -name \*.mdb -exec cp {} bin \;
8 8
9clean: 9clean:
10 @export PATH=/usr/local/bin:$(PATH) 10 # @export PATH=/usr/local/bin:$(PATH)
11 ${NANT} clean 11 ${NANT} clean
12 12
13test:
14 ${NANT} test
15
13tags: 16tags:
14 find OpenSim -name \*\.cs | xargs etags 17 find OpenSim -name \*\.cs | xargs etags
15 18
diff --git a/OpenSim/Tests/Framework/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index a973ed2..a973ed2 100644
--- a/OpenSim/Tests/Framework/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLFloat.cs
index d89bb87..d89bb87 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLFloat.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLInteger.cs
index d2839db..d2839db 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLInteger.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLString.cs
index 3aa52cb..3aa52cb 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLString.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestList.cs
index e63200e..e63200e 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestList.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestList.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestVector3.cs
index 0a41f92..0a41f92 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestVector3.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
index fefcada..fefcada 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index 7725d8d..7725d8d 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
index 272d06c..272d06c 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
index f826c00..f826c00 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
index 49e5023..49e5023 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
index 7da28dd..7da28dd 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestList.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs
index fb2c00c..fb2c00c 100644
--- a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs
diff --git a/prebuild.xml b/prebuild.xml
index bd75843..abf83d4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -125,7 +125,7 @@
125 </Files> 125 </Files>
126 </Project> 126 </Project>
127 127
128 <Project name="OpenSim.Tests.Framework" path="OpenSim/Tests/Framework" type="Library"> 128 <Project name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
129 <Configuration name="Debug"> 129 <Configuration name="Debug">
130 <Options> 130 <Options>
131 <OutputPath>../../../bin/</OutputPath> 131 <OutputPath>../../../bin/</OutputPath>
@@ -1496,7 +1496,7 @@
1496 </Files> 1496 </Files>
1497 </Project> 1497 </Project>
1498 1498
1499 <Project name="OpenSim.Tests.Region.ScriptEngine.Shared" path="OpenSim/Tests/Region/ScriptEngine/Shared" type="Library"> 1499 <Project name="OpenSim.Region.ScriptEngine.Shared.Tests" path="OpenSim/Region/ScriptEngine/Shared/Tests" type="Library">
1500 <Configuration name="Debug"> 1500 <Configuration name="Debug">
1501 <Options> 1501 <Options>
1502 <OutputPath>../../../../../bin/</OutputPath> 1502 <OutputPath>../../../../../bin/</OutputPath>
@@ -1651,11 +1651,13 @@
1651 <Reference name="Tools.dll"/> 1651 <Reference name="Tools.dll"/>
1652 1652
1653 <Files> 1653 <Files>
1654 <Match pattern="*.cs" recurse="true"/> 1654 <Match pattern="*.cs" recurse="true">
1655 <Exclude name="Tests" pattern="Tests" />
1656 </Match>
1655 </Files> 1657 </Files>
1656 </Project> 1658 </Project>
1657 1659
1658 <Project name="OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools" type="Library"> 1660 <Project name="OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests" path="OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests" type="Library">
1659 <Configuration name="Debug"> 1661 <Configuration name="Debug">
1660 <Options> 1662 <Options>
1661 <OutputPath>../../../../../../bin/</OutputPath> 1663 <OutputPath>../../../../../../bin/</OutputPath>
@@ -1974,11 +1976,13 @@
1974 <Reference name="log4net.dll"/> 1976 <Reference name="log4net.dll"/>
1975 1977
1976 <Files> 1978 <Files>
1977 <Match pattern="*.cs" recurse="true"/> 1979 <Match pattern="*.cs" recurse="true" >
1980 <Exclude name="Tests" pattern="Tests" />
1981 </Match>
1978 </Files> 1982 </Files>
1979 </Project> 1983 </Project>
1980 1984
1981 <Project name="OpenSim.Tests.Region.ScriptEngine.Common" path="OpenSim/Tests/Region/ScriptEngine/Common" type="Library"> 1985 <Project name="OpenSim.Region.ScriptEngine.Common.Tests" path="OpenSim/Region/ScriptEngine/Common/Tests" type="Library">
1982 <Configuration name="Debug"> 1986 <Configuration name="Debug">
1983 <Options> 1987 <Options>
1984 <OutputPath>../../../../../bin/</OutputPath> 1988 <OutputPath>../../../../../bin/</OutputPath>