aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-31 20:12:36 -0400
committerTeravus Ovares (Dan Olivares)2009-08-31 20:12:36 -0400
commitdeee2928472db6d45d8c6b59a3e0681fabf1efe9 (patch)
tree666d16d9189eff70a7cd259db0c8517b0397456d
parent* Get rid of some debug info and kill the code to make a large AABB until I c... (diff)
parentadd some fail detection to the new test-xml target (diff)
downloadopensim-SC_OLD-deee2928472db6d45d8c6b59a3e0681fabf1efe9.zip
opensim-SC_OLD-deee2928472db6d45d8c6b59a3e0681fabf1efe9.tar.gz
opensim-SC_OLD-deee2928472db6d45d8c6b59a3e0681fabf1efe9.tar.bz2
opensim-SC_OLD-deee2928472db6d45d8c6b59a3e0681fabf1efe9.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat
-rw-r--r--.nant/local.include103
-rw-r--r--README.txt1
2 files changed, 88 insertions, 16 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 58285bb..1e1c030 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -156,25 +156,96 @@
156 156
157</target> 157</target>
158 158
159<!-- this is used for panda test execution -->
160<!-- work in progress -->
159 161
160<target name="test-xml" depends="build"> 162<target name="test-xml" depends="build">
161 <nunit2 failonerror="true" verbose="true"> 163 <mkdir dir="test-results" failonerror="false" />
162 <formatter type="Xml" usefile="true" extension=".xml" outputdir="./test-results" /> 164 <!-- Unit Test Assembly -->
163 <test> 165 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.framework.tests">
164 <assemblies> 166 <arg value="./bin/OpenSim.Framework.Tests.dll" />
165 <include name="./bin/OpenSim.Framework.Tests.dll" /> 167 <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
166 <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> 168 </exec>
167 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> 169
168 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 170 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
169 <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> 171 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
170 <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" /> 172 <arg value="-xml=test-results/OpenSim.Framework.Communications.Tests.dll-Results.xml" />
171 <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> 173 </exec>
172 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 174
173 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> 175 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests">
174 </assemblies> 176 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
175 </test> 177 <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" />
176 </nunit2> 178 </exec>
179
180 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
181 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
182 <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" />
183 </exec>
184
185 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests">
186 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
187 <arg value="-xml=test-results/OpenSim.Region.ScriptEngine.Tests.dll-Results.xml" />
188 </exec>
189
190 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.coremodules.tests">
191 <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
192 <arg value="-xml=test-results/OpenSim.Region.CoreModules.Tests.dll-Results.xml" />
193 </exec>
194
195 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
196 <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
197 <arg value="-xml=test-results/OpenSim.Region.Framework.Tests.dll-Results.xml" />
198 </exec>
199
200 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests">
201 <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
202 <arg value="-xml=test-results/OpenSim.Data.SQLite.Tests.dll-Results.xml" />
203 </exec>
204
205 <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests">
206 <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
207 <arg value="-xml=test-results/OpenSim.Data.MySQL.Tests.dll-Results.xml" />
208 </exec>
209
210 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
211 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
212 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />
213 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
214 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" />
215 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" />
216 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />
217 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" />
218 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" />
219
177</target> 220</target>
221<!-- <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> -->
222<!-- <arg value="AcceptanceTestAssembly.dll" /> -->
223<!-- <arg value="/xml=AcceptanceTestAssembly-Results.xml" /> -->
224<!-- </exec> -->
225
226<!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.unittestassembly)==0}" /> -->
227<!-- <fail message="Failures reported in acceptance tests." unless="${int::parse(testresult.acceptancetestassembly)==0}" /> -->
228<!-- </target> -->
229
230
231
232<!-- <nunit2 failonerror="true" verbose="true"> -->
233<!-- <formatter type="Xml" usefile="true" extension=".xml" outputdir="./test-results" /> -->
234<!-- <test> -->
235<!-- <assemblies> -->
236<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
237<!-- <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> -->
238<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
239<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
240<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> -->
241<!-- <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" /> -->
242<!-- <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> -->
243<!-- <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> -->
244<!-- <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> -->
245<!-- </assemblies> -->
246<!-- </test> -->
247<!-- </nunit2> -->
248<!-- </target> -->
178 249
179<target name="doxygen"> 250<target name="doxygen">
180 <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" /> 251 <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" />
diff --git a/README.txt b/README.txt
index 5c34201..8a39d9d 100644
--- a/README.txt
+++ b/README.txt
@@ -89,3 +89,4 @@ OpenSim, as well as how to report bugs, and participate in the OpenSim
89project can always be found at http://opensimulator.org. 89project can always be found at http://opensimulator.org.
90 90
91Thanks for trying OpenSim, we hope it is a pleasant experience. 91Thanks for trying OpenSim, we hope it is a pleasant experience.
92
generated by cgit v1.1 at 2024-11-10 21:08:12 +0000