diff --git a/tools/perf/record_wpr b/tools/perf/record_wpr index 465163e9423906..dfe3d4db59f0d3 100755 --- a/tools/perf/record_wpr +++ b/tools/perf/record_wpr @@ -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. diff --git a/tools/perf/run_benchmark b/tools/perf/run_benchmark index 0a6e183cc5ab5d..91095101cbae1e 100755 --- a/tools/perf/run_benchmark +++ b/tools/perf/run_benchmark @@ -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. diff --git a/tools/perf/run_telemetry_tests b/tools/perf/run_telemetry_tests index 0abbd8a94b5c50..0d970e4f16f9db 100755 --- a/tools/perf/run_telemetry_tests +++ b/tools/perf/run_telemetry_tests @@ -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. diff --git a/tools/perf/run_tests b/tools/perf/run_tests index 152fa8575abd69..2ad55a05b14379 100755 --- a/tools/perf/run_tests +++ b/tools/perf/run_tests @@ -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. diff --git a/tools/perf/scripts_smoke_unittest.py b/tools/perf/scripts_smoke_unittest.py index 374ec22fb3a2c6..d99bc0b29e3f6e 100644 --- a/tools/perf/scripts_smoke_unittest.py +++ b/tools/perf/scripts_smoke_unittest.py @@ -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) @@ -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