diff options
author | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-25 21:03:04 +0000 |
---|---|---|
committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-25 21:03:04 +0000 |
commit | ceb2a0311fa2ad01b93ce3488515a34486ae7a49 (patch) | |
tree | f12dd0771aa77f296a54afea1626b1889f8a9aae | |
parent | 6eb0d62cc31463b5af4cbed5c3058a3161c58d2d (diff) |
Temporarily disable failing GM tests on Android
- fontscaler - this test fails due to a GL driver bug fixed in Jelly Bean
- drawbitmaprect - suspect this is also a driver bug
- shadertext - causes the device to reboot
Review URL: https://codereview.appspot.com/6330057
git-svn-id: http://skia.googlecode.com/svn/trunk@4336 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | gm/drawbitmaprect.cpp | 3 | ||||
-rw-r--r-- | gm/fontscaler.cpp | 4 | ||||
-rw-r--r-- | gm/shadertext.cpp | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 64e4cf3d4e..fdd0726382 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -184,8 +184,9 @@ private: ////////////////////////////////////////////////////////////////////////////// +#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new DrawBitmapRectGM; } static GMRegistry reg(MyFactory); - +#endif } diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp index b331bde830..b5a0174099 100644 --- a/gm/fontscaler.cpp +++ b/gm/fontscaler.cpp @@ -85,9 +85,9 @@ private: }; ////////////////////////////////////////////////////////////////////////////// - +#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new FontScalerGM; } static GMRegistry reg(MyFactory); - +#endif } diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp index 0f2a9e9d32..0eb7b34938 100644 --- a/gm/shadertext.cpp +++ b/gm/shadertext.cpp @@ -208,7 +208,8 @@ private: /////////////////////////////////////////////////////////////////////////////// +#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new ShaderTextGM; } static GMRegistry reg(MyFactory); - +#endif } |