Add win8 aura bot to chromium.win, make tryserver match

masters/master.chromium.win/master_win_cfg.py

Index: masters/master.chromium.win/master_win_cfg.py
===================================================================
--- masters/master.chromium.win/master_win_cfg.py	(revision 173176)
+++ masters/master.chromium.win/master_win_cfg.py	(working copy)
@@ -188,6 +188,9 @@
 
 dbg_archive = master_config.GetArchiveUrl('ChromiumWin', 'Win Builder (dbg)',
                                           'cr-win-dbg', 'win32')
+dbg_aura_archive = master_config.GetArchiveUrl(
+    'ChromiumWinAura', 'Win Aura Builder (dbg)',
+    'cr-win-aura-dbg', 'win32')
 
 #
 # Main debug scheduler for src/
@@ -198,6 +201,7 @@
 # Triggerable scheduler for the dbg builder
 #
 T('win_dbg_trigger')
+T('win_aura_dbg_trigger')
 
 #
 # Win Dbg Builder
@@ -346,14 +350,25 @@
                         'generate_gtest_json': True}))
 
 #
-# Dbg Aura builder
+# Win Aura Dbg builder
 #
-aura_gyp_defines = ('use_aura=1 win_debug_disable_iterator_debugging=1')
-B('Win Aura', 'dbg_aura', 'compile|testers|windows', 'win_dbg',
-  notify_on_missing=True)
+aura_gyp_defines = 'use_aura=1 win_debug_disable_iterator_debugging=1'
+B('Win Aura', 'dbg_aura', 'compile|windows', 'win_dbg',

[Peter Mayo, 2012/12/17 21:23:48]

Win Aura Builder?  Arg 1 needs to be distinct.

[scottmg, 2012/12/17 22:00:40]

Done.

+  builddir='cr-win-dbg-aura', auto_reboot=False, notify_on_missing=True)
 F('dbg_aura', win().ChromiumFactory(
     target='Debug',
-    slave_type='BuilderTester',
+    slave_type='Builder',
+    project='all.sln;aura_builder',
+    factory_properties={'gclient_env': {'GYP_DEFINES': aura_gyp_defines},
+                        'trigger': 'win_aura_dbg_trigger'}))
+
+# Dbg Windows Aura Desktop 
+B('Win Aura', 'dbg_win_aura', 'testers|windows', 'win_aura_dbg_trigger',
+  notify_on_missing=True)
+F('dbg_win_aura', win_tester().ChromiumFactory(
+    target='Debug',
+    slave_type='Tester',
+    build_url=dbg_aura_archive,
     tests=[
       'ash_unittests',
       'aura',
@@ -365,13 +380,29 @@
       'unit_unit',
       'views',
     ],
-    project='all.sln;aura_builder',
-      factory_properties={'gclient_env': {'GYP_DEFINES': aura_gyp_defines},
-                          'process_dumps': True,
-                          'sharded_tests': sharded_tests,
-                          'start_crash_handler': True,
-                          'generate_gtest_json': True}))
-# When the tests grow we'll need a separate tester.
+    factory_properties={'process_dumps': True,
+                        'sharded_tests': sharded_tests,
+                        'start_crash_handler': True,
+                        'generate_gtest_json': True}))
+#
+# Dbg Win8 Ash
+#
+B('Win8 Ash', 'dbg_win_ash', 'testers|windows', 'win_aura_dbg_trigger',
+  notify_on_missing=True)
+F('dbg_win_ash', win_tester().ChromiumFactory(
+    target='Debug',
+    slave_type='Tester',
+    build_url=dbg_aura_archive,
+    tests=[
+      'ash_unittests',
+      'aura',
+      'compositor',
+      'views',
+    ],
+    factory_properties={'process_dumps': True,
+                        'sharded_tests': sharded_tests,
+                        'start_crash_handler': True,
+                        'generate_gtest_json': True}))
 
 def Update(config, active_master, c):
   return helper.Update(c)