Revert "Speculative revert by sheriff"

tools/run-bisect-perf-regression.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 """Run Performance Test Bisect Tool
 
 This script is used by a try bot to run the bisect script with the parameters
 specified in the bisect config file. It checks out a copy of the depot in
 a subdirectory 'bisect' of the working directory provided, annd runs the
@@ skipping 19 matching lines @@
 CROS_IP_ENV = 'BISECT_CROS_IP'
 SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
 SRC_DIR = os.path.join(SCRIPT_DIR, os.path.pardir)
 BISECT_CONFIG_PATH = os.path.join(SCRIPT_DIR, 'auto_bisect', 'bisect.cfg')
 RUN_TEST_CONFIG_PATH = os.path.join(SCRIPT_DIR, 'run-perf-test.cfg')
 WEBKIT_RUN_TEST_CONFIG_PATH = os.path.join(
     SRC_DIR, 'third_party', 'WebKit', 'Tools', 'run-perf-test.cfg')
 BISECT_SCRIPT_DIR = os.path.join(SCRIPT_DIR, 'auto_bisect')
 
 PERF_BENCHMARKS_PATH = 'tools/perf/benchmarks'
+PERF_MEASUREMENTS_PATH = 'tools/perf/measurements'
 BUILDBOT_BUILDERNAME = 'BUILDBOT_BUILDERNAME'
 BENCHMARKS_JSON_FILE = 'benchmarks.json'
 
 class Goma(object):
 
   def __init__(self, path_to_goma):
     self._abs_path_to_goma = None
     self._abs_path_to_goma_file = None
     if not path_to_goma:
       return
@@ skipping 577 matching lines @@
       ['diff', '--no-ext-diff', '--name-only', 'HEAD~1'], cwd=cwd)
   modified_files = log_output.split()
   return modified_files
 
 
 def _GetAffectedBenchmarkModuleNames():
   """Gets list of modified benchmark files under tools/perf/benchmarks."""
   all_affected_files = _GetModifiedFilesFromPatch()
   modified_benchmarks = []
   for affected_file in all_affected_files:
-    if affected_file.startswith(PERF_BENCHMARKS_PATH):
+    if (affected_file.startswith(PERF_BENCHMARKS_PATH) or
+        affected_file.startswith(PERF_MEASUREMENTS_PATH)):
       benchmark = os.path.basename(os.path.splitext(affected_file)[0])
       modified_benchmarks.append(benchmark)
   return modified_benchmarks
 
 
 def _ListAvailableBenchmarks(bot_platform):
   """Gets all available benchmarks names as a list."""
   browser_type =  _GetBrowserType(bot_platform)
   if os.path.exists(BENCHMARKS_JSON_FILE):
     os.remove(BENCHMARKS_JSON_FILE)
@@ skipping 207 matching lines @@
     return _SetupAndRunPerformanceTest(
         config={}, path_to_goma=opts.path_to_goma, is_cq_tryjob=True)
 
   print ('Error: Could not load config file. Double check your changes to '
          'auto_bisect/bisect.cfg or run-perf-test.cfg for syntax errors.\n')
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())