Change for preparation for reference-build on perfbot (media)

chrome/test/functional/media/media_test_runner.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 """A module to execute a subclass of MediaTastBase class.
 
 This executes a media test class (a subclass of MediaTastBase class) with
 different configuration (parameters) which are passed in the form of
@@ skipping 75 matching lines @@
                     help='Player.html Nickname [defaults to "%s"]' %
                          DEFAULT_PLAYER_HTML_URL_NICKNAME)
   parser.add_option('-n', '--number_of_runs', dest='number_of_runs',
                     default=DEFAULT_NUMBER_OF_RUNS,
                     help='The number of runs [defaults to "%d"]' %
                          DEFAULT_NUMBER_OF_RUNS)
   parser.add_option('-m', '--measure_intervals', dest='measure_intervals',
                     default=DEFAULT_MEASURE_INTERVALS,
                     help='Interval for measurement data [defaults to "%d"]' %
                          DEFAULT_MEASURE_INTERVALS)
-  parser.add_option('-o', '--test-one-combination', dest='one_combination',
-                    default=True, # Currently default is True
-                                  # since we want to test only 1 combination.
-                    help='Run only one parameter combination')
+  parser.add_option('-c', '--cache_test', dest='cache_test',
+                    default=False, help='Include cache test',
+                    action='store_true')
+  parser.add_option('-z', '--test-one-video', dest='one_video',
+                    default=False, help='Run only one video',
+                    action='store_true')
   parser.add_option(
       '-w', '--test_scenario_input_filename',
       dest='test_scenario_input_filename',
       default='', help='Test scenario file (CSV form)', metavar='FILE')
   parser.add_option(
-      '-c', '--test_scenario', dest='test_scenario',
+      '-q', '--test_scenario', dest='test_scenario',
       default='', help='Test scenario (action triples delimited by \'|\')')
   parser.add_option('-s', '--suite', dest='suite',
                     help='Suite file')
   parser.add_option('-e', '--media_file', dest='media_file',
                     default='',
                     help=('Media file to be played using player.html. '
                           'The relative path needs to be specified starting '
                           'from data/html/ directory.'))
   parser.add_option('-a', '--reference_build', dest='reference_build',
                     help='Include reference build run', default=False,
@@ skipping 51 matching lines @@
       # There are two ways to disable the media cache: setting Chrome option
       # to --media-cache-size=1 or adding t parameter in query parameter of
       # URL in which player.js (data/media/html/player.js) disables the
       # media cache). We are doing both here. Please note the length of
       # CHROME_FLAGS and ADD_T_PARAMETERS should be the same.
       for j in range(len(CHROME_FLAGS)):
         for reference_build in reference_build_list:
           parent_envs = copy.deepcopy(os.environ)
           if options.input_matrix_filename is None:
             par_filename = os.path.join(os.pardir, filename)
+          else:
+            par_filename = filename
           envs = {
             MediaTestEnvNames.MEDIA_TAG_ENV_NAME: tag,
             MediaTestEnvNames.MEDIA_FILENAME_ENV_NAME: par_filename,
             MediaTestEnvNames.MEDIA_FILENAME_NICKNAME_ENV_NAME: nickname,
             MediaTestEnvNames.PLAYER_HTML_URL_ENV_NAME:
               options.player_html_url,
             MediaTestEnvNames.PLAYER_HTML_URL_NICKNAME_ENV_NAME:
               options.player_html_url_nickname,
             MediaTestEnvNames.EXTRA_NICKNAME_ENV_NAME:
               EXTRA_NICKNAMES[j],
@@ skipping 33 matching lines @@
               suite_name = DEFAULT_SUITE_NAME
             else:
               suite_name = options.suite
             suite_string = ' --suite=%s' % suite_name
           test_prog_name = sys.executable + ' ' + test_prog_name
           cmd = test_prog_name + suite_string + ' ' + CHROME_FLAGS[j]
           if options.verbose:
             cmd += ' -v'
           proc = Popen(cmd, env=envs, shell=True)
           proc.communicate()
-        if options.one_combination:
-          sys.exit(0)
+        if not options.cache_test:
+          break
+      if options.one_video:
+        break
 
 
 if __name__ == '__main__':
   main()