Skip to content

Commit

Permalink
Revert of Add missing crcrypto.dll to chrome isolate and enable swarm…
Browse files Browse the repository at this point in the history
…ing telemetry_perf_unittest on "Win7 Tes… (patchset chromium#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}
  • Loading branch information
nedn authored and Commit bot committed Nov 13, 2015
1 parent d87aa1f commit 7ba1086
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
7 changes: 0 additions & 7 deletions chrome/chrome.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
11 changes: 4 additions & 7 deletions testing/buildbot/chromium.win.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
},
Expand Down

0 comments on commit 7ba1086

Please sign in to comment.