diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PaintTest.cpp | 4 | ||||
| -rw-r--r-- | tests/ReadWriteAlphaTest.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 2a84e4cdbb..ed790764ab 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -29,8 +29,8 @@ static void test_copy(skiatest::Reporter* reporter) { #ifdef SK_BUILD_FOR_ANDROID // the copy constructor should preserve the Generation ID - int32_t paintGenID = paint.getGenerationID(); - int32_t copiedPaintGenID = copiedPaint.getGenerationID(); + uint32_t paintGenID = paint.getGenerationID(); + uint32_t copiedPaintGenID = copiedPaint.getGenerationID(); REPORTER_ASSERT(reporter, paintGenID == copiedPaintGenID); REPORTER_ASSERT(reporter, !memcmp(&paint, &copiedPaint, sizeof(paint))); #endif diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp index a3bf5dee98..78306693db 100644 --- a/tests/ReadWriteAlphaTest.cpp +++ b/tests/ReadWriteAlphaTest.cpp @@ -7,7 +7,7 @@ */ // This test is specific to the GPU backend. -#if SK_SUPPORT_GPU +#if SK_SUPPORT_GPU && !defined(SK_BUILD_FOR_ANDROID) #include "Test.h" #include "SkGpuDevice.h" @@ -110,9 +110,7 @@ static void ReadWriteAlphaTest(skiatest::Reporter* reporter, GrContextFactory* f } } -#ifndef SK_BUILD_FOR_ANDROID #include "TestClassDef.h" DEFINE_GPUTESTCLASS("ReadWriteAlpha", ReadWriteAlphaTestClass, ReadWriteAlphaTest) #endif -#endif |