| Index: scripts/slave/recipe_modules/chromium_android/example.expected/java_method_count_builder_basic.json
|
| diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/java_method_count_builder_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/java_method_count_builder_basic.json
|
| index 5769043e502d3a7081d0cfccc6d6ad9f83dec1ac..1c865a518afaac5a9030d21b2f79acd6221d3bce 100644
|
| --- a/scripts/slave/recipe_modules/chromium_android/example.expected/java_method_count_builder_basic.json
|
| +++ b/scripts/slave/recipe_modules/chromium_android/example.expected/java_method_count_builder_basic.json
|
| @@ -28,12 +28,6 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| - "--master",
|
| - "chromium.testing.master",
|
| - "--builder",
|
| - "java_method_count_builder",
|
| - "--slave",
|
| - "tehslave",
|
| "--spec",
|
| "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
|
| "--root",
|
| @@ -56,9 +50,18 @@
|
| },
|
| "name": "bot_update",
|
| "~followup_annotations": [
|
| + "@@@STEP_TEXT@Some step text@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/repo\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {}, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/repo\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"properties\": {}, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/repo\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -67,87 +70,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE[depot_tools]/gclient.py",
|
| - "config",
|
| - "--spec",
|
| - "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| - },
|
| - "name": "gclient setup"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/gclient_safe_revert.py",
|
| - ".",
|
| - "[DEPOT_TOOLS]/gclient"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "gclient revert"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE[depot_tools]/gclient.py",
|
| - "sync",
|
| - "--nohooks",
|
| - "--force",
|
| - "--verbose",
|
| - "--delete_unversioned_trees",
|
| - "--revision",
|
| - "src/repo@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| - },
|
| - "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/angle/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 297276@@@",
|
| - "@@@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/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_src_revision@170242@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_angle_revision@297276@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
|
| "[SLAVE_BUILD]/src/out/Release/test_logs",
|
|
|