Commit 157db054 authored by Caleb Rouleau's avatar Caleb Rouleau

[Speed Automation] Remove unneeded run_performance_tests_wrapper.py

This script was used during the migration. Now that everything is
migrated, it isn't needed anymore. Everything already uses the
--migrated-test flag now.

This is blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=924351 .
Fixing that first.

This is also blocked on
https://chromium-review.googlesource.com/c/chromium/src/+/1436559

BUG=757933,920002

Change-Id: I2be974d4606f732f5099f89854ba50dff5429e18
Reviewed-on: https://chromium-review.googlesource.com/c/1423840Reviewed-by: default avatarCaleb Rouleau <crouleau@chromium.org>
Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarEmily Hanley <eyaich@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626898}
parent fe84d2f8
...@@ -32,7 +32,6 @@ group("run_perf_test") { ...@@ -32,7 +32,6 @@ group("run_perf_test") {
"//testing/scripts/common.py", "//testing/scripts/common.py",
"//testing/scripts/run_gtest_perf_test.py", "//testing/scripts/run_gtest_perf_test.py",
"//testing/scripts/run_performance_tests.py", "//testing/scripts/run_performance_tests.py",
"//testing/scripts/run_performance_tests_wrapper.py",
"//testing/scripts/run_telemetry_benchmark_as_googletest.py", "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
"//tools/perf/generate_legacy_perf_dashboard_json.py", "//tools/perf/generate_legacy_perf_dashboard_json.py",
] ]
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
"args": [ "args": [
"--gtest-benchmark-name", "--gtest-benchmark-name",
"load_library_perf_tests", "load_library_perf_tests",
"--non-telemetry=true", "--non-telemetry=true"
"--migrated-test=true"
], ],
"isolate_name": "load_library_perf_tests", "isolate_name": "load_library_perf_tests",
"merge": { "merge": {
......
...@@ -128,13 +128,12 @@ ...@@ -128,13 +128,12 @@
"args": [ "args": [
"angle_perftests", "angle_perftests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--test-launcher-print-test-stdio=always", "--test-launcher-print-test-stdio=always",
"--test-launcher-jobs=1", "--test-launcher-jobs=1",
"--test-launcher-retry-limit=0", "--test-launcher-retry-limit=0",
], ],
"label": "//chrome/test:angle_perftests", "label": "//chrome/test:angle_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"angle_translator_fuzzer": { "angle_translator_fuzzer": {
...@@ -254,13 +253,12 @@ ...@@ -254,13 +253,12 @@
"args": [ "args": [
"base_perftests", "base_perftests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--test-launcher-print-test-stdio=always", "--test-launcher-print-test-stdio=always",
"--test-launcher-jobs=1", "--test-launcher-jobs=1",
"--test-launcher-retry-limit=0", "--test-launcher-retry-limit=0",
], ],
"label": "//base:base_perftests", "label": "//base:base_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"base_unittests": { "base_unittests": {
...@@ -624,12 +622,11 @@ ...@@ -624,12 +622,11 @@
"args": [ "args": [
"command_buffer_perftests", "command_buffer_perftests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--adb-path", "--adb-path",
"src/third_party/android_tools/sdk/platform-tools/adb", "src/third_party/android_tools/sdk/platform-tools/adb",
], ],
"label": "//gpu:command_buffer_perftests", "label": "//gpu:command_buffer_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"compact_enc_det_fuzzer": { "compact_enc_det_fuzzer": {
...@@ -656,11 +653,10 @@ ...@@ -656,11 +653,10 @@
"args": [ "args": [
"--xvfb", "--xvfb",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"components_perftests", "components_perftests",
], ],
"label": "//components:components_perftests", "label": "//components:components_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"components_policy_junit_tests": { "components_policy_junit_tests": {
...@@ -1034,12 +1030,11 @@ ...@@ -1034,12 +1030,11 @@
"args": [ "args": [
"gpu_perftests", "gpu_perftests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--adb-path", "--adb-path",
"src/third_party/android_tools/sdk/platform-tools/adb", "src/third_party/android_tools/sdk/platform-tools/adb",
], ],
"label": "//gpu:gpu_perftests", "label": "//gpu:gpu_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"gpu_raster_angle_fuzzer": { "gpu_raster_angle_fuzzer": {
...@@ -1361,11 +1356,10 @@ ...@@ -1361,11 +1356,10 @@
"args": [ "args": [
"load_library_perf_tests", "load_library_perf_tests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--test-launcher-print-test-stdio=always", "--test-launcher-print-test-stdio=always",
], ],
"label": "//chrome/test:load_library_perf_tests", "label": "//chrome/test:load_library_perf_tests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"lookup_affiliation_response_parser_fuzzer": { "lookup_affiliation_response_parser_fuzzer": {
...@@ -1400,13 +1394,12 @@ ...@@ -1400,13 +1394,12 @@
"args": [ "args": [
"media_perftests", "media_perftests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--single-process-tests", "--single-process-tests",
"--test-launcher-retry-limit=0", "--test-launcher-retry-limit=0",
"--isolated-script-test-filter=*::-*_unoptimized::*_unaligned::*unoptimized_aligned", "--isolated-script-test-filter=*::-*_unoptimized::*_unaligned::*unoptimized_aligned",
], ],
"label": "//media:media_perftests", "label": "//media:media_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"media_pipeline_integration_fuzzer": { "media_pipeline_integration_fuzzer": {
...@@ -1801,10 +1794,9 @@ ...@@ -1801,10 +1794,9 @@
"args": [ "args": [
"net_perftests", "net_perftests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
], ],
"label": "//net:net_perftests", "label": "//net:net_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"net_quic_crypto_framer_parse_message_fuzzer": { "net_quic_crypto_framer_parse_message_fuzzer": {
...@@ -2032,7 +2024,6 @@ ...@@ -2032,7 +2024,6 @@
"args": [ "args": [
"performance_browser_tests", "performance_browser_tests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--test-launcher-print-test-stdio=always", "--test-launcher-print-test-stdio=always",
# TODO(crbug.com/759866): Figure out why CastV2PerformanceTest/0 sometimes # TODO(crbug.com/759866): Figure out why CastV2PerformanceTest/0 sometimes
# takes 15-30 seconds to start up and, once fixed, remove this workaround # takes 15-30 seconds to start up and, once fixed, remove this workaround
...@@ -2043,7 +2034,7 @@ ...@@ -2043,7 +2034,7 @@
"--enable-gpu", "--enable-gpu",
], ],
"label": "//chrome/test:performance_browser_tests", "label": "//chrome/test:performance_browser_tests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"performance_test_suite": { "performance_test_suite": {
...@@ -2450,13 +2441,12 @@ ...@@ -2450,13 +2441,12 @@
"args": [ "args": [
"tracing_perftests", "tracing_perftests",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"--test-launcher-print-test-stdio=always", "--test-launcher-print-test-stdio=always",
"--adb-path", "--adb-path",
"src/third_party/android_tools/sdk/platform-tools/adb", "src/third_party/android_tools/sdk/platform-tools/adb",
], ],
"label": "//components/tracing:tracing_perftests", "label": "//components/tracing:tracing_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"traffic_annotation_auditor_unittests": { "traffic_annotation_auditor_unittests": {
...@@ -2592,11 +2582,10 @@ ...@@ -2592,11 +2582,10 @@
"args": [ "args": [
"--xvfb", "--xvfb",
"--non-telemetry=true", "--non-telemetry=true",
"--migrated-test=true",
"views_perftests", "views_perftests",
], ],
"label": "//ui/views:views_perftests", "label": "//ui/views:views_perftests",
"script": "//testing/scripts/run_performance_tests_wrapper.py", "script": "//testing/scripts/run_performance_tests.py",
"type": "script", "type": "script",
}, },
"views_unittests": { "views_unittests": {
......
#!/usr/bin/env python
# Copyright 2018 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.
"""This script is a wrapper script used during migration of performance
tests to use the new recipe. See crbug.com/757933
Non-telemetry tests now will all run with this script. The flag
--migrated-test will indicate if this test is using the new recipe or not.
By default this script runs the legacy testing/scripts/run_gtest_perf_test.py.
"""
import argparse
import os
import subprocess
import sys
SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(
__file__))))
GTEST = os.path.join(SRC_DIR, 'testing', 'scripts', 'run_gtest_perf_test.py')
PERF = os.path.join(SRC_DIR, 'testing', 'scripts', 'run_performance_tests.py')
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--migrated-test', type=bool, default=False)
args, rest_args = parser.parse_known_args()
if args.migrated_test:
return subprocess.call([sys.executable, PERF] + rest_args)
else:
return subprocess.call([sys.executable, GTEST] + rest_args)
if __name__ == '__main__':
sys.exit(main())
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment