Index: scripts/slave/recipes/ios/unified_builder_tester.expected/multiple_failures.json |
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/multiple_failures.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/multiple_failures.json |
index 59b3f339484c06d7bac8dbf9a35ba04999430db7..81d72d7ddf6ebff66341aa95c97071e951d12639 100644 |
--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/multiple_failures.json |
+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/multiple_failures.json |
@@ -5,6 +5,7 @@ |
"--json-file", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "host and tools info", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@", |
@@ -33,13 +34,13 @@ |
"--slave", |
"fake-vm", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['ios']", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['ios']", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -47,6 +48,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -123,9 +125,10 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[CWD]/src/ios/build/bots/chromium.fake/ios.json", |
+ "[SLAVE_BUILD]/src/ios/build/bots/chromium.fake/ios.json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read build config", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -179,6 +182,7 @@ |
"-e", |
"{\n \"GYP_DEFINES\": {\n \"OS\": \"ios\", \n \"component\": \"static_library\", \n \"fake gyp define 1\": \"fake value 1\", \n \"fake gyp define 2\": \"fake value 2\"\n }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"xcodebuild\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator7.1\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake tests 3\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake tests 4\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake tests 5\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake tests 6\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "finalize build config" |
}, |
{ |
@@ -189,6 +193,7 @@ |
"--version", |
"fake xcode version" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "find xcode", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
@@ -202,6 +207,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GYP_DEFINES": "fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios", |
"GYP_GENERATORS": "xcode", |
@@ -220,27 +226,28 @@ |
"-configuration", |
"Debug", |
"-project", |
- "[CWD]/src/build/all.xcodeproj", |
+ "[SLAVE_BUILD]/src/build/all.xcodeproj", |
"-sdk", |
"iphonesimulator7.1" |
], |
- "cwd": "[CWD]/src/xcodebuild", |
+ "cwd": "[SLAVE_BUILD]/src/xcodebuild", |
"name": "compile" |
}, |
{ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py", |
"--app", |
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 1.app", |
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 1.app", |
"--json_file", |
"/path/to/tmp/json", |
"--iossim", |
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
"--platform", |
"fake device", |
"--version", |
"8.1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "fake tests 1 (fake device iOS 8.1)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -265,16 +272,17 @@ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py", |
"--app", |
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 2.app", |
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 2.app", |
"--json_file", |
"/path/to/tmp/json", |
"--iossim", |
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
"--platform", |
"fake device", |
"--version", |
"8.1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "fake tests 2 (fake device iOS 8.1)", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |
@@ -301,16 +309,17 @@ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py", |
"--app", |
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 3.app", |
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 3.app", |
"--json_file", |
"/path/to/tmp/json", |
"--iossim", |
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
"--platform", |
"fake device", |
"--version", |
"8.1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "fake tests 3 (fake device iOS 8.1)", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |
@@ -337,16 +346,17 @@ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py", |
"--app", |
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 4.app", |
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 4.app", |
"--json_file", |
"/path/to/tmp/json", |
"--iossim", |
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
"--platform", |
"fake device", |
"--version", |
"8.1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "fake tests 4 (fake device iOS 8.1)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -371,16 +381,17 @@ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py", |
"--app", |
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 5.app", |
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 5.app", |
"--json_file", |
"/path/to/tmp/json", |
"--iossim", |
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
"--platform", |
"fake device", |
"--version", |
"8.1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "fake tests 5 (fake device iOS 8.1)", |
"~followup_annotations": [ |
"step returned non-zero exit code: 2", |
@@ -407,16 +418,17 @@ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py", |
"--app", |
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 6.app", |
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 6.app", |
"--json_file", |
"/path/to/tmp/json", |
"--iossim", |
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim", |
"--platform", |
"fake device", |
"--version", |
"8.1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "fake tests 6 (fake device iOS 8.1)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |