Give autogen bots on client.drmemory a separate clobber step

scripts/slave/recipes/client.drmemory.recipe_autogen.py

 # Copyright 2016 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.
 
 DEPS = [
     'chromium',
     'depot_tools/bot_update',
     'depot_tools/gclient',
     'file',
     'gsutil',
@@ skipping 256 matching lines @@
                         'https://svn.code.sf.net/p/%(repo)s/code',
                         'llvm_url': 'http://llvm.org/svn/llvm-project'}
     src_cfg.got_revision_mapping.update(
         {'src': 'got_revision',
          'src/third_party/WebKit': 'got_webkit_revision',
          'src/tools/swarming_client': 'got_swarming_client_revision',
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
+
+    # clobber before runhooks
+    if 'clobber' in api.properties:
+      api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
+
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'build_for_tool=drmemory component=shared_library',
            'LANDMINES_VERBOSE': '1'}
     api.python("gclient runhooks wrapper",
                api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Release', '--build-tool=ninja', '--compiler=goma',
             'content_shell', 'base_unittests', 'browser_tests',
             'crypto_unittests', 'ipc_tests', 'media_unittests',
             'net_unittests', 'printing_unittests', 'remoting_unittests',
             'sql_unittests', 'unit_tests', 'url_unittests']
-    if 'clobber' in api.properties:
-        args.append("--clobber")
     api.python("compile",
                api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
 
 
 def mac_builder_DR_steps(api):
     build_properties = api.properties.legacy()
     # checkout DynamiRIO step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
     soln = src_cfg.solutions.add()
@@ skipping 360 matching lines @@
                         'https://svn.code.sf.net/p/%(repo)s/code',
                         'llvm_url': 'http://llvm.org/svn/llvm-project'}
     src_cfg.got_revision_mapping.update(
         {'src': 'got_revision',
          'src/third_party/WebKit': 'got_webkit_revision',
          'src/tools/swarming_client': 'got_swarming_client_revision',
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
+
+    # clobber before runhooks
+    if 'clobber' in api.properties:
+      api.file.rmtree('clobber', api.path['checkout'].join('out', 'Debug'))
+
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'build_for_tool=drmemory component=shared_library'}
     api.python("gclient runhooks wrapper",
                api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
-    args = ['--solution', 'all.sln', '--project',
-            'chromium_builder_dbg_drmemory_win', '--target', 'Debug']
-    if 'clobber' in api.properties:
-        args.append("--clobber")
+    args = ['--target', 'Debug', 'chromium_builder_dbg_drmemory_win']
     api.step("compile", ["python_slave", api.path["build"].join(
         "scripts", "slave", "compile.py")] + args)
 
 
 def win8_cr_steps(api):
     build_properties = api.properties.legacy()
     # Download build step
     api.gsutil.download("chromium-drmemory-builds",
                         "drmemory-windows-latest-sfx.exe",
                         "drm-sfx.exe",
@@ skipping 347 matching lines @@
                         'https://svn.code.sf.net/p/%(repo)s/code',
                         'llvm_url': 'http://llvm.org/svn/llvm-project'}
     src_cfg.got_revision_mapping.update(
         {'src': 'got_revision',
          'src/third_party/WebKit': 'got_webkit_revision',
          'src/tools/swarming_client': 'got_swarming_client_revision',
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
+
+    # clobber before runhooks
+    if 'clobber' in api.properties:
+      api.file.rmtree('clobber', api.path['checkout'].join('out', 'Debug'))
+
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'build_for_tool=drmemory component=shared_library'}
     api.python("gclient runhooks wrapper",
                api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
-    args = ['--solution', 'all.sln', '--project',
-            'chromium_builder_dbg_drmemory_win', '--target', 'Debug']
-    if 'clobber' in api.properties:
-        args.append("--clobber")
+    args = ['--target', 'Debug', 'chromium_builder_dbg_drmemory_win']
     api.step("compile", ["python_slave", api.path["build"].join(
         "scripts", "slave", "compile.py")] + args)
 
 
 def win_7_x64_drm_steps(api):
     build_properties = api.properties.legacy()
     # checkout DrMemory step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
     soln = src_cfg.solutions.add()
     soln.name = "drmemory"
@@ skipping 514 matching lines @@
       stdout=api.raw_io.output("DrMemory-Windows-1.2.3-0x1234567.zip"))
   )
 
   yield (api.test('builder_not_in_dispatch_directory')
     + api.properties(
       mastername='client.drmemory',
       buildername='nonexistent_builder',
       slavename='TestSlave',
     )
   )