scripts/slave/recipes/ios/try.expected/without_patch_success.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Unified Diff: scripts/slave/recipes/ios/try.expected/without_patch_success.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « scripts/slave/recipes/ios/try.expected/without_patch_failure.json ('k') | scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5a958d38bfa1089a192e7fce2d719d588eef0d98..d5eaf344e14cfdd88831cc0c90de24313ce319c3 100644

--- a/scripts/slave/recipes/ios/try.expected/without_patch_success.json

+++ b/scripts/slave/recipes/ios/try.expected/without_patch_success.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]",

"--patch_url",

"patch url",

"--rietveld_server",

@@ -51,6 +52,7 @@

"--force",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -127,9 +129,10 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[CWD]/src/ios/build/bots/tryserver.fake/ios.json",

+ "[SLAVE_BUILD]/src/ios/build/bots/tryserver.fake/ios.json",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read build config",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{@@@",

@@ -158,6 +161,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\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests\", \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"

{

@@ -168,6 +172,7 @@

"--version",

"fake xcode version"

+ "cwd": "[SLAVE_BUILD]",

"name": "find xcode",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{}@@@",

@@ -181,6 +186,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

+ "cwd": "[SLAVE_BUILD]",

"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",

@@ -200,7 +206,7 @@

"--cached",

"--name-only"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"name": "git diff to analyze patch",

"stdout": "/path/to/tmp/",

"~followup_annotations": [

@@ -213,9 +219,10 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[CWD]/src/testing/buildbot/trybot_analyze_config.json",

+ "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read filter exclusion spec",

"~followup_annotations": [

"@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",

@@ -241,6 +248,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "analyze",

"~followup_annotations": [

"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",

@@ -272,11 +280,11 @@

"cmd": [

"ninja",

"-C",

- "[CWD]/src/out/Debug-iphonesimulator",

+ "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",

"All",

"fake tests"

- "cwd": "[CWD]/src/out/Debug-iphonesimulator",

+ "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",

"name": "compile (with patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -295,13 +303,13 @@

"--slave",

"fake-vm",

"--spec",

"--root",

"src",

"--revision_mapping_file",

"--git-cache-dir",

- "[ROOT]/b/build/slave/cache_dir",

+ "[GIT_CACHE]",

"--rietveld_server",

"fake://rietveld.url",

"--output_json",

@@ -311,6 +319,7 @@

"--force",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -377,6 +386,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

+ "cwd": "[SLAVE_BUILD]",

"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",

@@ -393,9 +403,9 @@

"cmd": [

"ninja",

"-C",

- "[CWD]/src/out/Debug-iphonesimulator"

+ "[SLAVE_BUILD]/src/out/Debug-iphonesimulator"

- "cwd": "[CWD]/src/out/Debug-iphonesimulator",

+ "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",

"name": "compile (without patch)",

"~followup_annotations": [

"@@@SET_BUILD_PROPERTY@failure_hash@\"4d6a903860330c798a14ca4fb8a3b9ea8c90b814\"@@@"