| Index: scripts/slave/recipes/android/android_builder.expected/dartium_builder.json
|
| diff --git a/scripts/slave/recipes/android/android_builder.expected/dartium_builder.json b/scripts/slave/recipes/android/android_builder.expected/dartium_builder.json
|
| deleted file mode 100644
|
| index f309da9bddc8c1f5c753bd193e8e6bc7b8cb7e75..0000000000000000000000000000000000000000
|
| --- a/scripts/slave/recipes/android/android_builder.expected/dartium_builder.json
|
| +++ /dev/null
|
| @@ -1,201 +0,0 @@
|
| -[
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
|
| - "[SLAVE_BUILD]"
|
| - ],
|
| - "name": "cleanup index.lock",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path, cur_file)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "abort_on_failure": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/bot_update.py",
|
| - "--master",
|
| - "chromium.testing.master",
|
| - "--builder",
|
| - "dartium_builder",
|
| - "--slave",
|
| - "TestSlavename",
|
| - "--spec",
|
| - "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
|
| - "--revision_mapping_file",
|
| - "{}",
|
| - "--output_json",
|
| - "/path/to/tmp/json",
|
| - "--revision",
|
| - "4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00"
|
| - ],
|
| - "name": "bot_update",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"did_run\": false@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "config",
|
| - "--spec",
|
| - "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
|
| - ],
|
| - "name": "gclient setup"
|
| - },
|
| - {
|
| - "abort_on_failure": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "sync",
|
| - "--nohooks",
|
| - "--delete_unversioned_trees",
|
| - "--force",
|
| - "--verbose",
|
| - "--revision",
|
| - "src/repo@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "gclient sync",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/repo/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 126336@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_src_revision@170242@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\nfor base, _dirs, files in os.walk(sys.argv[3]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_logs",
|
| - "[SLAVE_BUILD]/src"
|
| - ],
|
| - "name": "clean local files",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[3]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "env": {
|
| - "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD]/src/clank/build/get_internal_landmines.py",
|
| - "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "gclient runhooks"
|
| - },
|
| - {
|
| - "abort_on_failure": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/compile.py",
|
| - "--target",
|
| - "Debug",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--",
|
| - "chrome_apk",
|
| - "content_shell_apk"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "compile"
|
| - },
|
| - {
|
| - "always_run": true,
|
| - "cmd": [
|
| - "rm",
|
| - "-rf"
|
| - ],
|
| - "name": "cleanup_build"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/dart/tools/bots/dartium_android.py",
|
| - "--build-products-dir",
|
| - "[SLAVE_BUILD]/src/out/Debug"
|
| - ],
|
| - "name": "dartium_test"
|
| - }
|
| -]
|
|
|