telemetry: remove run_measurment script.

[email protected],[email protected],[email protected]
BUG=423563

Review URL: https://codereview.chromium.org/655563007

Cr-Commit-Position: refs/heads/master@{#299968}

Author: ernstm

chrome/telemetry.isolate

@@ -8,7 +8,7 @@
   'conditions': [
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       # This list comes from running:
-      #   tools/perf/run_measurement --print-bootstrap-deps
+      #   tools/perf/run_benchmark --print-bootstrap-deps
       # and filtering out obvious undesired dependencies:
       #   'src/tools/perf/page_sets/'
       #   'src/tools/perf/measurements/'

tools/auto_bisect/bisect.cfg

@@ -50,11 +50,11 @@ For ChromeOS:
   - Example:
 
 config = {
-  'command': ('./tools/perf/run_measurement -v --browser=cros-chrome-guest '
-              'dromaeo.jslibstylejquery')
+  'command': ('./tools/perf/run_benchmark -v --browser=cros-chrome-guest '
+              'smoothness.key_mobile_sites')
   'good_revision': '4086.0.0',
   'bad_revision': '4087.0.0',
-  'metric': 'jslib/jslib',
+  'metric': 'mean_frame_time/mean_frame_time',
 }
 """
 

tools/perf/run_measurement

@@ -29,8 +29,8 @@ Args:
 Sample config:
 
 config = {
-  'command': './tools/perf/run_measurement --browser=release blink_perf third_party/WebKit/PerformanceTests/Layout/floats_50_100.html',
-  'metric': 'floats_50_100/floats_50_100',
+  'command': './tools/perf/run_benchmark --browser=release smoothness.key_mobile_sites',
+  'metric': 'mean_frame_time/mean_frame_time',
   'repeat_count': '20',
   'max_time_minutes': '20',
   'truncate_percent': '25',
@@ -41,8 +41,8 @@ On Windows:
 the command:
 
 config = {
-  'command': 'python tools/perf/run_measurement -v --browser=release kraken',
-  'metric': 'Total/Total',
+  'command': 'python tools/perf/run_benchmark -v --browser=release smoothness.key_mobile_sites',
+  'metric': 'mean_frame_time/mean_frame_time',
   'repeat_count': '20',
   'max_time_minutes': '20',
   'truncate_percent': '25',
@@ -55,10 +55,10 @@ On ChromeOS:
     the command using the bot's BISECT_CROS_IP and BISECT_CROS_BOARD values.
 
 config = {
-  'command': './tools/perf/run_measurement -v '\
+  'command': './tools/perf/run_benchmark -v '\
       '--browser=cros-chrome-guest '\
-      'dromaeo tools/perf/page_sets/dromaeo/jslibstylejquery.json',
-  'metric': 'jslib/jslib',
+      'smoothness.key_mobile_sites',
+  'metric': 'mean_frame_time/mean_frame_time',
   'repeat_count': '20',
   'max_time_minutes': '20',
   'truncate_percent': '25',

tools/perf/run_multipage_benchmarks

@@ -9,7 +9,6 @@
 
 src/tools/telemetry/find_dependencies \
   src/tools/perf/run_benchmark \
-  src/tools/perf/run_measurement \
   src/tools/perf/record_wpr \
   src/content/test/gpu/run_gpu_test.py \
   --exclude=*/third_party/trace-viewer/test_data/* \

tools/run-perf-test.cfg

@@ -108,9 +108,9 @@ def _AttemptTryjob(self, cfg_file_path):
     # Generate the command line for the perf trybots
     arguments = sys.argv
     if self._target_os == 'win':
-      arguments[0] = 'python tools\\perf\\run_measurement'
+      arguments[0] = 'python tools\\perf\\run_benchmark'
     else:
-      arguments[0] = './tools/perf/run_measurement'
+      arguments[0] = './tools/perf/run_benchmark'
     for index, arg in enumerate(arguments):
       if arg.startswith('--browser='):
         if self._target_os == 'android':

tools/telemetry/build/generate_telemetry_harness.sh

@@ -204,7 +204,7 @@ def test_config_android(self):
         'trybot-android-nexus4', 'somebranch', 'tools/run-perf-test.cfg')
     self.assertEquals(
         ('config = {\n'
-         '  "command": "./tools/perf/run_measurement '
+         '  "command": "./tools/perf/run_benchmark '
          '--browser=android-chrome-shell sunspider",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
@@ -216,7 +216,7 @@ def test_config_mac(self):
         'trybot-mac-10-9', 'currentwork', 'tools/run-perf-test.cfg')
     self.assertEquals(
         ('config = {\n'
-         '  "command": "./tools/perf/run_measurement '
+         '  "command": "./tools/perf/run_benchmark '
          '--browser=release sunspider",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
@@ -228,10 +228,9 @@ def test_config_blink(self):
         'trybot-mac-10-9', 'blinkbranch', 'Tools/run-perf-test.cfg', True)
     self.assertEquals(
         ('config = {\n'
-         '  "command": "./tools/perf/run_measurement '
+         '  "command": "./tools/perf/run_benchmark '
          '--browser=release sunspider",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
          '  "truncate_percent": "0"\n'
          '}'), config)
-