Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 91378 Details for
Bug 139905
dev-games/ogre tests fails
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
test.patch (text/plain), 7.61 KB, created by
basic
on 2006-07-10 10:58:12 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
basic
Created:
2006-07-10 10:58:12 UTC
Size:
7.61 KB
patch
obsolete
>--- Tests/src/main.cpp.backup 2006-07-11 00:28:37.000000000 +0800 >+++ Tests/src/main.cpp 2006-07-11 00:29:20.000000000 +0800 >@@ -35,7 +35,7 @@ > #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 > MessageBox( NULL, "Unknown exception", "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL); > #else >- std::cerr << "An exception has occured: " << e.getFullDescription(); >+ std::cerr << "An exception has occured: Unkown exception"; > #endif > } > >--- Tests/OgreMain/src/ZipArchiveTests.cpp.backup 2006-07-11 01:36:04.000000000 +0800 >+++ Tests/OgreMain/src/ZipArchiveTests.cpp 2006-07-11 01:36:13.000000000 +0800 >@@ -35,7 +35,7 @@ > #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 > testPath = "../../../../Tests/OgreMain/misc/ArchiveTest.zip"; > #else >- testPath = "../../../Tests/OgreMain/misc/ArchiveTest.zip"; >+ testPath = "../../Tests/OgreMain/misc/ArchiveTest.zip"; > #endif > } > void ZipArchiveTests::tearDown() >--- Tests/OgreMain/src/FileSystemArchiveTests.cpp.backup 2006-07-11 00:39:06.000000000 +0800 >+++ Tests/OgreMain/src/FileSystemArchiveTests.cpp 2006-07-11 01:35:19.000000000 +0800 >@@ -34,7 +34,7 @@ > #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 > testPath = "../../../../Tests/OgreMain/misc/ArchiveTest/"; > #else >- testPath = "../../../Tests/OgreMain/misc/ArchiveTest/"; >+ testPath = "../../Tests/OgreMain/misc/ArchiveTest/"; > #endif > } > void FileSystemArchiveTests::tearDown() >@@ -64,13 +64,13 @@ > arch.load(); > StringVectorPtr vec = arch.list(true); > >- CPPUNIT_ASSERT_EQUAL((size_t)48, vec->size()); // 48 including CVS folders! >+ CPPUNIT_ASSERT_EQUAL((size_t)34, vec->size()); // 34 including files in CVS folders! (excluding folders themselves) > CPPUNIT_ASSERT_EQUAL(String("rootfile.txt"), vec->at(0)); > CPPUNIT_ASSERT_EQUAL(String("rootfile2.txt"), vec->at(1)); >- CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file.material"), vec->at(2)); >- CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file2.material"), vec->at(3)); >- CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file3.material"), vec->at(22)); >- CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file4.material"), vec->at(23)); >+ CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file.material"), vec->at(15)); >+ CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file2.material"), vec->at(14)); >+ CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file3.material"), vec->at(28)); >+ CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file4.material"), vec->at(29)); > } > void FileSystemArchiveTests::testListFileInfoNonRecursive() > { >@@ -99,29 +99,29 @@ > arch.load(); > FileInfoListPtr vec = arch.listFileInfo(true); > >- CPPUNIT_ASSERT_EQUAL((size_t)48, vec->size()); // 48 including CVS folders! >+ CPPUNIT_ASSERT_EQUAL((size_t)34, vec->size()); // 34 including files in CVS folders! > FileInfo& fi1 = vec->at(0); > CPPUNIT_ASSERT_EQUAL(String("rootfile.txt"), fi1.filename); > CPPUNIT_ASSERT_EQUAL(String("rootfile.txt"), fi1.basename); > CPPUNIT_ASSERT_EQUAL(StringUtil::BLANK, fi1.path); >- CPPUNIT_ASSERT_EQUAL((size_t)130, fi1.compressedSize); >- CPPUNIT_ASSERT_EQUAL((size_t)130, fi1.uncompressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)125, fi1.compressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)125, fi1.uncompressedSize); > > FileInfo& fi2 = vec->at(1); > CPPUNIT_ASSERT_EQUAL(String("rootfile2.txt"), fi2.filename); > CPPUNIT_ASSERT_EQUAL(String("rootfile2.txt"), fi2.basename); > CPPUNIT_ASSERT_EQUAL(StringUtil::BLANK, fi2.path); >- CPPUNIT_ASSERT_EQUAL((size_t)156, fi2.compressedSize); >- CPPUNIT_ASSERT_EQUAL((size_t)156, fi2.uncompressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)150, fi2.compressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)150, fi2.uncompressedSize); > >- FileInfo& fi3 = vec->at(2); >+ FileInfo& fi3 = vec->at(15); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file.material"), fi3.filename); > CPPUNIT_ASSERT_EQUAL(String("file.material"), fi3.basename); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/"), fi3.path); > CPPUNIT_ASSERT_EQUAL((size_t)0, fi3.compressedSize); > CPPUNIT_ASSERT_EQUAL((size_t)0, fi3.uncompressedSize); > >- FileInfo& fi4 = vec->at(3); >+ FileInfo& fi4 = vec->at(14); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file2.material"), fi4.filename); > CPPUNIT_ASSERT_EQUAL(String("file2.material"), fi4.basename); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/"), fi4.path); >@@ -129,14 +129,14 @@ > CPPUNIT_ASSERT_EQUAL((size_t)0, fi4.uncompressedSize); > > >- FileInfo& fi5 = vec->at(22); >+ FileInfo& fi5 = vec->at(28); > CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file3.material"), fi5.filename); > CPPUNIT_ASSERT_EQUAL(String("file3.material"), fi5.basename); > CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/"), fi5.path); > CPPUNIT_ASSERT_EQUAL((size_t)0, fi5.compressedSize); > CPPUNIT_ASSERT_EQUAL((size_t)0, fi5.uncompressedSize); > >- FileInfo& fi6 = vec->at(23); >+ FileInfo& fi6 = vec->at(29); > CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file4.material"), fi6.filename); > CPPUNIT_ASSERT_EQUAL(String("file4.material"), fi6.basename); > CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/"), fi6.path); >@@ -160,8 +160,8 @@ > StringVectorPtr vec = arch.find("*.material", true); > > CPPUNIT_ASSERT_EQUAL((size_t)4, vec->size()); >- CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file.material"), vec->at(0)); >- CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file2.material"), vec->at(1)); >+ CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file.material"), vec->at(1)); >+ CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file2.material"), vec->at(0)); > CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file3.material"), vec->at(2)); > CPPUNIT_ASSERT_EQUAL(String("level2/materials/scripts/file4.material"), vec->at(3)); > } >@@ -176,15 +176,15 @@ > CPPUNIT_ASSERT_EQUAL(String("rootfile.txt"), fi1.filename); > CPPUNIT_ASSERT_EQUAL(String("rootfile.txt"), fi1.basename); > CPPUNIT_ASSERT_EQUAL(StringUtil::BLANK, fi1.path); >- CPPUNIT_ASSERT_EQUAL((size_t)130, fi1.compressedSize); >- CPPUNIT_ASSERT_EQUAL((size_t)130, fi1.uncompressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)125, fi1.compressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)125, fi1.uncompressedSize); > > FileInfo& fi2 = vec->at(1); > CPPUNIT_ASSERT_EQUAL(String("rootfile2.txt"), fi2.filename); > CPPUNIT_ASSERT_EQUAL(String("rootfile2.txt"), fi2.basename); > CPPUNIT_ASSERT_EQUAL(StringUtil::BLANK, fi2.path); >- CPPUNIT_ASSERT_EQUAL((size_t)156, fi2.compressedSize); >- CPPUNIT_ASSERT_EQUAL((size_t)156, fi2.uncompressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)150, fi2.compressedSize); >+ CPPUNIT_ASSERT_EQUAL((size_t)150, fi2.uncompressedSize); > } > void FileSystemArchiveTests::testFindFileInfoRecursive() > { >@@ -194,14 +194,14 @@ > > CPPUNIT_ASSERT_EQUAL((size_t)4, vec->size()); > >- FileInfo& fi3 = vec->at(0); >+ FileInfo& fi3 = vec->at(1); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file.material"), fi3.filename); > CPPUNIT_ASSERT_EQUAL(String("file.material"), fi3.basename); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/"), fi3.path); > CPPUNIT_ASSERT_EQUAL((size_t)0, fi3.compressedSize); > CPPUNIT_ASSERT_EQUAL((size_t)0, fi3.uncompressedSize); > >- FileInfo& fi4 = vec->at(1); >+ FileInfo& fi4 = vec->at(0); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/file2.material"), fi4.filename); > CPPUNIT_ASSERT_EQUAL(String("file2.material"), fi4.basename); > CPPUNIT_ASSERT_EQUAL(String("level1/materials/scripts/"), fi4.path);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=91378">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 139905
: 91378
