From ba7cda936dc64dd2fdc982f27b9334880ddb314b Mon Sep 17 00:00:00 2001 From: dcaiafa Date: Mon, 20 Apr 2015 16:51:05 -0700 Subject: [PATCH] Revert of Telemetry: Fix a bad path in win_platform_backend. (patchset #1 id:1 of https://codereview.chromium.org/1058853003/) Reason for revert: Speculatively revert to address: https://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%281%29/builds/55265 No tests actually fail, but the test process still returns 1 which causes the failure: 828 tests run, 0 failures. started: Mon Apr 20 13:08:19 2015 ended: Mon Apr 20 13:50:19 2015 duration: 41 mins, 59 secs status: FAILURE status reason: return code was 1. This is the only CL in the blame-list that has anything to do with telemetry tests. Original issue's description: > Telemetry: Fix a bad path in win_platform_backend. > > BUG= > > Committed: https://crrev.com/0ede054b94179ad1ba09634dcecf4aa471f13b72 > Cr-Commit-Position: refs/heads/master@{#325884} TBR=dtu@chromium.org,erikchen@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/1100553005 Cr-Commit-Position: refs/heads/master@{#325944} --- .../telemetry/telemetry/core/platform/win_platform_backend.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/telemetry/telemetry/core/platform/win_platform_backend.py b/tools/telemetry/telemetry/core/platform/win_platform_backend.py index 938414e87d3a1a..5be2428c3bef61 100644 --- a/tools/telemetry/telemetry/core/platform/win_platform_backend.py +++ b/tools/telemetry/telemetry/core/platform/win_platform_backend.py @@ -60,8 +60,7 @@ def _InstallWinRing0(): # Check for WinRing0 and download if needed. if not (os.path.exists(dll_path) and os.path.exists(driver_path)): - win_binary_dir = os.path.join( - path.GetTelemetryDir(), 'bin', 'win', 'AMD64') + win_binary_dir = os.path.join(path.GetTelemetryDir(), 'bin', 'win') zip_path = os.path.join(win_binary_dir, 'winring0.zip') cloud_storage.GetIfChanged(zip_path, bucket=cloud_storage.PUBLIC_BUCKET) try: