aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-21 20:54:42 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-21 20:54:42 +0000
commitae3f2ce18d788f3a1640d1a34076c03835d06a59 (patch)
tree5bc0af57d20277fbf78646d56d895b5df441a17d
parent6c66d2f2b6525576524308c84eb952bb4bccf664 (diff)
"Fix" persistent failure of BitmapFactoryTest on debug RazrI
-rw-r--r--tests/BitmapFactoryTest.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/BitmapFactoryTest.cpp b/tests/BitmapFactoryTest.cpp
index 216903a6ac..9f1fa478fd 100644
--- a/tests/BitmapFactoryTest.cpp
+++ b/tests/BitmapFactoryTest.cpp
@@ -79,9 +79,8 @@ static void test_cache(skiatest::Reporter* reporter, SkImageCache* cache) {
!= SkImageCache::kPinned_MemoryStatus);
memory = cache->pinCache(ID, &dataStatus);
if (memory != NULL) {
- // Since the cache was thrown away, and ID was not pinned, it should have
- // been purged.
- REPORTER_ASSERT(reporter, SkImageCache::kUninitialized_DataStatus == dataStatus);
+ // The memory block may or may not have survived the purging (at the
+ // memory manager's whim) so we cannot check dataStatus here.
cache->releaseCache(ID);
REPORTER_ASSERT(reporter, cache->getMemoryStatus(ID)
!= SkImageCache::kPinned_MemoryStatus);