Fix logic for warningsAsErrors

warningsAsErrors should be falsed on Windows 7 because we may legitimately get a warning about loading the old d3dcompiler DLL on that platform. The logic for this was reversed in the initial change. This change flips the logic, changes the cutoff OS version, and always sets the flag to something. Bug: chromium:920704 Change-Id: Ibf8a7c9a48bffc183479b7614148d6c00c122a07 Reviewed-on: https://chromium-review.googlesource.com/c/1496015 Commit-Queue: Bruce Dawson <brucedawson@chromium.org> Reviewed-by: Jamie Madill <jmadill@google.com>

Fix logic for warningsAsErrors
ffa277a1 · Bruce Dawson · Commit Bot · 5546fb4f · ffa277a1
Commit ffa277a1 authored Feb 28, 2019 by Bruce Dawson Committed by Commit Bot Mar 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

ANGLETest.cpp src/tests/test_utils/ANGLETest.cpp +3 -5

No files found.
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -1281,11 +1281,9 @@ void ANGLETestBase::ignoreD3D11SDKLayersWarnings()
 void ANGLETestBase::treatPlatformWarningsAsErrors()
 {
 #if defined(ANGLE_PLATFORM_WINDOWS)
-    // Disable on Windows 7-8. We are falling back to the old compiler DLL.
+    // Only do warnings-as-errors on 8 and above. We may fall back to the old
-    if (!IsWindows10OrGreater())
+    // compiler DLL on Windows 7.
-    {
+    mPlatformContext.warningsAsErrors = IsWindows8OrGreater();
-        mPlatformContext.warningsAsErrors = true;
-    }
 #endif  // defined(ANGLE_PLATFORM_WINDOWS)
 }