Merge "Disable font test temporarily" into oc-dev

am: 152f6c8e04 Change-Id: I548bee7f45bfc7f364327233c4b4e1faf75139a1
2017-05-12 11:25:12 +00:00
parent a2f880d453 152f6c8e04
commit 38b3c15d4a
3 changed files with 2 additions and 1 deletions
--- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont.ttf
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont.ttf
--- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont2.ttf
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont2.ttf
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
@@ -389,7 +389,8 @@ public class RenderTests extends RenderTestBase {
        assertTrue(sRenderMessages.isEmpty());
    }

-    @Test
+    //@Test
+    // Temporarily disabled (b/37725933)
    public void testFonts() throws ClassNotFoundException {
        // TODO: styles seem to be broken in TextView
        renderAndVerify("fonts_test.xml", "font_test.png");