diff --git a/fetch_configs/dartino.py b/fetch_configs/dartino.py deleted file mode 100644 index 6f402a323..000000000 --- a/fetch_configs/dartino.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2015 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. - -import sys - -import config_util # pylint: disable=import-error - -# This class doesn't need an __init__ method, so we disable the warning -# pylint: disable=no-init -class Dartino(config_util.Config): - """Basic Config class for Dartino.""" - - @staticmethod - def fetch_spec(props): - url = 'https://github.com/dartino/sdk.git' - solution = { - 'name' :'sdk', - 'url' : url, - 'deps_file': 'DEPS', - 'managed' : False, - 'custom_deps': {}, - } - spec = { - 'solutions': [solution], - } - if props.get('target_os'): - spec['target_os'] = props['target_os'].split(',') - return { - 'type': 'gclient_git', - 'gclient_git_spec': spec, - } - - @staticmethod - def expected_root(_props): - return 'sdk' - - -def main(argv=None): - return Dartino().handle_args(argv) - - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/fetch_configs/dartium.py b/fetch_configs/dartium.py deleted file mode 100644 index 600f1318f..000000000 --- a/fetch_configs/dartium.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2015 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. - -import sys - -import config_util # pylint: disable=import-error - - -# This class doesn't need an __init__ method, so we disable the warning -# pylint: disable=no-init -class Dart(config_util.Config): - """Basic Config class for Dart.""" - - @staticmethod - def fetch_spec(props): - url = 'https://github.com/dart-lang/sdk.git' - solution = { - 'name' :'src/dart', - 'url' : url, - 'deps_file': 'tools/deps/dartium.deps/DEPS', - 'managed' : False, - 'custom_deps': {}, - } - spec = { - 'solutions': [solution], - } - if props.get('target_os'): - spec['target_os'] = props['target_os'].split(',') - return { - 'type': 'gclient_git', - 'gclient_git_spec': spec, - } - - @staticmethod - def expected_root(_props): - return 'src' - - -def main(argv=None): - return Dart().handle_args(argv) - - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/fetch_configs/mojo.py b/fetch_configs/mojo.py deleted file mode 100644 index 24e65a39b..000000000 --- a/fetch_configs/mojo.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2014 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. - -import sys - -import config_util # pylint: disable=import-error - - -# This class doesn't need an __init__ method, so we disable the warning -# pylint: disable=no-init -class Mojo(config_util.Config): - """Basic Config class for Mojo.""" - - @staticmethod - def fetch_spec(props): - url = 'https://github.com/domokit/mojo.git' - solution = { - 'name' :'src', - 'url' : url, - 'deps_file': 'DEPS', - 'managed' : False, - 'custom_deps': {}, - } - spec = { - 'solutions': [solution], - } - if props.get('target_os'): - spec['target_os'] = props['target_os'].split(',') - return { - 'type': 'gclient_git', - 'gclient_git_spec': spec, - } - - @staticmethod - def expected_root(_props): - return 'src' - - -def main(argv=None): - return Mojo().handle_args(argv) - - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/recipes/recipes/fetch_end_to_end_test.py b/recipes/recipes/fetch_end_to_end_test.py index 07fad7096..a80ee053c 100644 --- a/recipes/recipes/fetch_end_to_end_test.py +++ b/recipes/recipes/fetch_end_to_end_test.py @@ -19,18 +19,21 @@ def RunSteps(api): api.bot_update.ensure_checkout() # List fetch configs available in the test depot_tools checkout. - fetch_configs = sorted( + fetch_configs = set( api.path.basename(f)[:-3] for f in api.file.listdir( 'listdir fetch_configs', api.path['checkout'].join('fetch_configs')) if str(f).endswith('.py')) + # config_util is a helper library, not a config. + fetch_configs.discard('config_util') + # Try to run "fetch" for each of the configs. It's important to use # the checkout under test. with api.context( env={'DEPOT_TOOLS_UPDATE': '0', 'CHROME_HEADLESS': '1'}, env_prefixes={'PATH': [api.path['checkout']]}): with api.step.defer_results(): - for config_name in fetch_configs: + for config_name in sorted(fetch_configs): # Create a dedicated temp directory. We want to test checking out # from scratch. temp_dir = api.path.mkdtemp('fetch_end_to_end_test_%s' % config_name)