Add O/S versions to all bot names, change "Webkit" to "WebKit" in all bot names.

masters/master.chromium.webkit/master_win_webkit_latest_cfg.py

 # Copyright (c) 2012 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.
 
 from master import master_config
 from master.factory import chromium_factory
 
 defaults = {}
 
 helper = master_config.Helper(defaults)
@@ skipping 12 matching lines @@
   'webkit_lint',
   'webkit_unit',
 ]
 
 ################################################################################
 ## Release
 ################################################################################
 
 # Archive location
 rel_archive = master_config.GetArchiveUrl('ChromiumWebkit',
-                                          'Webkit Win Builder',
+                                          'WebKit Win Builder',
                                           'webkit-win-latest-rel', 'win32')
 #
 # Main release scheduler for webkit
 #
 S('s4_webkit_rel', branch='trunk', treeStableTimer=60)
 
 #
 # Triggerable scheduler for testers
 #
 T('s4_webkit_rel_trigger')
 
 #
 # Win Rel Builder
 #
-B('Webkit Win Builder', 'f_webkit_win_rel', scheduler='s4_webkit_rel',
+B('WebKit Win Builder', 'f_webkit_win_rel', scheduler='s4_webkit_rel',
   builddir='webkit-win-latest-rel', auto_reboot=False)
 F('f_webkit_win_rel', win().ChromiumWebkitLatestFactory(
     slave_type='Builder',
     project='all.sln;webkit_builder_win',
     factory_properties={
         'trigger': 's4_webkit_rel_trigger',
     }))
 
 #
-# Win Rel Webkit testers
+# Win Rel WebKit testers
 #
-B('Webkit Win', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
+B('WebKit XP', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
 F('f_webkit_rel_tests', win().ChromiumWebkitLatestFactory(
     slave_type='Tester',
     build_url=rel_archive,
     tests=webkit_tests,
     factory_properties={'archive_webkit_results': True,
                         'generate_gtest_json': True,
                         'test_results_server': 'test-results.appspot.com'}))
 
-B('Webkit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
+B('WebKit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
 
 ################################################################################
 ## Debug
 ################################################################################
 
 # Archive location
 dbg_archive = master_config.GetArchiveUrl('ChromiumWebkit',
-                                          'Webkit Win Builder (dbg)',
+                                          'WebKit Win Builder (dbg)',
                                           'webkit-win-latest-dbg', 'win32')
 #
 # Main debug scheduler for webkit
 #
 S('s4_webkit_dbg', branch='trunk', treeStableTimer=60)
 
 #
 # Triggerable scheduler for testers
 #
 T('s4_webkit_dbg_trigger')
 
 #
 # Win Dbg Builder
 #
-B('Webkit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='s4_webkit_dbg',
+B('WebKit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='s4_webkit_dbg',
   builddir='webkit-win-latest-dbg', auto_reboot=False)
 F('f_webkit_win_dbg', win().ChromiumWebkitLatestFactory(
     target='Debug',
     slave_type='Builder',
     project='all.sln;webkit_builder_win',
     factory_properties={
         'trigger': 's4_webkit_dbg_trigger',
     }))
 
 #
-# Win Dbg Webkit testers
+# Win Dbg WebKit testers
 #
 
-B('Webkit Win (dbg)(1)', 'f_webkit_dbg_tests_1',
+B('WebKit Win7 (dbg)(1)', 'f_webkit_dbg_tests_1',
     scheduler='s4_webkit_dbg_trigger')
 F('f_webkit_dbg_tests_1', win().ChromiumWebkitLatestFactory(
     target='Debug',
     slave_type='Tester',
     build_url=dbg_archive,
     tests=webkit_tests,
     factory_properties={'archive_webkit_results': True,
                         'generate_gtest_json': True,
                         'test_results_server': 'test-results.appspot.com',
                         'layout_part': '1:2'}))
 
-B('Webkit Win (dbg)(2)', 'f_webkit_dbg_tests_2',
+B('WebKit Win7 (dbg)(2)', 'f_webkit_dbg_tests_2',
     scheduler='s4_webkit_dbg_trigger')
 F('f_webkit_dbg_tests_2', win().ChromiumWebkitLatestFactory(
     target='Debug',
     slave_type='Tester',
     build_url=dbg_archive,
     tests=['webkit'],
     factory_properties={'archive_webkit_results': True,
                         'test_results_server': 'test-results.appspot.com',
                         'layout_part': '2:2'}))
 
 def Update(config, active_master, c):
   return helper.Update(c)