diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 23:45:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 23:45:05 +0000 |
| commit | c75c62e4a3f1223fd252a835d314f5da0a839d42 (patch) | |
| tree | a71307a1422ff3e22e23c14d654709feec2615b3 /build | |
| parent | d84aed96680c33813f90f9c44484baf17393ded0 (diff) | |
| download | chromium_src-c75c62e4a3f1223fd252a835d314f5da0a839d42.zip chromium_src-c75c62e4a3f1223fd252a835d314f5da0a839d42.tar.gz chromium_src-c75c62e4a3f1223fd252a835d314f5da0a839d42.tar.bz2 | |
Revert 241681 "Let test_isolation_mode default to check on mac."
Still not working on the branded builders, lots of .isolate files still
hardcode "chromium framework" (see http://crbug.com/324911)
> Let test_isolation_mode default to check on mac.
>
> It was set to noop in https://chromiumcodereview.appspot.com/14055005 due to
> issues with xcode. Now that xcode is no longer used, it can be set to check
> again.
>
> BUG=none
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238025
>
> R=maruel@chromium.org
>
> Review URL: https://codereview.chromium.org/92303002
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/110423005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index e92c231..2550375 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -780,10 +780,12 @@ # overriden with GYP_DEFINES. # TODO(maruel): Remove the conditions as more configurations are # supported. + # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code + # again. # NOTE: The check for disable_nacl==0 and component=="static_library" # can't be used here because these variables are not defined yet, but it # is still not supported. - ['OS!="ios" and OS!="android" and chromeos==0', { + ['OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', { 'test_isolation_mode%': 'check', }, { 'test_isolation_mode%': 'noop', |