| Index: scripts/slave/recipe_modules/blimp/example.py
|
| diff --git a/scripts/slave/recipes/blimp/integration.py b/scripts/slave/recipe_modules/blimp/example.py
|
| similarity index 73%
|
| rename from scripts/slave/recipes/blimp/integration.py
|
| rename to scripts/slave/recipe_modules/blimp/example.py
|
| index a07e7ba2129d421e05bec0ea525ac1638ae83c68..35a5fecbdba40d33a100bc06deaa4d4547bc7651 100644
|
| --- a/scripts/slave/recipes/blimp/integration.py
|
| +++ b/scripts/slave/recipe_modules/blimp/example.py
|
| @@ -7,6 +7,7 @@ from recipe_engine.recipe_api import Property
|
| from recipe_engine.types import freeze
|
|
|
| DEPS = [
|
| + 'blimp',
|
| 'chromium',
|
| 'chromium_android',
|
| 'chromium_swarming',
|
| @@ -39,11 +40,10 @@ BUILDERS = freeze({
|
| REPO_URL = 'https://chromium.googlesource.com/chromium/src.git'
|
|
|
| def RunSteps(api):
|
| - android_build = api.path['slave_build'].join('src', 'out-android', 'Debug')
|
| - linux_build = api.path['slave_build'].join('src', 'out-linux', 'Debug')
|
| mastername = api.properties.get('mastername')
|
| buildername = api.properties.get('buildername')
|
| builder = BUILDERS[mastername][buildername]
|
| + api.chromium.set_config('chromium')
|
| api.chromium_android.configure_from_properties(
|
| builder['config'],
|
| REPO_NAME='src',
|
| @@ -51,33 +51,45 @@ def RunSteps(api):
|
| INTERNAL=False,
|
| BUILD_CONFIG=builder['target'])
|
|
|
| - api.chromium.set_config('chromium')
|
| api.gclient.set_config(builder['gclient_config'])
|
| api.gclient.apply_config(builder['gclient_apply_config'])
|
| + api.blimp.set_config('base_config')
|
| api.bot_update.ensure_checkout()
|
| api.chromium.ensure_goma()
|
| api.chromium_android.clean_local_files()
|
| api.chromium.runhooks()
|
|
|
| + android_build = api.path['checkout'].join('out-android')
|
| + linux_build = api.path['checkout'].join('out-linux')
|
| + android_debug_dir = android_build.join(
|
| + api.chromium.c.build_config_fs)
|
| + linux_debug_dir = linux_build.join(
|
| + api.chromium.c.build_config_fs)
|
| +
|
| api.chromium.run_mb(mastername=mastername,
|
| buildername=buildername,
|
| - build_dir=linux_build,
|
| + build_dir=linux_debug_dir,
|
| phase='engine')
|
| api.chromium.compile(targets=['blimp'],
|
| out_dir=linux_build)
|
| api.chromium.run_mb(mastername=mastername,
|
| buildername=buildername,
|
| - build_dir=android_build,
|
| + build_dir=android_debug_dir,
|
| phase='client')
|
| api.chromium.compile(targets=['blimp', 'chrome_public_apk'],
|
| out_dir=android_build)
|
|
|
| + api.blimp.run_engine_forwarder(output_linux_dir=linux_debug_dir)
|
| + apk_path = android_debug_dir.join('apks', 'ChromePublic.apk')
|
| + api.blimp.load_client(output_linux_dir=linux_debug_dir,
|
| + apk_path=apk_path)
|
| + api.blimp.stop_engine_forwarder(output_linux_dir=linux_debug_dir)
|
|
|
| def GenTests(api):
|
| sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s)
|
|
|
| yield (
|
| - api.test('%s_test_pass' % sanitize('Blimp Android Tester')) +
|
| + api.test('%s_test_pass' % sanitize('Blimp Client Engine Integration')) +
|
| api.properties.generic(
|
| buildername='Blimp Client Engine Integration',
|
| mastername='chromium.fyi')
|
|
|