Skip to content

A
angle
Commit 7ef89571 by Corentin Wallez
Options

EGLContextCompatibility: suppress test on Linux non-standalone

The tests turn out to fail before we have a context current on AMD so we cannot use isAMD and have to resort to disabling for all Linuxes on the FYI bots. Using MAYBE like Chrome doesn't seem to work with TEST_P. BUG=angleproject:892 Change-Id: Ibabd2c359ce55c7677af0f8bd5723f845935f2be Reviewed-on: https://chromium-review.googlesource.com/284872Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/284749
parent c3b57529
Showing with 16 additions and 11 deletions
build/common_defines.gypi
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
{ {
'component%': 'static_library', 'component%': 'static_library',
'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1', 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
# build/gyp_angle sets this to 1.
'angle_standalone%': '0',
'angle_build_winrt%': '0', 'angle_build_winrt%': '0',
'angle_build_winphone%': '0', 'angle_build_winphone%': '0',
'angle_build_winrt_app_type_revision%': '8.1', 'angle_build_winrt_app_type_revision%': '8.1',
...@@ -53,6 +56,13 @@ ...@@ -53,6 +56,13 @@
'<(windows_sdk_path)/Include/um', '<(windows_sdk_path)/Include/um',
], ],
}], }],
['angle_standalone==1',
{
'defines':
[
'ANGLE_STANDALONE_BUILD',
],
}],
], ],
'msvs_settings': 'msvs_settings':
{ {
......
src/tests/egl_tests/EGLContextCompatibilityTest.cpp
...@@ -175,15 +175,6 @@ class EGLContextCompatibilityTest : public ANGLETest ...@@ -175,15 +175,6 @@ class EGLContextCompatibilityTest : public ANGLETest
eglMakeCurrent(mDisplay, surface, surface, context); eglMakeCurrent(mDisplay, surface, surface, context);
ASSERT_EGL_SUCCESS(); ASSERT_EGL_SUCCESS();
#ifdef ANGLE_PLATFORM_LINUX
// TODO(cwallez): figure out why this is broken on Linux/AMD.
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
return;
}
#endif
glViewport(0, 0, 500, 500); glViewport(0, 0, 500, 500);
glClearColor(0.0f, 0.0f, 1.0f, 1.0f); glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
...@@ -201,6 +192,9 @@ class EGLContextCompatibilityTest : public ANGLETest ...@@ -201,6 +192,9 @@ class EGLContextCompatibilityTest : public ANGLETest
} }
}; };
// TODO(cwallez) makeCurrent fails for some config on Linux/AMD
#if !defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_STANDALONE_BUILD)
// The test is split in several subtest so that simple cases // The test is split in several subtest so that simple cases
// are tested separately. Also each surface types are not tested // are tested separately. Also each surface types are not tested
// together. // together.
...@@ -291,4 +285,6 @@ TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig) ...@@ -291,4 +285,6 @@ TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig)
} }
} }
#endif // !defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_STANDALONE_BUILD)
ANGLE_INSTANTIATE_TEST(EGLContextCompatibilityTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL()); ANGLE_INSTANTIATE_TEST(EGLContextCompatibilityTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
src/tests/tests.gyp
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
'includes': 'includes':
[ [
'deqp.gypi', 'deqp.gypi',
'../../build/common_defines.gypi',
], ],
'variables': 'variables':
{ {
'angle_build_conformance_tests%': '0', 'angle_build_conformance_tests%': '0',
'angle_build_deqp_tests%': '0', 'angle_build_deqp_tests%': '0',
# build/gyp_angle sets this to 1.
'angle_standalone%': 0,
'rapidjson_include_dir': 'third_party/rapidjson/include', 'rapidjson_include_dir': 'third_party/rapidjson/include',
'rapidjson_headers': 'rapidjson_headers':
......
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