| Index: scripts/slave/recipes/ios/try.expected/without_patch_success.json
|
| diff --git a/scripts/slave/recipes/ios/try.expected/without_patch_success.json b/scripts/slave/recipes/ios/try.expected/without_patch_success.json
|
| index b81daa400c277ae0fb610f5ce099b9573d91d022..ce0093d2e6a47e593eef70fd3035ba1c65810fa9 100644
|
| --- a/scripts/slave/recipes/ios/try.expected/without_patch_success.json
|
| +++ b/scripts/slave/recipes/ios/try.expected/without_patch_success.json
|
| @@ -25,6 +25,28 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| + "[BUILDER_CACHE]/ios",
|
| + "511"
|
| + ],
|
| + "name": "makedirs checkout path",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| "tryserver.fake",
|
| @@ -51,6 +73,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/ios",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -135,7 +158,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/ios/build/bots/chromium.mac/ios.json",
|
| + "[BUILDER_CACHE]/ios/src/ios/build/bots/chromium.mac/ios.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read build config",
|
| @@ -189,7 +212,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/ios/src",
|
| "env": {
|
| "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
|
| @@ -222,7 +245,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
|
| + "[BUILDER_CACHE]/ios/src/testing/buildbot/trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read filter exclusion spec",
|
| @@ -282,11 +305,11 @@
|
| "cmd": [
|
| "ninja",
|
| "-C",
|
| - "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",
|
| + "[BUILDER_CACHE]/ios/src/out/Debug-iphonesimulator",
|
| "All",
|
| "fake tests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",
|
| + "cwd": "[BUILDER_CACHE]/ios/src/out/Debug-iphonesimulator",
|
| "name": "compile (with patch)",
|
| "~followup_annotations": [
|
| "step returned non-zero exit code: 1",
|
| @@ -297,6 +320,28 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| + "[BUILDER_CACHE]/ios",
|
| + "511"
|
| + ],
|
| + "name": "makedirs checkout path (2)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| "tryserver.fake",
|
| @@ -321,6 +366,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/ios",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -393,7 +439,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/ios/src",
|
| "env": {
|
| "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
|
| @@ -410,9 +456,9 @@
|
| "cmd": [
|
| "ninja",
|
| "-C",
|
| - "[SLAVE_BUILD]/src/out/Debug-iphonesimulator"
|
| + "[BUILDER_CACHE]/ios/src/out/Debug-iphonesimulator"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",
|
| + "cwd": "[BUILDER_CACHE]/ios/src/out/Debug-iphonesimulator",
|
| "name": "compile (without patch)",
|
| "~followup_annotations": [
|
| "@@@SET_BUILD_PROPERTY@failure_hash@\"4d6a903860330c798a14ca4fb8a3b9ea8c90b814\"@@@"
|
|
|