Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge 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/webrtc/ios_api_framework.expected/build_failure.json ('k') | scripts/slave/recipes/webrtc/libfuzzer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json
diff --git a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json
index 87534b4e5bb45bee3cb888e410c7efdf53a3cf44..8a4322bad4279c2293a5b8e3d9811c28b221b33b 100644
--- a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json
+++ b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json
@@ -5,7 +5,6 @@
"--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)@@@",
@@ -34,20 +33,19 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['ios', 'mac']",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['ios', 'mac']",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -86,7 +84,6 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -97,9 +94,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/src/out_ios_arm"
+ "[CWD]/src/out_ios_arm"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree out_ios_arm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -117,9 +113,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/src/out_ios_arm64"
+ "[CWD]/src/out_ios_arm64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree out_ios_arm64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -137,9 +132,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/src/out_ios_framework"
+ "[CWD]/src/out_ios_framework"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree out_ios_framework",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -157,9 +151,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/src/out_ios_ia32"
+ "[CWD]/src/out_ios_ia32"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree out_ios_ia32",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -177,9 +170,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/src/out_ios_libs"
+ "[CWD]/src/out_ios_libs"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree out_ios_libs",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -197,9 +189,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/src/out_ios_x86_64"
+ "[CWD]/src/out_ios_x86_64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree out_ios_x86_64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -214,9 +205,9 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/webrtc/build/ios/build_ios_framework.sh"
+ "[CWD]/src/webrtc/build/ios/build_ios_framework.sh"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[CWD]/src",
"name": "build"
},
{
@@ -225,9 +216,8 @@
"-u",
"RECIPE_MODULE[build::zip]/resources/zip.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "zip",
- "stdin": "{\"entries\": [{\"path\": \"[SLAVE_BUILD]/src/out_ios_framework\", \"type\": \"dir\"}], \"output\": \"[SLAVE_BUILD]/webrtc_ios_api_framework.zip\", \"root\": \"[SLAVE_BUILD]/src/out_ios_framework\"}"
+ "stdin": "{\"entries\": [{\"path\": \"[CWD]/src/out_ios_framework\", \"type\": \"dir\"}], \"output\": \"[CWD]/webrtc_ios_api_framework.zip\", \"root\": \"[CWD]/src/out_ios_framework\"}"
},
{
"cmd": [
@@ -235,15 +225,14 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
"-a",
"public-read",
- "[SLAVE_BUILD]/webrtc_ios_api_framework.zip",
+ "[CWD]/webrtc_ios_api_framework.zip",
"gs://chromium-webrtc/ios_api_framework/webrtc_ios_api_framework_170242.zip"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://storage.googleapis.com/chromium-webrtc/ios_api_framework/webrtc_ios_api_framework_170242.zip@@@"
« no previous file with comments | « scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json ('k') | scripts/slave/recipes/webrtc/libfuzzer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698