Revert 210206 "Revert 210037 "Revert "Disable goma on win x64 tr..."
Revert 210206 "Revert 210037 "Revert "Disable goma on win x64 tr..."

The server-side is fixed, trying enabling again.

> Revert 210037 "Revert "Disable goma on win x64 trybots for now.""
> 
> Slightly different compiler mismatches as of 4 July.
> 
> 
> n_slave' '..\\..\\..\\scripts\\slave\\compile.py' '--solution' 'out.sln' '--target' 'Release_x64' '--build-dir' 'src/out' '--clobber' '--build-tool=ninja' '--compiler=goma' '--clobber-post-fail' '--' 'chromium_builder_tests' 'All'
>  in dir E:\b\build\slave\win\build (timeout 2400 secs) (maxTime 28800 secs)
>  watching logfiles {}
>  argv: ['python_slave', '..\\..\\..\\scripts\\slave\\compile.py', '--solution', 'out.sln', '--target', 'Release_x64', '--build-dir', 'src/out', '--clobber', '--build-tool=ninja', '--compiler=goma', '--clobber-post-fail', '--', 'chromium_builder_tests', 'All']
>  environment:
>   APPDATA=C:\Users\chrome-bot\AppData\Roaming
>   AWS_CREDENTIAL_FILE=E:\b\build\site_config\.boto
>   BOTO_CONFIG=E:\b\build\site_config\.boto
>   CHROME_HEADLESS=1
>   COMPUTERNAME=VM770-M4
>   COMSPEC=C:\Windows\system32\cmd.exe
>   HOMEDRIVE=C:
>   HOMEPATH=\Users\chrome-bot
>   LOCALAPPDATA=C:\Users\chrome-bot\AppData\Local
>   LOGNAME=chrome-bot
>   NUMBER_OF_PROCESSORS=8
>   OS=Windows_NT
>   PATH=E:\b\depot_tools;E:\b\depot_tools\python_bin;C:\Windows\system32;C:\Windows\system32\WBEM;E:\b\build_internal\tools
>   PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC
>   PROCESSOR_ARCHITECTURE=x86
>   PROCESSOR_ARCHITEW6432=AMD64
>   PROGRAMFILES=C:\Program Files (x86)
>   PROGRAMW6432=C:\Program Files
>   PWD=E:\b\build\slave\win\build
>   PYTHONPATH=E:\b\build\site_config;E:\b\build\scripts;E:\b\build\scripts\release;E:\b\build\third_party;E:\b\build_internal\site_config;E:\b\build_internal\symsrc;E:\b\build\slave;E:\b\build\third_party\buildbot_slave_8_4;E:\b\build\third_party\twisted_10_2;
>   SYSTEMDRIVE=C:
>   SYSTEMROOT=C:\Windows
>   TEMP=C:\Users\CHROME~2\AppData\Local\Temp
>   TMP=C:\Users\CHROME~2\AppData\Local\Temp
>   USERDOMAIN=GOLO
>   USERNAME=chrome-bot
>   USERPROFILE=C:\Users\chrome-bot
>   VS100COMNTOOLS=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\
>   VS110COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\
>   WINDIR=C:\Windows
>  using PTY: False
> 
> E:\b\depot_tools\python_bin\python_slave.exe E:\b\build\goma\goma_ctl.py start
> GOMA version 6fef1ca7441cc4486e45ae165aeb73d79fe2cd3e@1372743529
> GOMA parameters:
> GOMA_COMPILER_PROXY_THREADS=64
> GOMA_COMPILER_PROXY_HTTP_THREADS=16
> GOMA_HTTP_SOCKET_READ_TIMEOUT_SECS=90.0
> GOMA_RPC_EXTRA_PARAMS=?win
> GOMA_USE_SSL=true
> GOMA_API_KEY_FILE=E:\b\build\goma\goma.key
> GOMA_MAX_SUBPROCS_LOW=3
> GOMA_MAX_SUBPROCS=12
> compiler proxy status: http://127.0.0.1:8088 ok
> 
> Now goma is ready!
> 
> chdir to E:\b\build\slave\win\build\src
> Removing E:\b\build\slave\win\build\src\out\Release_x64
> using goma
> build.ninja modified in compile.py for goma:
> 
>     cl_x86 = "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\cl.exe"
>  -> cl_x86 = E:\b\build\goma\gomacc.exe "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\cl.exe"
>     cl_x64 = "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\amd64\cl.exe"
>  -> cl_x64 = E:\b\build\goma\gomacc.exe "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\amd64\cl.exe"
>     cc = cl.exe
>  -> cc = E:\b\build\goma\gomacc.exe cl.exe
>     cxx = cl.exe
>  -> cxx = E:\b\build\goma\gomacc.exe cl.exe
>     cc_host = cl.exe
>  -> cc_host = E:\b\build\goma\gomacc.exe cl.exe
>     cxx_host = cl.exe
>  -> cxx_host = E:\b\build\goma\gomacc.exe cl.exe
> Environment variables set in compile.py:
>   GOMA_API_KEY_FILE=E:\b\build\goma\goma.key
>   GOMA_RPC_EXTRA_PARAMS=?win
>   NO_NACL_GOMA=true
>   PATH=E:\b\build\goma;E:\b\depot_tools;E:\b\depot_tools\python_bin;C:\Windows\system32;C:\Windows\system32\WBEM;E:\b\build_internal\tools
> 
> 
> ninja -C E:\b\build\slave\win\build\src\out\Release_x64 chromium_builder_tests All -j50
> ninja: Entering directory `E:\b\build\slave\win\build\src\out\Release_x64'
> ...
> [294/19357] LIB obj\third_party\libjpeg_turbo\libjpeg.lib
> [295/19357] RULE Generating version information in "gen/cloud_print/cloud_print_service_setup_exe_version.rc"
> [296/19357] RULE Generating version information in "gen/cloud_print/gcp_portmon64_dll_version.rc"
> FAILED: E:\b\depot_tools\python_bin\python.exe gyp-win-tool link-wrapper environment.x64 lib.exe /nologo /ignore:4221 /OUT:obj\third_party\libjpeg_turbo\libjpeg.lib @obj\third_party\libjpeg_turbo\libjpeg.lib.rsp
> obj\third_party\libjpeg_turbo\libjpeg.jcomapi.obj : fatalerror LNK1112: module machine type 'x64' conflicts with target machine type 'X86'
> 
> ninja: build stopped: subcommand failed.
> 
> E:\b\depot_tools\python_bin\python_slave.exe E:\b\build\goma\goma_ctl.py stop
> Killing compiler proxy.
> GOMA parameters:
> GOMA_COMPILER_PROXY_THREADS=64
> GOMA_COMPILER_PROXY_HTTP_THREADS=16
> GOMA_HTTP_SOCKET_READ_TIMEOUT_SECS=90.0
> GOMA_RPC_EXTRA_PARAMS=?win
> GOMA_USE_SSL=true
> GOMA_API_KEY_FILE=E:\b\build\goma\goma.key
> GOMA_MAX_SUBPROCS_LOW=3
> GOMA_MAX_SUBPROCS=12
> compiler proxy status: http://127.0.0.1:8088 quit!
> program finished with exit code 1
> elapsedTime=255.574000
> 
> > Revert "Disable goma on win x64 trybots for now."
> > 
> > This reverts commit e568e8db27c271625a3208315db88af0852ced59.
> > 
> > R=scottmg@chromium.org
> > BUG=
> > 
> > Review URL: https://chromiumcodereview.appspot.com/18348022
> 
> BUG=256940
> TBR=joi@chromium.org
> 
> Review URL: https://codereview.chromium.org/18689005

BUG=256940
TBR=iannucci@chromium.org

Review URL: https://codereview.chromium.org/18783002

git-svn-id: 239fca9b83025a0b6f823aeeca02ba5be3d9fd76@210313 0039d316-1c4b-4281-b951-d872f2087c98

eunchong/build,eunchong/build,eunchong/build,eunchong/build