diff options
author | Teravus Ovares | 2008-12-22 21:01:56 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-12-22 21:01:56 +0000 |
commit | 15dde1ff4af66b226adef90355462d3220ac465e (patch) | |
tree | 78e0fe8b64304802358d07979811fc9d64dd2ba5 /.nant | |
parent | * Add odeplugin to the nant locals.. (diff) | |
download | opensim-SC_OLD-15dde1ff4af66b226adef90355462d3220ac465e.zip opensim-SC_OLD-15dde1ff4af66b226adef90355462d3220ac465e.tar.gz opensim-SC_OLD-15dde1ff4af66b226adef90355462d3220ac465e.tar.bz2 opensim-SC_OLD-15dde1ff4af66b226adef90355462d3220ac465e.tar.xz |
* Make build work again while working on a different strategy.
Diffstat (limited to '.nant')
-rw-r--r-- | .nant/bamboo.build | 7 | ||||
-rw-r--r-- | .nant/local.include | 15 |
2 files changed, 3 insertions, 19 deletions
diff --git a/.nant/bamboo.build b/.nant/bamboo.build index d9b128b..3df501a 100644 --- a/.nant/bamboo.build +++ b/.nant/bamboo.build | |||
@@ -26,9 +26,7 @@ | |||
26 | <!-- Re-create the directory containig test results. --> | 26 | <!-- Re-create the directory containig test results. --> |
27 | <delete dir="../test-results" /> | 27 | <delete dir="../test-results" /> |
28 | <mkdir dir="../test-results" /> | 28 | <mkdir dir="../test-results" /> |
29 | <!-- Copy the OdePlugin dll to bin/ for testing. --> | 29 | |
30 | <copy file="../bin/Physics/OpenSim.Region.Physics.OdePlugin.dll" tofile="../bin/OpenSim.Region.Physics.OdePlugin.dll" /> | ||
31 | |||
32 | <!-- Copy the 64 bit ode library to bin/ for testing. --> | 30 | <!-- Copy the 64 bit ode library to bin/ for testing. --> |
33 | <copy file="/home/buildsystem/libode.so" tofile="../bin/libode.so" /> | 31 | <copy file="/home/buildsystem/libode.so" tofile="../bin/libode.so" /> |
34 | <exec program="chmod" useruntimeengine="false" commandline="755 ../bin/libode.so" /> | 32 | <exec program="chmod" useruntimeengine="false" commandline="755 ../bin/libode.so" /> |
@@ -46,8 +44,7 @@ | |||
46 | <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> | 44 | <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> |
47 | <include name="../bin/OpenSim.Region.Environment.Tests.dll" /> | 45 | <include name="../bin/OpenSim.Region.Environment.Tests.dll" /> |
48 | <include name="../bin/OpenSim.Data.SQLite.Tests.dll" /> | 46 | <include name="../bin/OpenSim.Data.SQLite.Tests.dll" /> |
49 | <include name="../bin/OpenSim.Data.MySQL.Tests.dll" /> | 47 | <include name="../bin/OpenSim.Data.MySQL.Tests.dll" /> |
50 | <include name="../bin/OpenSim.Region.Physics.OdePlugin.dll" /> | ||
51 | 48 | ||
52 | </assemblies> | 49 | </assemblies> |
53 | </test> | 50 | </test> |
diff --git a/.nant/local.include b/.nant/local.include index d0b16a6..899bb2f 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
@@ -43,7 +43,6 @@ | |||
43 | <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> | 43 | <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> |
44 | <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> | 44 | <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> |
45 | <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> | 45 | <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> |
46 | <include name="./bin/OpenSim.Region.Physics.OdePlugin.dll" /> | ||
47 | </assemblies> | 46 | </assemblies> |
48 | </test> | 47 | </test> |
49 | </nunit2> | 48 | </nunit2> |
@@ -138,18 +137,7 @@ | |||
138 | <delete dir="./cov/OpenSim.Data.MySQL" /> | 137 | <delete dir="./cov/OpenSim.Data.MySQL" /> |
139 | <exec program="monocov"> | 138 | <exec program="monocov"> |
140 | <arg value="--export-html=./cov/OpenSim.Data.MySQL ./cov/OpenSim.Data.MySQL.cov" /> | 139 | <arg value="--export-html=./cov/OpenSim.Data.MySQL ./cov/OpenSim.Data.MySQL.cov" /> |
141 | </exec> | 140 | </exec> |
142 | |||
143 | <exec program="mono"> | ||
144 | <arg value="--debug" /> | ||
145 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Physics.OdePlugin.cov,+[OpenSim.Region.Physics.OdePlugin]" /> | ||
146 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
147 | <arg value="./bin/OpenSim.Region.Physics.OdePlugin.dll" /> | ||
148 | </exec> | ||
149 | <delete dir="./cov/OpenSim.Region.Physics.OdePlugin" /> | ||
150 | <exec program="monocov"> | ||
151 | <arg value="--export-html=./cov/OpenSim.Region.Physics.OdePlugin ./cov/OpenSim.Region.Physics.OdePlugin.cov" /> | ||
152 | </exec> | ||
153 | 141 | ||
154 | <delete file="C:\NUnitPrimaryTrace.txt" failonerror="false" /> | 142 | <delete file="C:\NUnitPrimaryTrace.txt" failonerror="false" /> |
155 | <delete file="TestResult.xml" failonerror="false" /> | 143 | <delete file="TestResult.xml" failonerror="false" /> |
@@ -171,7 +159,6 @@ | |||
171 | <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> | 159 | <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> |
172 | <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> | 160 | <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> |
173 | <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> | 161 | <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> |
174 | <include name="./bin/OpenSim.Region.Physics.OdePlugin.dll" /> | ||
175 | </assemblies> | 162 | </assemblies> |
176 | </test> | 163 | </test> |
177 | </nunit2> | 164 | </nunit2> |