diff options
author | Dan Lake | 2012-02-01 16:25:35 -0800 |
---|---|---|
committer | Dan Lake | 2012-02-01 16:25:35 -0800 |
commit | c10193c72b1f029a958f04d2f5d7ee384e693aaa (patch) | |
tree | 052ec7e973c15b158310511197affad14eb9c64f /.nant | |
parent | Trigger event when prims are scheduled for an update. This gives modules earl... (diff) | |
parent | Small optimization to last commit (diff) | |
download | opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.zip opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.gz opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.bz2 opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '.nant')
-rw-r--r-- | .nant/local.include | 191 |
1 files changed, 8 insertions, 183 deletions
diff --git a/.nant/local.include b/.nant/local.include index a9ba17d..4fa3e4d 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
@@ -38,52 +38,8 @@ | |||
38 | <include name=".hgignore"/> | 38 | <include name=".hgignore"/> |
39 | </fileset> | 39 | </fileset> |
40 | </delete> | 40 | </delete> |
41 | |||
42 | </target> | 41 | </target> |
43 | 42 | ||
44 | <!-- I don't think these targets are being actively used. But just in case, we'll just comment them out for now - justincc --> | ||
45 | <!-- | ||
46 | <property name="projectdir" value="opensim-0.6.9" /> | ||
47 | <target name="dist" depends="distdir"> | ||
48 | <zip zipfile="${projectdir}.zip"> | ||
49 | <fileset basedir="."> | ||
50 | <include name="${projectdir}/**" /> | ||
51 | </fileset> | ||
52 | </zip> | ||
53 | <tar destfile="${projectdir}.tar.gz" compression="GZip"> | ||
54 | <fileset basedir="."> | ||
55 | <include name="${projectdir}/**" /> | ||
56 | </fileset> | ||
57 | </tar> | ||
58 | </target> | ||
59 | |||
60 | <target name="distdir"> | ||
61 | <delete dir="${projectdir}" /> | ||
62 | <copy todir="${projectdir}"> | ||
63 | <fileset basedir="."> | ||
64 | <include name="ThirdPartyLicenses/**" /> | ||
65 | <include name="CONTRIBUTORS.txt" /> | ||
66 | <include name="README" /> | ||
67 | <include name="OpenSim/**/*.cs" /> | ||
68 | <include name="**/*.build" /> | ||
69 | <include name="**/*.csproj" /> | ||
70 | <include name="**/*.csproj.user" /> | ||
71 | <include name="**/*.sln" /> | ||
72 | <include name="bin/*.dll" /> | ||
73 | <include name="bin/*.so" /> | ||
74 | <include name="bin/*.config" /> | ||
75 | <include name="bin/assets/**" /> | ||
76 | <include name="bin/data/**" /> | ||
77 | <include name="bin/OpenSim*xml" /> | ||
78 | <include name="bin/OpenSim.ini" /> | ||
79 | <include name="bin/defaultstripe.png" /> | ||
80 | <exclude name="bin/OpenSim.*dll" /> | ||
81 | </fileset> | ||
82 | </copy> | ||
83 | <touch file="${projectdir}/bin/startup_commands.txt" /> | ||
84 | </target> | ||
85 | --> | ||
86 | |||
87 | <target name="test" depends="build, find-nunit"> | 43 | <target name="test" depends="build, find-nunit"> |
88 | <setenv name="MONO_THREADS_PER_CPU" value="100" /> | 44 | <setenv name="MONO_THREADS_PER_CPU" value="100" /> |
89 | 45 | ||
@@ -153,116 +109,17 @@ | |||
153 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> | 109 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> |
154 | 110 | ||
155 | <delete dir="%temp%"/> | 111 | <delete dir="%temp%"/> |
156 | |||
157 | </target> | 112 | </target> |
158 | 113 | ||
159 | <target name="test-cov" depends="build"> | 114 | <target name="torture" depends="build, find-nunit"> |
160 | <!-- Code Coverage Test. Prototype, only works with mono 1.2. Instructions in http://opensimulator.org/wiki/Automated_Testing --> | 115 | <setenv name="MONO_THREADS_PER_CPU" value="100" /> |
161 | <mkdir dir="cov" failonerror="false" /> | 116 | |
162 | <exec program="mono"> | 117 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture"> |
163 | <arg value="--debug" /> | 118 | <arg value="./bin/OpenSim.Tests.Torture.dll" /> |
164 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Servers.cov,+[OpenSim.Framework.Servers]" /> | 119 | </exec> |
165 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
166 | <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" /> | ||
167 | </exec> | ||
168 | <delete dir="./cov/OpenSim.Framework.Servers" /> | ||
169 | <exec program="monocov"> | ||
170 | <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" /> | ||
171 | </exec> | ||
172 | |||
173 | <!-- | ||
174 | <exec program="mono"> | ||
175 | <arg value="--debug" /> | ||
176 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ClientStack.LindenUDP.cov,+[OpenSim.Region.ClientStack.LindenUDP]" /> | ||
177 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
178 | <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> | ||
179 | </exec> | ||
180 | <delete dir="./cov/OpenSim.Region.ClientStack.LindenUDP" /> | ||
181 | <exec program="monocov"> | ||
182 | <arg value="--export-html=./cov/OpenSim.Region.ClientStack.LindenUDP ./cov/OpenSim.Region.ClientStack.LindenUDP.cov" /> | ||
183 | </exec> | ||
184 | --> | ||
185 | |||
186 | <exec program="mono"> | ||
187 | <arg value="--debug" /> | ||
188 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.cov,+[OpenSim.Region.ScriptEngine.Shared]" /> | ||
189 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
190 | <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> | ||
191 | </exec> | ||
192 | <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared" /> | ||
193 | <exec program="monocov"> | ||
194 | <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared ./cov/OpenSim.Region.ScriptEngine.Shared.cov" /> | ||
195 | </exec> | ||
196 | |||
197 | <exec program="mono"> | ||
198 | <arg value="--debug" /> | ||
199 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov,+[OpenSim.Region.ScriptEngine.Shared.CodeTools]" /> | ||
200 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
201 | <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> | ||
202 | </exec> | ||
203 | <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools" /> | ||
204 | <exec program="monocov"> | ||
205 | <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools ./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov" /> | ||
206 | </exec> | ||
207 | |||
208 | <exec program="mono"> | ||
209 | <arg value="--debug" /> | ||
210 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.CoreModules.cov,+[OpenSim.Region.CoreModules]" /> | ||
211 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
212 | <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" /> | ||
213 | </exec> | ||
214 | <delete dir="./cov/OpenSim.Region.CoreModules" /> | ||
215 | <exec program="monocov"> | ||
216 | <arg value="--export-html=./cov/OpenSim.Region.CoreModules ./cov/OpenSim.Region.CoreModules.cov" /> | ||
217 | </exec> | ||
218 | |||
219 | <exec program="mono"> | ||
220 | <arg value="--debug" /> | ||
221 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.OptionalModules.cov,+[OpenSim.Region.OptionalModules]" /> | ||
222 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
223 | <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> | ||
224 | </exec> | ||
225 | <delete dir="./cov/OpenSim.Region.OptionalModules" /> | ||
226 | <exec program="monocov"> | ||
227 | <arg value="--export-html=./cov/OpenSim.Region.OptionalModules ./cov/OpenSim.Region.OptionalModules.cov" /> | ||
228 | </exec> | ||
229 | |||
230 | <exec program="mono"> | ||
231 | <arg value="--debug" /> | ||
232 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Framework.cov,+[OpenSim.Region.Framework]" /> | ||
233 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
234 | <arg value="./bin/OpenSim.Region.Framework.Tests.dll" /> | ||
235 | </exec> | ||
236 | <delete dir="./cov/OpenSim.Region.Framework" /> | ||
237 | <exec program="monocov"> | ||
238 | <arg value="--export-html=./cov/OpenSim.Region.Framework ./cov/OpenSim.Region.Framework.cov" /> | ||
239 | </exec> | ||
240 | |||
241 | <exec program="mono"> | ||
242 | <arg value="--debug" /> | ||
243 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.SQLite.cov,+[OpenSim.Data.SQLite]" /> | ||
244 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
245 | <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" /> | ||
246 | </exec> | ||
247 | <delete dir="./cov/OpenSim.Data.SQLite" /> | ||
248 | <exec program="monocov"> | ||
249 | <arg value="--export-html=./cov/OpenSim.Data.SQLite ./cov/OpenSim.Data.SQLite.cov" /> | ||
250 | </exec> | ||
251 | |||
252 | <exec program="mono"> | ||
253 | <arg value="--debug" /> | ||
254 | <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.MySQL.cov,+[OpenSim.Data.MySQL.Tests]" /> | ||
255 | <arg value="/usr/lib/nunit/nunit-console.exe" /> | ||
256 | <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" /> | ||
257 | </exec> | ||
258 | <delete dir="./cov/OpenSim.Data.MySQL" /> | ||
259 | <exec program="monocov"> | ||
260 | <arg value="--export-html=./cov/OpenSim.Data.MySQL ./cov/OpenSim.Data.MySQL.cov" /> | ||
261 | </exec> | ||
262 | |||
263 | <delete file="C:\NUnitPrimaryTrace.txt" failonerror="false" /> | ||
264 | <delete file="TestResult.xml" failonerror="false" /> | ||
265 | 120 | ||
121 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> | ||
122 | <delete dir="%temp%"/> | ||
266 | </target> | 123 | </target> |
267 | 124 | ||
268 | <target name="find-nunit"> | 125 | <target name="find-nunit"> |
@@ -275,15 +132,12 @@ | |||
275 | if="${int::parse(hasnunit2)==0}" /> | 132 | if="${int::parse(hasnunit2)==0}" /> |
276 | <property name="nunitcmd" value="nunit-console" | 133 | <property name="nunitcmd" value="nunit-console" |
277 | if="${int::parse(hasnunit2)==1}" /> | 134 | if="${int::parse(hasnunit2)==1}" /> |
278 | |||
279 | </target> | 135 | </target> |
280 | 136 | ||
281 | <!-- this is used for panda test execution --> | 137 | <!-- this is used for panda test execution --> |
282 | <!-- work in progress --> | 138 | <!-- work in progress --> |
283 | 139 | ||
284 | <target name="test-xml" depends="build, find-nunit"> | 140 | <target name="test-xml" depends="build, find-nunit"> |
285 | |||
286 | |||
287 | <mkdir dir="test-results" failonerror="false" /> | 141 | <mkdir dir="test-results" failonerror="false" /> |
288 | <!-- Unit Test Assembly --> | 142 | <!-- Unit Test Assembly --> |
289 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests"> | 143 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests"> |
@@ -356,36 +210,7 @@ | |||
356 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> | 210 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> |
357 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> | 211 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> |
358 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> | 212 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> |
359 | |||
360 | </target> | 213 | </target> |
361 | <!-- <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> --> | ||
362 | <!-- <arg value="AcceptanceTestAssembly.dll" /> --> | ||
363 | <!-- <arg value="/xml=AcceptanceTestAssembly-Results.xml" /> --> | ||
364 | <!-- </exec> --> | ||
365 | |||
366 | <!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.unittestassembly)==0}" /> --> | ||
367 | <!-- <fail message="Failures reported in acceptance tests." unless="${int::parse(testresult.acceptancetestassembly)==0}" /> --> | ||
368 | <!-- </target> --> | ||
369 | |||
370 | |||
371 | |||
372 | <!-- <nunit2 failonerror="true" verbose="true"> --> | ||
373 | <!-- <formatter type="Xml" usefile="true" extension=".xml" outputdir="./test-results" /> --> | ||
374 | <!-- <test> --> | ||
375 | <!-- <assemblies> --> | ||
376 | <!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> --> | ||
377 | <!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> --> | ||
378 | <!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> --> | ||
379 | <!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> --> | ||
380 | <!-- <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" /> --> | ||
381 | <!-- <include name="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> --> | ||
382 | <!-- <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> --> | ||
383 | <!-- <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> --> | ||
384 | <!-- <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> --> | ||
385 | <!-- </assemblies> --> | ||
386 | <!-- </test> --> | ||
387 | <!-- </nunit2> --> | ||
388 | <!-- </target> --> | ||
389 | 214 | ||
390 | <target name="doxygen"> | 215 | <target name="doxygen"> |
391 | <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" /> | 216 | <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" /> |