commit 8300538f163c9098b495821328fb739684510a7e
author Geoff Lang <geofflang@chromium.org> Wed Dec 03 14:50:26 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Fri Dec 05 16:24:17 2014 +0000
tree 1cfa21deb17bfe33e996c2abd256bb14fa154211
parent e7c6e43c2cb9595ba455df3ff343b691ce223416

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/232963
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi
index ade3543..e8ed141 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -106,7 +106,10 @@
                     {
                         'Optimization': '0',    # /Od
                         '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':
                     {
@@ -143,7 +146,10 @@
                     'VCCLCompilerTool':
                     {
                         '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':
                     {

tests/angle_tests/GLSLTest.cpp

diff --git a/tests/angle_tests/GLSLTest.cpp b/tests/angle_tests/GLSLTest.cpp
index a44d4ff..95dbfb1 100644
--- a/tests/angle_tests/GLSLTest.cpp
+++ b/tests/angle_tests/GLSLTest.cpp
@@ -821,13 +821,3 @@
     glGetShaderiv(shader, GL_COMPILE_STATUS, &compileResult);
     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));
-}