Give autogen bots on chromium.fyi and client.nacl.sdk a separate clobber step

scripts/slave/recipes/client.nacl.sdk.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',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
     'recipe_engine/python',
     'recipe_engine/step',
 ]
 
 
 def linux_sdk_multi_steps(api):
     build_properties = api.properties.legacy()
@@ skipping 35 matching lines @@
                         'src/data/autodiscovery': None}
     soln.custom_vars = {}
     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
+    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',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_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 = ['--target', 'Release', '--clobber', '--compiler=goma',
+    args = ['--target', 'Release', '--compiler=goma',
             'chromium_builder_nacl_sdk']
     api.python("compile",
                api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
@@ skipping 49 matching lines @@
                         'src/data/autodiscovery': None}
     soln.custom_vars = {}
     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
+    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': 'fastbuild=1 component=static_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', '--clobber', '--build-tool=ninja',
+    args = ['--target', 'Release', '--build-tool=ninja',
             '--compiler=goma-clang', '--', 'chromium_builder_nacl_sdk']
     api.python("compile",
                api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
@@ skipping 53 matching lines @@
                         'src/data/autodiscovery': None}
     soln.custom_vars = {}
     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
+    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',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_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_nacl_sdk',
-            '--target', 'Release', '--clobber', '--compiler=goma']
+    args = ['--target', 'Release', '--compiler=goma',
+            'chromium_builder_nacl_sdk']
     api.python("compile",
                api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
@@ skipping 23 matching lines @@
                         'sourceforge_url': 'svn://svn.chromium.org/%(repo)s',
                         'svn_url': 'svn://svn.chromium.org'}
     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
+    api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
+
     # unnamed step; null converted
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_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 = ['--target', 'Release', '--clobber', '--compiler=goma',
+    args = ['--target', 'Release', '--compiler=goma',
             'chromium_builder_tests']
     api.python("compile",
                api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
@@ skipping 28 matching lines @@
                         'sourceforge_url': 'svn://svn.chromium.org/%(repo)s',
                         'svn_url': 'svn://svn.chromium.org'}
     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
+    api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
+
     # unnamed step; null converted
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_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_tests',
-            '--target', 'Release', '--clobber', '--compiler=goma']
+    args = ['--target', 'Release', '--compiler=goma',
+            'chromium_builder_tests',]
     api.python("compile",
                api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
@@ skipping 23 matching lines @@
                         'sourceforge_url': 'svn://svn.chromium.org/%(repo)s',
                         'svn_url': 'svn://svn.chromium.org'}
     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
+    api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
+
     # unnamed step; null converted
     # gclient runhooks wrapper step
     env = {'LANDMINES_VERBOSE': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library',
            'CHROMIUM_GYP_SYNTAX_CHECK': '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', '--clobber', '--build-tool=ninja',
+    args = ['--target', 'Release', '--build-tool=ninja',
             '--compiler=goma-clang', '--', 'chromium_builder_tests']
     api.python("compile",
                api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
@@ skipping 67 matching lines @@
     yield (api.test('mac_sdk_multirel') + api.properties(
         mastername='client.nacl.sdk') + api.properties(
             buildername='mac-sdk-multirel') +
            api.properties(revision='123456789abcdef') + api.properties(
                got_revision='123456789abcdef') + api.properties(
                    buildnumber='42') + api.properties(slavename='TestSlave'))
     yield (api.test('builder_not_in_dispatch_directory') + api.properties(
         mastername='client.nacl.sdk') + api.properties(
             buildername='nonexistent_builder') + api.properties(
                 slavename='TestSlave'))