Accept a second form of WARP Test renderer string.
On our Renderer test, we would be overly restrictive in the forms
of Renderer string we would accept for WARP. On this machine, it
returns a different string than the one we had in the test. Expand
the test to accept both.
BUG=angle:769
Change-Id: If27644d32d6d7d0eff77ff9cca81faee3b2be4e1
Reviewed-on: https://chromium-review.googlesource.com/221066
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
diff --git a/tests/angle_tests/RendererTest.cpp b/tests/angle_tests/RendererTest.cpp
index ab85d1f..473c28c 100644
--- a/tests/angle_tests/RendererTest.cpp
+++ b/tests/angle_tests/RendererTest.cpp
@@ -46,7 +46,9 @@
// Ensure that the renderer uses WARP, if we requested it.
if (fixtureType.GetRequestedRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_WARP_ANGLE)
{
- ASSERT_NE(rendererString.find(std::string("microsoft basic render")), std::string::npos);
+ auto basicRenderPos = rendererString.find(std::string("microsoft basic render"));
+ auto softwareAdapterPos = rendererString.find(std::string("software adapter"));
+ ASSERT_TRUE(basicRenderPos != std::string::npos || softwareAdapterPos != std::string::npos);
}
// Ensure that the renderer string contains GL ES 3.0, if we requested a GL ES 3.0