Revert 195613 "Reenable test_isolate_mode=check by default on OSX."
Speculating this is the cause of these OS X release builder hangs:
http://build.chromium.org/p/chromium.mac/builders/Mac%20Builder/builds/11074/steps/compile/logs/stdio
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/12424/steps/compile/logs/stdio
Relevant compile output:
=== BUILD AGGREGATE TARGET base_unittests_run OF PROJECT base WITH CONFIGURATION Release ===
Check dependencies
PhaseScriptExecution "Rule \"isolate\"" ../xcodebuild/base.build/Release/base_unittests_run.build/Script-5816EF986C49795B2FAB6114.sh
cd /Volumes/data/b/build/slave/cr-mac-rel/build/src/base
/bin/sh -c /Volumes/data/b/build/slave/cr-mac-rel/build/src/base/../xcodebuild/base.build/Release/base_unittests_run.build/Script-5816EF986C49795B2FAB6114.sh
python ../tools/swarm_client/isolate.py check --outdir "/Volumes/data/b/build/slave/cr-mac-rel/build/src/base/../xcodebuild/Release/ " --variable PRODUCT_DIR "/Volumes/data/b/build/slave/cr-mac-rel/build/src/base/../xcodebuild/Release " --variable "OS=mac" --result "/Volumes/data/b/build/slave/cr-mac-rel/build/src/base/../xcodebuild/Release/base_unittests.isolated" --isolate "base_unittests.isolate" --ignore_broken_items
command timed out: 1200 seconds without output, attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=4205.819860
> Reenable test_isolate_mode=check by default on OSX.
>
> This is not necessary to default to noop anymore. Defaulting to check was
> disabled on OSX because a problem during archival with symlink path case. This
> was fixed inside swarm_client.
>
> [email protected]
> BUG=98637
>
> Review URL: https://chromiumcodereview.appspot.com/14404011
[email protected]
Review URL: https://codereview.chromium.org/13996018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195664 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index e11be553..9afe9e8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -636,7 +636,7 @@
# 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.
- ['inside_chromium_build==1 and OS!="ios" and OS!="android" and chromeos==0', {
+ ['inside_chromium_build==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', {
'test_isolation_mode%': 'check',
}, {
'test_isolation_mode%': 'noop',
