Commit 859f36df authored by Aldo Culquicondor's avatar Aldo Culquicondor Committed by Commit Bot

[VR GL tests] Leave GL implementation undefined

The default implementation supports the GL tests to run on MSan successfully.

Bug: 889186
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I6d0f7bef6ddba8a2b508d1fd0c732dac1fb31205
Reviewed-on: https://chromium-review.googlesource.com/1246292Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Commit-Queue: Aldo Culquicondor <acondor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594411}
parent 79f5bb17
......@@ -9,13 +9,7 @@
namespace vr {
#if defined(MEMORY_SANITIZER)
#define MAYBE_InitializeAndCleanup DISABLED_InitializeAndCleanup
#else
#define MAYBE_InitializeAndCleanup InitializeAndCleanup
#endif
TEST(GlTestEnvironmentTest, MAYBE_InitializeAndCleanup) {
TEST(GlTestEnvironmentTest, InitializeAndCleanup) {
GlTestEnvironment gl_test_environment(gfx::Size(100, 100));
EXPECT_NE(gl_test_environment.GetFrameBufferForTesting(), 0u);
EXPECT_EQ(glGetError(), (GLenum)GL_NO_ERROR);
......
......@@ -22,7 +22,7 @@ VrGlTestSuite::VrGlTestSuite(int argc, char** argv) : VrTestSuite(argc, argv) {}
void VrGlTestSuite::Initialize() {
VrTestSuite::Initialize();
gl::GLImageTestSupport::InitializeGL(gl::kGLImplementationEGLGLES2);
gl::GLImageTestSupport::InitializeGL(base::nullopt);
#if defined(VR_USE_COMMAND_BUFFER)
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
......
......@@ -18,13 +18,7 @@ constexpr gfx::Transform kIdentity;
} // namespace
#if defined(MEMORY_SANITIZER)
#define MAYBE_DrawVrBrowsingMode DISABLED_DrawVrBrowsingMode
#else
#define MAYBE_DrawVrBrowsingMode DrawVrBrowsingMode
#endif
TEST_F(UiPixelTest, MAYBE_DrawVrBrowsingMode) {
TEST_F(UiPixelTest, DrawVrBrowsingMode) {
// Set up scene.
UiInitialState ui_initial_state;
ui_initial_state.in_web_vr = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment