Commit 8300538f by Geoff Lang

Use the static CRT.

Remove a test that expects a crash, it has become flaky. BUG=angle:733 Change-Id: Ia1d4e0b3dd09fa755f678b97b8deceee3ef0a35b Reviewed-on: https://chromium-review.googlesource.com/232963Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent e7c6e43c
...@@ -106,7 +106,10 @@ ...@@ -106,7 +106,10 @@
{ {
'Optimization': '0', # /Od 'Optimization': '0', # /Od
'BasicRuntimeChecks': '3', 'BasicRuntimeChecks': '3',
'RuntimeLibrary': '3', # /MDd (Debug Multithreaded DLL)
# Use the static C runtime to match chromium and make sure we don't depend on
# the dynamic runtime's shared heaps
'RuntimeLibrary': '1', # /MTd (debug static)
}, },
'VCLinkerTool': 'VCLinkerTool':
{ {
...@@ -143,7 +146,10 @@ ...@@ -143,7 +146,10 @@
'VCCLCompilerTool': 'VCCLCompilerTool':
{ {
'Optimization': '2', # /Os 'Optimization': '2', # /Os
'RuntimeLibrary': '2', # /MD (Multithreaded DLL)
# Use the static C runtime to match chromium and make sure we don't depend on
# the dynamic runtime's shared heaps
'RuntimeLibrary': '0', # /MT (nondebug static)
}, },
'VCLinkerTool': 'VCLinkerTool':
{ {
......
...@@ -821,13 +821,3 @@ TYPED_TEST(GLSLTest, ZeroShaderLength) ...@@ -821,13 +821,3 @@ TYPED_TEST(GLSLTest, ZeroShaderLength)
glGetShaderiv(shader, GL_COMPILE_STATUS, &compileResult); glGetShaderiv(shader, GL_COMPILE_STATUS, &compileResult);
EXPECT_NE(compileResult, 0); EXPECT_NE(compileResult, 0);
} }
// Verify that a length value much larger than the source length will crash.
TYPED_TEST(GLSLTest, InvalidShaderLength)
{
GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
const char *sourceArray[1] = { "" };
GLint lengths[1] = { std::numeric_limits<GLint>::max() };
EXPECT_ANY_THROW(glShaderSource(shader, ArraySize(sourceArray), sourceArray, lengths));
}
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