Merge 70195 - Don't build using GPO for the tests EXEs we build during...

chrome/chrome_tests.gypi

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 232 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/automated_ui_tests/automated_ui_test_interactive_test.cc',
         'test/automated_ui_tests/automated_ui_tests.cc',
         'test/automated_ui_tests/automated_ui_tests.h',
       ],
       'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
         ['OS=="linux"', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'conditions': [
@@ skipping 2135 matching lines @@
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/startup/feature_startup_test.cc',
         'test/startup/shutdown_test.cc',
         'test/startup/startup_test.cc',
       ],
       'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
@@ skipping 56 matching lines @@
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/reliability/page_load_test.cc',
         'test/reliability/page_load_test.h',
         'test/reliability/reliability_test_suite.h',
         'test/reliability/run_all_unittests.cc',
       ],
       'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '<(allocator_target)',
           ],
           'configurations': {
             'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
@@ skipping 20 matching lines @@
         'test_support_common',
         'test_support_ui',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/page_cycler/page_cycler_test.cc',
       ],
       'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
@@ skipping 1050 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: