win/swarming: Make 64-bit debug component builds work on swarming?

win/swarming: Make 64-bit debug component builds work on swarming?

After https://codereview.chromium.org/896583002/, the isolate step on the
64-bit bot is failing with

    MappingError: Input file C:\b\build\slave\CrWinClang64_dbg_\build\src\out\Debug_x64\x64\msvcp120d.dll doesn't exist

It looks like the x64\msvcp120d.dll only exists in 32-bit builds.
While here, also add the x64 libraries for 32-bit release builds.

BUG=453657, 452057
R=maruel@chromium.org, scottmg@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/8d81593b1a531d950261cbb0d48cdf8464aae442

[Nico, 2015-02-03 20:36:19]

thakis@chromium.org changed reviewers:
+ maruel@chromium.org, scottmg@chromium.org

[Nico, 2015-02-03 20:36:20]

First to stamp wins.

This is way too hard :-(

[M-A Ruel, 2015-02-03 20:40:01]

lgtm

https://codereview.chromium.org/897713002/diff/1/base/base.isolate
File base/base.isolate (right):

https://codereview.chromium.org/897713002/diff/1/base/base.isolate#newcode61
base/base.isolate:61: '<(PRODUCT_DIR)/x64/msvcp120d.dll',
cute

So both 32 and 64 bits versions need to be mapped?

[scottmg, 2015-02-03 20:40:18]

lgtm

https://codereview.chromium.org/897713002/diff/1/base/base.isolate
File base/base.isolate (right):

https://codereview.chromium.org/897713002/diff/1/base/base.isolate#newcode58
base/base.isolate:58: ['OS=="win" and component=="shared_library" and
CONFIGURATION_NAME=="Debug"', {
You might need a /x64/msvcr120.dll for shared_library, Release if such a bot
exists too?

[scottmg, 2015-02-03 20:40:52]

On 2015/02/03 20:40:01, M-A Ruel wrote:
> lgtm
> 
> https://codereview.chromium.org/897713002/diff/1/base/base.isolate
> File base/base.isolate (right):
> 
> https://codereview.chromium.org/897713002/diff/1/base/base.isolate#newcode61
> base/base.isolate:61: '<(PRODUCT_DIR)/x64/msvcp120d.dll',
> cute
> 
> So both 32 and 64 bits versions need to be mapped?

Yes, it's for NaCls x86 binaries on x86 host OS thingy.

[scottmg, 2015-02-03 20:41:11]

On 2015/02/03 20:40:52, scottmg wrote:
> On 2015/02/03 20:40:01, M-A Ruel wrote:
> > lgtm
> > 
> > https://codereview.chromium.org/897713002/diff/1/base/base.isolate
> > File base/base.isolate (right):
> > 
> > https://codereview.chromium.org/897713002/diff/1/base/base.isolate#newcode61
> > base/base.isolate:61: '<(PRODUCT_DIR)/x64/msvcp120d.dll',
> > cute
> > 
> > So both 32 and 64 bits versions need to be mapped?
> 
> Yes, it's for NaCls x86 binaries on x86 host OS thingy.

er, "... on x64 host OS thingy".

[Nico, 2015-02-03 20:44:12]

New patchsets have been uploaded after l-g-t-m from
maruel@chromium.org,scottmg@chromium.org

[Nico, 2015-02-03 20:45:22]

Thanks! Scott, ptal.

https://codereview.chromium.org/897713002/diff/1/base/base.isolate
File base/base.isolate (right):

https://codereview.chromium.org/897713002/diff/1/base/base.isolate#newcode58
base/base.isolate:58: ['OS=="win" and component=="shared_library" and
CONFIGURATION_NAME=="Debug"', {
On 2015/02/03 20:40:18, scottmg wrote:
> You might need a /x64/msvcr120.dll for shared_library, Release if such a bot
> exists too?

Uhhh…added it, but nothing's red because of that. Maybe only some tests need
this in release or something? But since CopyVsRuntimeDlls() installs them, maybe
adding this will save someone else a few hours.

[scottmg, 2015-02-03 20:46:23]

On 2015/02/03 20:45:22, Nico wrote:
> Thanks! Scott, ptal.
> 
> https://codereview.chromium.org/897713002/diff/1/base/base.isolate
> File base/base.isolate (right):
> 
> https://codereview.chromium.org/897713002/diff/1/base/base.isolate#newcode58
> base/base.isolate:58: ['OS=="win" and component=="shared_library" and
> CONFIGURATION_NAME=="Debug"', {
> On 2015/02/03 20:40:18, scottmg wrote:
> > You might need a /x64/msvcr120.dll for shared_library, Release if such a bot
> > exists too?
> 
> Uhhh…added it, but nothing's red because of that. Maybe only some tests need
> this in release or something? But since CopyVsRuntimeDlls() installs them,
maybe
> adding this will save someone else a few hours.

Hm, not sure. Maybe we don't have a config where they're used. LGTM anyway.

[Nico, 2015-02-03 20:46:39]

The CQ bit was checked by thakis@chromium.org

[M-A Ruel, 2015-02-03 20:47:06]

BTW if you want to test it, build locally the test that fails, let's say
base_unittests; add the suffix _run:

ninja -C out/Debug_x64 base_unittests_run
Then
./tools/swarming_client/swarming.py run -I isolateserver.appspot.com \
    -S chromium-swarm.appspot.com --verbose \
    -d os Windows-7-SP1 -d gpu none out/Debug_x64/base_unittests.isolated

as described at
http://www.chromium.org/developers/testing/isolated-testing/for-swes

[commit-bot: I haz the power, 2015-02-03 20:47:16]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/897713002/20001

[commit-bot: I haz the power, 2015-02-03 21:50:32]

Patchset 2 (id:??) landed as
https://crrev.com/8d81593b1a531d950261cbb0d48cdf8464aae442
Cr-Commit-Position: refs/heads/master@{#314410}

[Nico, 2015-02-03 21:50:42]

Committed patchset #2 (id:20001) manually as
8d81593b1a531d950261cbb0d48cdf8464aae442 (presubmit successful).