diff options
| author | nednguyen <nednguyen@google.com> | 2015-11-12 21:30:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 05:31:42 +0000 |
| commit | 7ba1086257b75ef814ddc718cfde95919627694f (patch) | |
| tree | 3719c3c2f7b575b4146049edf10598016bd9b6ee | |
| parent | d87aa1f1aee6ab0181eadaae827a5768981c1ccc (diff) | |
| download | chromium_src-7ba1086257b75ef814ddc718cfde95919627694f.zip chromium_src-7ba1086257b75ef814ddc718cfde95919627694f.tar.gz chromium_src-7ba1086257b75ef814ddc718cfde95919627694f.tar.bz2 | |
Revert of Add missing crcrypto.dll to chrome isolate and enable swarming telemetry_perf_unittest on "Win7 Tes… (patchset #1 id:1 of https://codereview.chromium.org/1443503002/ )
Reason for revert:
Still failing: https://chromium-swarm.appspot.com/user/task/2b17f6b718509910
Original issue's description:
> Add missing crcrypto.dll to chrome isolate and enable swarming telemetry_perf_unittest on "Win7 Tests (dbg)(1)"
>
> *SHERRIF, if telemetry_perf_unittests breaks on "Win7 Tests (dbg)(1)", this patch can be safely reverted.
>
> BUG=554046
>
> Committed: https://crrev.com/a1085bfacf996ee6c10e3c2865be38809427af9f
> Cr-Commit-Position: refs/heads/master@{#359473}
TBR=maruel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=554046
Review URL: https://codereview.chromium.org/1440213002
Cr-Commit-Position: refs/heads/master@{#359494}
| -rw-r--r-- | chrome/chrome.isolate | 7 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 11 |
2 files changed, 4 insertions, 14 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 3311f06..90b3c48 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -110,13 +110,6 @@ ], }, }], - ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/crcrypto.dll', - ], - }, - }], ['OS=="win" and component=="static_library"', { 'variables': { 'files': [ diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index bf23ba8..f4e68fa 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -1493,19 +1493,16 @@ "swarming": { "can_use_on_swarming_builders": true } - }, - { - "isolate_name": "telemetry_perf_unittests", - "name": "telemetry_perf_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } } ], "scripts": [ { "name": "telemetry_unittests", "script": "telemetry_unittests.py" + }, + { + "name": "telemetry_perf_unittests", + "script": "telemetry_perf_unittests.py" } ] }, |