Merging with trunk

(bzr r4253.4.3)

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/test_icon_loader.cpp b/tests/test_icon_loader.cpp
index 5223efc24..852f88701 100644
--- a/tests/test_icon_loader.cpp
+++ b/tests/test_icon_loader.cpp
@@ -104,7 +104,7 @@ TEST_F(TestIconLoader, TestGetDefault)
 EXPECT_EQ(&icon_loader, &IconLoader::GetDefault());
 }
 
-TEST_F(TestIconLoader, TestGetOneIcon)
+TEST_F(TestIconLoader, UNSTABLE_TEST (TestGetOneIcon))
 {
 LoadResult load_result;
 
@@ -176,7 +176,7 @@ TEST_F(TestIconLoader, TestGetOneIconManyTimes)
 CheckResults(results);
 }
 
-TEST_F(TestIconLoader, TestGetManyIcons)
+TEST_F(TestIconLoader, UNSTABLE_TEST (TestGetManyIcons))
 {
 std::vector<LoadResult> results;
 int i = 0;
@@ -198,7 +198,7 @@ TEST_F(TestIconLoader, TestGetManyIcons)
 CheckResults(results);
 }
 
-TEST_F(TestIconLoader, TestCancelSome)
+TEST_F(TestIconLoader, UNSTABLE_TEST (TestCancelSome))
 {
 std::vector<LoadResult> results;
 std::vector<IconLoader::Handle> handles;