From 74ec200f312b2626583ae1fe60ac290e2fbfe479 Mon Sep 17 00:00:00 2001 From: Tyler Dauwalder Date: Thu, 29 Aug 2002 00:00:57 +0000 Subject: [PATCH] Added a #if clause to exclude the __mime_table code from the OBOS::GetSupportingApps() tests, as the __mime_table is not currently used. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@927 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kits/storage/MimeTypeTest.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tests/kits/storage/MimeTypeTest.cpp b/src/tests/kits/storage/MimeTypeTest.cpp index ac24f66ec0..249daf0929 100644 --- a/src/tests/kits/storage/MimeTypeTest.cpp +++ b/src/tests/kits/storage/MimeTypeTest.cpp @@ -2300,7 +2300,7 @@ MimeTypeTest::SupportingAppsTest() { msg.PrintToStream(); } */ NextSubTest(); - if (true) // Doesn't quite work right yet. + if (true) { std::set typeList; // Stores all installed MIME types std::set appList; // Stores all installed application subtypes @@ -2377,7 +2377,8 @@ MimeTypeTest::SupportingAppsTest() { } } } - + +#if !TEST_R5 // Now, add in all the types listed in MIME_DB_DIR/__mime_table { BEntry entry((std::string(mimeDatabaseDir) + "/__mime_table").c_str()); @@ -2406,6 +2407,7 @@ MimeTypeTest::SupportingAppsTest() { } } } +#endif // For each installed type, get a list of the supported apps, and // verify that the list matches the list we generated. Also check @@ -2465,7 +2467,7 @@ MimeTypeTest::WildcardAppsTest() { #if TEST_R5 CHK(BMimeType::GetWildcardApps(NULL) == B_OK); // R5 == B_OK (???) #else - CHK(RES(BMimeType::GetWildcardApps(NULL)) != B_OK); // Personally I think we ought to return B_BAD_VALUE + CHK(BMimeType::GetWildcardApps(NULL) == B_BAD_VALUE); #endif } // Normal function (compare to BMimeType("application/octet-stream").GetSupportingApps())