diff options
| author | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 18:26:25 +0000 |
|---|---|---|
| committer | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 18:26:25 +0000 |
| commit | eee70d4e1be5a085af05ecb74bf421929b0d5915 (patch) | |
| tree | ffa343dd21387563f37b26b334d114b2eb5b98df /tools/clang | |
| parent | 300d815d0d1bf264b3b7b023061296b32d75bb53 (diff) | |
| download | chromium_src-eee70d4e1be5a085af05ecb74bf421929b0d5915.zip chromium_src-eee70d4e1be5a085af05ecb74bf421929b0d5915.tar.gz chromium_src-eee70d4e1be5a085af05ecb74bf421929b0d5915.tar.bz2 | |
Revert 188113 "Revert 188080 "Add vm672-m1 (the new Mac ASan bui..."
> Revert 188080 "Add vm672-m1 (the new Mac ASan builder) to the li..."
>
> This CL seems to be causing content_unittests flakiness on MAC ASAN Tests (1): http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%281%29/builds/7515/steps/content_unittests/logs/stdio
>
> > Add vm672-m1 (the new Mac ASan builder) to the list of machines using pinned Clang version.
> >
> > BUG=170629
> > TBR=thakis
> > Review URL: https://codereview.chromium.org/12729006
>
> TBR=glider@chromium.org
> Review URL: https://codereview.chromium.org/12545038
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/12833010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
| -rwxr-xr-x | tools/clang/scripts/update.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 09648ba..ed316be 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -91,10 +91,14 @@ function on_asan_mac_host { return 1 fi HOST="$(hostname -s)" - # Chrome Mac ASan Builder. + # Old (10.6) Chrome Mac ASan Builder. Kept here till we fully migrate to 10.8 if [[ "${HOST}" == "vm633-m1" ]]; then return 0 fi + # 10.8 Chrome Mac ASan Builder. + if [[ "${HOST}" == "vm672-m1" ]]; then + return 0 + fi # Chrome Mac ASan LKGR. if [[ "${HOST}" == "mini11-a1" ]]; then return 0 |