Shuffle things on the GPU layout test bots so that we store results...

scripts/master/factory/chromium_commands.py

 # Copyright (c) 2010 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.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds chromium-specific commands."""
 
 import logging
 import os
@@ skipping 589 matching lines @@
     archive_results = factory_properties.get('archive_webkit_results')
     layout_part = factory_properties.get('layout_part')
     test_results_server = factory_properties.get('test_results_server')
     platform = factory_properties.get('layout_test_platform')
 
     if gpu:
       if platform:
         platform = platform.replace('chromium', 'chromium-gpu')
       else:
         platform = 'chromium-gpu'
-      result_dir_basename = 'layout-test-results-gpu'
+      builder_name = '%(buildername)s - GPU'
       result_str = 'gpu results'
       test_name = 'webkit_gpu_tests'
     else:
-      result_dir_basename = 'layout-test-results'
+      builder_name = '%(buildername)'
       result_str = 'results'
       test_name = 'webkit_tests'
 
     pageheap_description = ''
     if with_pageheap:
       pageheap_description = ' (--enable-pageheap)'
 
-    webkit_result_dir = '/'.join(['..', '..', result_dir_basename])
+    webkit_result_dir = '/'.join(['..', '..', 'layout-test-results'])
 
     cmd = [self._python, self._layout_test_tool,
            '--target', self._target,
            '--build-type', 'v8',
            '-o', webkit_result_dir,
            '--build-dir', self._build_dir,
            '--build-number', WithProperties("%(buildnumber)s"),
-           '--builder-name', WithProperties("%(buildername)s"),]
+           '--builder-name', WithProperties(builder_name),]
 
     if layout_part:
       cmd.extend(['--run-part', layout_part])
 
     if with_pageheap:
       cmd.append('--enable-pageheap')
 
     if test_results_server:
       cmd.extend(['--test-results-server', test_results_server])
     if platform:
       cmd.extend(['--platform', platform])
 
     self.AddTestStep(webkit_test_command.WebKitCommand,
                      test_name=test_name,
                      test_description=pageheap_description,
                      test_command=cmd)
 
     if archive_results:
       url = '%s/%s/%s' % (self._archive_url, result_dir_basename,
                           self._identifier)
 
       cmd = [self._python, self._layout_archive_tool,
              '--results-dir', webkit_result_dir,
              '--build-dir', self._build_dir,
              '--build-number', WithProperties("%(buildnumber)s"),
-             '--builder-name', WithProperties("%(buildername)s"),]
+             '--builder-name', WithProperties(buildername),]
 
       self.AddArchiveStep(
           data_description='webkit_tests ' + result_str,
           base_url=url,
           link_text='layout test ' + result_str,
           command=cmd)
 
   def AddRunCrashHandler(self, build_dir=None, target=None):
     build_dir = build_dir or self._build_dir
     target = target or self._target
@@ skipping 67 matching lines @@
     cmd = [self._python, self._download_and_extract_official_tool,
            '--identifier', identifier,
            # TODO(jrg): for now we are triggered on a timer and always
            # use the latest build.  Instead we should trigger on the
            # presence of new build and pass that info down for a
            # --build N arg.
            '--latest']
     self.AddTestStep(commands.WaterfallLoggingShellCommand,
                      'Download and extract official build', cmd,
                      halt_on_failure=True)