Fix ParseConfigs_ViaParsing test when skia_angle=1

The handling of angle-gl changes with SK_ANGLE. We don't have any bots
that test this particular combination, but I see it all the time while
running DM for other things.

Previously considered changing things so that the config parsing results
are consistent, regardless of GYP_DEFINES, but this is much simpler (and
more consistent with the other code we already have for testing config
parsing).

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2183323004

Review-Url: https://codereview.chromium.org/2183323004
This commit is contained in:
brianosman 2016-07-27 09:21:51 -07:00 committed by Commit bot
parent bb0ab4df70
commit 577e025ca6

View File

@ -305,8 +305,12 @@ DEF_TEST(ParseConfigs_ViaParsing, reporter) {
} expectedConfigs[] = {
{"8888", {"a", "b", "c"}},
{"gpu", {"zz", "qq", nullptr}},
{"angle-gl", {"a", nullptr, nullptr}} // The angle-gl tag is only tag that contains
// hyphen.
#if SK_ANGLE
{ "gpu",{ "a", nullptr, nullptr } } // With SK_ANGLE, angle-gl becomes gpu(api=angle-gl)
#else
{ "angle-gl",{ "a", nullptr, nullptr } } // The angle-gl tag is only tag that contains
// hyphen.
#endif
};
for (int i = 0; i < config1.count(); ++i) {
REPORTER_ASSERT(reporter, configs[i]->getTag().equals(config1[i]));