diff options
| author |  halcanary <halcanary@google.com> | 2016-04-04 12:14:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 12:14:46 -0700 |
| commit | 3c4521a196d7ead2a984826070be377d524c2c51 (patch) | |
| tree | aba6a41444e4fb3fb85a1ca8d254f775680897fa | |
| parent | 85ad730113879b5df1170178aa01368ffddc6354 (diff) | |
Fix ParseConfigs_OutParam tests
Review URL: https://codereview.chromium.org/1857923002
| -rw-r--r-- | tests/TestConfigParsing.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp index 25edec480e..f718994b56 100644 --- a/tests/TestConfigParsing.cpp +++ b/tests/TestConfigParsing.cpp @@ -111,37 +111,36 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { REPORTER_ASSERT(reporter, !configs[17]->asConfigGpu()); REPORTER_ASSERT(reporter, !configs[18]->asConfigGpu()); REPORTER_ASSERT(reporter, !configs[19]->asConfigGpu()); - REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu()); - REPORTER_ASSERT(reporter, !configs[25]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType() + REPORTER_ASSERT(reporter, !configs[24]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); - REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getProfileType() + REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getProfileType() == kLinear_SkColorProfileType); - REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getColorType() + REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType() == kN32_SkColorType); - REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getProfileType() + REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getProfileType() == kSRGB_SkColorProfileType); #if SK_ANGLE #ifdef SK_BUILD_FOR_WIN + REPORTER_ASSERT(reporter, configs[20]->asConfigGpu()); +#else + REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu()); +#endif REPORTER_ASSERT(reporter, configs[21]->asConfigGpu()); #else + REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu()); REPORTER_ASSERT(reporter, !configs[21]->asConfigGpu()); #endif +#if SK_COMMAND_BUFFER REPORTER_ASSERT(reporter, configs[22]->asConfigGpu()); #else - REPORTER_ASSERT(reporter, !configs[21]->asConfigGpu()); REPORTER_ASSERT(reporter, !configs[22]->asConfigGpu()); #endif -#if SK_COMMAND_BUFFER +#if SK_MESA REPORTER_ASSERT(reporter, configs[23]->asConfigGpu()); #else REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu()); #endif -#if SK_MESA - REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()); -#else - REPORTER_ASSERT(reporter, !configs[24]->asConfigGpu()); -#endif #endif } |