Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed verbosity error in notation unit tests

Browse Source 
* Disabled Network Tests in Automated builds
* Fixed minor compile time warning due to XML comment mismatch

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2547 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Jim Radford
2009-03-27 17:33:54 +00:00
parent b64699b32c
commit 8b2f3b6df8
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenMetaverse.Tests/NotationLLSDTests.cs
View File

@@ -713,8 +713,7 @@ namespace OpenMetaverse.Tests
llsdArray.Add(llsdTwo);
string sOne = OSDParser.SerializeLLSDNotationFormatted(llsdArray);
Console.Write(sOne);
OSDMap llsdMap = new OSDMap();
OSD llsdThree = OSD.FromInteger(2);
llsdMap["test1"] = llsdThree;
@@ -724,7 +723,6 @@ namespace OpenMetaverse.Tests
llsdArray.Add(llsdMap);
string sTwo = OSDParser.SerializeLLSDNotationFormatted(llsdArray);
Console.Write(sTwo);
OSDArray llsdArrayTwo = new OSDArray();
OSD llsdFive = OSD.FromString("asdflkhjasdhj");
@@ -735,7 +733,6 @@ namespace OpenMetaverse.Tests
llsdMap["test3"] = llsdArrayTwo;
string sThree = OSDParser.SerializeLLSDNotationFormatted(llsdArray);
Console.Write(sThree);
// we also try to parse this... and look a little at the results
OSDArray llsdSeven = (OSDArray)OSDParser.DeserializeLLSDNotation(sThree);

1
OpenMetaverse/AssetManager.cs
View File

@@ -860,6 +860,7 @@ namespace OpenMetaverse
/// Request an asset be uploaded to the simulator
/// </summary>
/// <param name="assetID"></param>
/// <param name="type">Asset type to upload this data as</param>
/// <param name="data">A byte array containing the encoded asset data</param>
/// <param name="storeLocal">If True, the asset once uploaded will be stored on the simulator
/// in which the client was connected in addition to being stored on the asset server</param>

15
runprebuild2008.bat
View File

@@ -27,25 +27,26 @@ bin\Prebuild.exe /target vs2008
echo @echo off > compile.bat
if(.%1)==(.) echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenMetaverse.sln >> compile.bat
if(.%1)==(.msbuild) echo "echo ==== COMPILE BEGIN ====" >> compile.bat
if(.%1)==(.msbuild) echo echo ==== COMPILE BEGIN ==== >> compile.bat
if(.%1)==(.msbuild) echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild /p:Configuration=Release OpenMetaverse.sln >> compile.bat
if(.%1)==(.msbuild) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat
if(.%1)==(.nant) echo nant >> compile.bat
if(.%1)==(.nant) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat
if(.%3)==(.docs) echo "echo ==== GENERATE DOCUMENTATION BEGIN ====" >> compile.bat
if(.%3)==(.docs) echo echo ==== GENERATE DOCUMENTATION BEGIN ==== >> compile.bat
if(.%2)==(.docs) echo SandCastleBuilderConsole.exe docs\OpenMetaverse-docs.shfb >> compile.bat
if(.%2)==(.docs) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat
if(.%2)==(.docs) echo 7za.exe a -tzip docs\documentation.zip docs\trunk >> compile.bat
if(.%2)==(.docs) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat
if(.%3)==(.runtests) echo "echo ==== UNIT TESTS BEGIN ====" >> compile.bat
if(.%2)==(.runtests) echo "nunit-console.exe" /nologo /nodots /labels /exclude:NetworkTests bin\OpenMetaverse.Tests.dll >> compile.bat
if(.%2)==(.runtests) echo echo ==== UNIT TESTS BEGIN ==== >> compile.bat
if(.%2)==(.runtests) echo nunit-console bin\OpenMetaverse.Tests.dll /exclude:NetworkTest,DetectObjects,CapsQueue /nodots /labels >> compile.bat
if(.%2)==(.runtests) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat
:: nsis compiler needs to be in path
if(.%3)==(.dist) echo "echo ==== GENERATE DISTRIBUTION BEGIN ====" >> compile.bat
if(.%3)==(.dist) echo echo ==== GENERATE DISTRIBUTION BEGIN ==== >> compile.bat
if(.%3)==(.dist) echo makensis.exe /DPlatform=test docs\OpenMetaverse-installer.nsi >> compile.bat
if(.%3)==(.dist) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat
if(.%3)==(.dist) echo 7za.exe a -tzip dist\openmetaverse-dist.zip @docs\distfiles.lst >> compile.bat
@@ -63,7 +64,3 @@ if(.%1)==(.msbuild) compile.bat
if(.%1)==(.nant) compile.bat
if(.%1)==(.dist) compile.bat