Skip to content

Commit

Permalink
Convert Telemetry test scripts to use vpython
Browse files Browse the repository at this point in the history
Bug:805552
Change-Id: Ifd631d785f309d9f46b401daaec44d0cf89a8631

Pinpoint tryjobs:

Android: https://pinpoint-dot-chromeperf.appspot.com/job/14c63ffa440000
Linux: https://pinpoint-dot-chromeperf.appspot.com/job/10787612440000
Mac: https://pinpoint-dot-chromeperf.appspot.com/job/1499113a440000
Win: https://pinpoint-dot-chromeperf.appspot.com/job/1381251a440000
Change-Id: Ifd631d785f309d9f46b401daaec44d0cf89a8631
Reviewed-on: https://chromium-review.googlesource.com/956203
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542053}
  • Loading branch information
nedn authored and Commit Bot committed Mar 9, 2018
1 parent 64c6dc0 commit a3da58f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion tools/perf/record_wpr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/run_benchmark
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/run_telemetry_tests
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/run_tests
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Expand Down
8 changes: 2 additions & 6 deletions tools/perf/scripts_smoke_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ class ScriptsSmokeTest(unittest.TestCase):

perf_dir = os.path.dirname(__file__)

def RunPerfScript(self, command, venv=False):
def RunPerfScript(self, command):
main_command = [sys.executable]
# TODO(crbug.com/805552): Remove if/else block
if venv:
main_command = ['vpython']
args = main_command + command.split(' ')
proc = subprocess.Popen(args, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, cwd=self.perf_dir)
Expand Down Expand Up @@ -50,8 +47,7 @@ def testRunRecordWprHelp(self):

@decorators.Disabled('chromeos') # crbug.com/814068
def testRunRecordWprList(self):
return_code, stdout = self.RunPerfScript('record_wpr --list-benchmarks',
venv=True)
return_code, stdout = self.RunPerfScript('record_wpr --list-benchmarks')
# TODO(nednguyen): Remove this once we figure out why importing
# small_profile_extender fails on Android dbg.
# crbug.com/561668
Expand Down

0 comments on commit a3da58f

Please sign in to comment.