diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 22:38:26 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 22:38:26 +0000 |
| commit | 8b08f0eaeb0f95668bbc9cf2477676f0028a0f46 (patch) | |
| tree | 38c4fc15f1cf59b39879ef90457a4e1cae4731ce | |
| parent | 466c986d6754aa9fb92edc781cd3eade36c41ed1 (diff) | |
| download | chromium_src-8b08f0eaeb0f95668bbc9cf2477676f0028a0f46.zip chromium_src-8b08f0eaeb0f95668bbc9cf2477676f0028a0f46.tar.gz chromium_src-8b08f0eaeb0f95668bbc9cf2477676f0028a0f46.tar.bz2 | |
Revert 238036 "Revert 238025 "Let test_isolation_mode default to..."
The change was reverted because swarming didn't work with branded builds,
but r238430 should've fixed that. Relanding. (There are no branded trybots.)
> Revert 238025 "Let test_isolation_mode default to check on mac."
>
> Failing on "Google Chrome Mac" (http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/15042)
> In the error log, tools/swarming_client/isolate.py says "File /Volumes/data/b/build/slave/google-chrome-rel-mac/build/src/out/Release/Chromium Framework.framework doesn't exist"
>
> > 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
> >
> > Review URL: https://codereview.chromium.org/92303002
>
> TBR=thakis@chromium.org
>
> Review URL: https://codereview.chromium.org/98383002
TBR=hashimoto@chromium.org
Review URL: https://codereview.chromium.org/102963003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238466 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index c34a5bc..0eba12b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -748,12 +748,10 @@ # 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!="mac" and OS!="ios" and OS!="android" and chromeos==0', { + ['OS!="ios" and OS!="android" and chromeos==0', { 'test_isolation_mode%': 'check', }, { 'test_isolation_mode%': 'noop', |