diff options
author | msw <msw@chromium.org> | 2014-09-30 11:44:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 18:44:25 +0000 |
commit | ccbd723031f8f329837321b49599b834ac9e3f1b (patch) | |
tree | c85dde8041d64e34a96984119147419e00975759 /chrome/browser_tests.isolate | |
parent | a84ad99d87e52ec652b237230363fca19954e99a (diff) | |
download | chromium_src-ccbd723031f8f329837321b49599b834ac9e3f1b.zip chromium_src-ccbd723031f8f329837321b49599b834ac9e3f1b.tar.gz chromium_src-ccbd723031f8f329837321b49599b834ac9e3f1b.tar.bz2 |
Revert of Fix swarming of browser_tests and sync_integration_tests on debug windows. (patchset #1 id:1 of https://codereview.chromium.org/617983002/)
Reason for revert:
failure: http://build.chromium.org/p/chromium.linux/builders/Android%20Builder/builds/38020/steps/runhooks/logs/stdio
Error: Command /usr/bin/python src/build/gyp_chromium returned non-zero exit status 1 in /mnt/data/b/build/slave/Android_Builder/build
Updating projects from gyp files...
gyp: Key 'includes' repeated at level 1 with key path '' while reading /mnt/data/b/build/slave/Android_Builder/build/src/chrome/browser_tests.isolate while reading includes of /mnt/data/b/build/slave/Android_Builder/build/src/chrome/tab_capture_end2end_tests.isolate while reading includes of /mnt/data/b/build/slave/Android_Builder/build/src/chrome/chrome_tests.gypi while reading includes of /mnt/data/b/build/slave/Android_Builder/build/src/chrome/chrome.gyp
Original issue's description:
> Fix swarming of browser_tests and sync_integration_tests on debug windows.
>
> They need base.isolate to bring in the VS runtime DLLs.
>
> BUG=414808
> R=maruel@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/ae092e2a50702e43fc8165eaadd84c7f64977945
TBR=maruel@chromium.org,jam@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=414808
Review URL: https://codereview.chromium.org/620603002
Cr-Commit-Position: refs/heads/master@{#297466}
Diffstat (limited to 'chrome/browser_tests.isolate')
-rw-r--r-- | chrome/browser_tests.isolate | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index d35cd8b..ffed8df 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -185,7 +185,4 @@ }, }], ], - 'includes': [ - '../base/base.isolate', - ], } |