summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-27 19:23:05 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-27 19:23:05 +0000
commit37f95c0b02274e6feb8ba73653d6230ea2a92c8c (patch)
treebfef7ca5b707cec43d5cf47251fc20744fbbf435 /chrome
parentb71d82c8e015fe317b63434d7c0764c935ce9aea (diff)
downloadchromium_src-37f95c0b02274e6feb8ba73653d6230ea2a92c8c.zip
chromium_src-37f95c0b02274e6feb8ba73653d6230ea2a92c8c.tar.gz
chromium_src-37f95c0b02274e6feb8ba73653d6230ea2a92c8c.tar.bz2
Don't build using GPO for the tests EXEs we build during
our official build. BUG=none Review URL: http://codereview.chromium.org/6034011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome_tests.gypi44
1 files changed, 44 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 23dde1c..c945b07 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -250,6 +250,17 @@
'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',
@@ -2405,6 +2416,17 @@
'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',
@@ -2481,6 +2503,17 @@
'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)',
@@ -2521,6 +2554,17 @@
'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',