aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-04 19:22:09 +0100
committerJustin Clark-Casey (justincc)2009-09-04 19:22:09 +0100
commit4c560df8acbf374c73e5ccb882a6fd0a92cdf490 (patch)
tree77d1c8da668afec0448eafb6b7684d5af1cf94aa
parentIf a test dll fails when manually run, stop immediately rather than trying al... (diff)
downloadopensim-SC_OLD-4c560df8acbf374c73e5ccb882a6fd0a92cdf490.zip
opensim-SC_OLD-4c560df8acbf374c73e5ccb882a6fd0a92cdf490.tar.gz
opensim-SC_OLD-4c560df8acbf374c73e5ccb882a6fd0a92cdf490.tar.bz2
opensim-SC_OLD-4c560df8acbf374c73e5ccb882a6fd0a92cdf490.tar.xz
If running tests manually, fail immediately on error
Diffstat (limited to '')
-rw-r--r--.nant/local.include18
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs2
2 files changed, 9 insertions, 11 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 5401829..8c72c80 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -38,47 +38,47 @@
38 the assembly here as an exec, and you add the fail clause later. 38 the assembly here as an exec, and you add the fail clause later.
39 This lets all the unit tests run and tells you if they fail at the 39 This lets all the unit tests run and tells you if they fail at the
40 end, instead of stopping short --> 40 end, instead of stopping short -->
41 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.tests"> 41 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.tests">
42 <arg value="./bin/OpenSim.Framework.Tests.dll" /> 42 <arg value="./bin/OpenSim.Framework.Tests.dll" />
43 </exec> 43 </exec>
44 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 44 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
45 45
46 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests"> 46 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.communications.tests">
47 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" /> 47 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
48 </exec> 48 </exec>
49 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" /> 49 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
50 50
51 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests"> 51 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests">
52 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" /> 52 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
53 </exec> 53 </exec>
54 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 54 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />
55 55
56 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> 56 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
57 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 57 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
58 </exec> 58 </exec>
59 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> 59 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
60 60
61 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests"> 61 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.scriptengine.tests">
62 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> 62 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
63 </exec> 63 </exec>
64 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 64 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" />
65 65
66 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.coremodules.tests"> 66 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.coremodules.tests">
67 <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" /> 67 <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
68 </exec> 68 </exec>
69 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 69 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" />
70 70
71 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests"> 71 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.framework.tests">
72 <arg value="./bin/OpenSim.Region.Framework.Tests.dll" /> 72 <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
73 </exec> 73 </exec>
74 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 74 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />
75 75
76 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests"> 76 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.data.sqlite.tests">
77 <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" /> 77 <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
78 </exec> 78 </exec>
79 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" /> 79 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" />
80 80
81 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests"> 81 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.data.mysql.tests">
82 <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" /> 82 <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
83 </exec> 83 </exec>
84 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" /> 84 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" />
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index f73a7e3..12c9dcf 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -199,7 +199,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
199 InventoryFolderImpl inventoryFolder = null; 199 InventoryFolderImpl inventoryFolder = null;
200 InventoryItemBase inventoryItem = null; 200 InventoryItemBase inventoryItem = null;
201 201
202 /*
203 if (!m_userInfo.HasReceivedInventory) 202 if (!m_userInfo.HasReceivedInventory)
204 { 203 {
205 // If the region server has access to the user admin service (by which users are created), 204 // If the region server has access to the user admin service (by which users are created),
@@ -221,7 +220,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
221 m_userInfo.FetchInventory(); 220 m_userInfo.FetchInventory();
222 } 221 }
223 } 222 }
224 */
225 223
226 bool foundStar = false; 224 bool foundStar = false;
227 225