Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: trunk/src/build/common.gypi

Issue 110423005: Revert 241681 "Let test_isolation_mode default to check on mac." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 }], 773 }],
774 774
775 # Whether tests targets should be run, archived or just have the 775 # Whether tests targets should be run, archived or just have the
776 # dependencies verified. All the tests targets have the '_run' suffix, 776 # dependencies verified. All the tests targets have the '_run' suffix,
777 # e.g. base_unittests_run runs the target base_unittests. The test 777 # e.g. base_unittests_run runs the target base_unittests. The test
778 # target always calls tools/swarming_client/isolate.py. See the script's 778 # target always calls tools/swarming_client/isolate.py. See the script's
779 # --help for more information and the valid --mode values. Meant to be 779 # --help for more information and the valid --mode values. Meant to be
780 # overriden with GYP_DEFINES. 780 # overriden with GYP_DEFINES.
781 # TODO(maruel): Remove the conditions as more configurations are 781 # TODO(maruel): Remove the conditions as more configurations are
782 # supported. 782 # supported.
783 # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code
784 # again.
783 # NOTE: The check for disable_nacl==0 and component=="static_library" 785 # NOTE: The check for disable_nacl==0 and component=="static_library"
784 # can't be used here because these variables are not defined yet, but it 786 # can't be used here because these variables are not defined yet, but it
785 # is still not supported. 787 # is still not supported.
786 ['OS!="ios" and OS!="android" and chromeos==0', { 788 ['OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', {
787 'test_isolation_mode%': 'check', 789 'test_isolation_mode%': 'check',
788 }, { 790 }, {
789 'test_isolation_mode%': 'noop', 791 'test_isolation_mode%': 'noop',
790 }], 792 }],
791 # Whether Android ARM or x86 build uses OpenMAX DL FFT. 793 # Whether Android ARM or x86 build uses OpenMAX DL FFT.
792 ['OS=="android" and ((target_arch=="arm" and arm_version >= 7) or target _arch=="ia32") and android_webview_build==0', { 794 ['OS=="android" and ((target_arch=="arm" and arm_version >= 7) or target _arch=="ia32") and android_webview_build==0', {
793 # Currently only supported on Android ARMv7+, or ia32 795 # Currently only supported on Android ARMv7+, or ia32
794 # without webview. When enabled, this will also enable 796 # without webview. When enabled, this will also enable
795 # WebAudio support on Android ARM and ia32. Default is 797 # WebAudio support on Android ARM and ia32. Default is
796 # enabled. Whether WebAudio is actually available depends 798 # enabled. Whether WebAudio is actually available depends
(...skipping 3984 matching lines...) Expand 10 before | Expand all | Expand 10 after
4781 # settings in target dicts. SYMROOT is a special case, because many other 4783 # settings in target dicts. SYMROOT is a special case, because many other
4782 # Xcode variables depend on it, including variables such as 4784 # Xcode variables depend on it, including variables such as
4783 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4785 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4784 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4786 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4785 # files to appear (when present) in the UI as actual files and not red 4787 # files to appear (when present) in the UI as actual files and not red
4786 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4788 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4787 # and therefore SYMROOT, needs to be set at the project level. 4789 # and therefore SYMROOT, needs to be set at the project level.
4788 'SYMROOT': '<(DEPTH)/xcodebuild', 4790 'SYMROOT': '<(DEPTH)/xcodebuild',
4789 }, 4791 },
4790 } 4792 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698