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

Unified Diff: scripts/slave/recipes/chromium_pgo.expected/full_tryserver_chromium_win_win_pgo.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
Index: scripts/slave/recipes/chromium_pgo.expected/full_tryserver_chromium_win_win_pgo.json
diff --git a/scripts/slave/recipes/chromium_pgo.expected/full_tryserver_chromium_win_win_pgo.json b/scripts/slave/recipes/chromium_pgo.expected/full_tryserver_chromium_win_win_pgo.json
index 0b10b143edec3f3681ba9e7c8a06e7ef644e9d30..06355e7441615a8177ac9ff873da35f4127a0cb8 100644
--- a/scripts/slave/recipes/chromium_pgo.expected/full_tryserver_chromium_win_win_pgo.json
+++ b/scripts/slave/recipes/chromium_pgo.expected/full_tryserver_chromium_win_win_pgo.json
@@ -5,6 +5,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "taskkill"
},
{
@@ -19,13 +20,13 @@
"--slave",
"TestSlavename",
"--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'}]",
+ "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'}]",
"--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",
@@ -33,6 +34,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -111,11 +113,12 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_DEFINES": "buildtype=Official chrome_pgo_phase=1 component=static_library fastbuild=0 target_arch=ia32 use_goma=0",
"GYP_MSVS_VERSION": "2015",
- "PATH": "[CWD]\\src\\out\\Release;%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
+ "PATH": "[SLAVE_BUILD]\\src\\out\\Release;%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient Runhooks: Instrumentation phase."
},
@@ -125,9 +128,10 @@
"-u",
"\nimport sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n",
"*.pg[cd]",
- "[CWD]\\src\\out\\Release"
+ "[SLAVE_BUILD]\\src\\out\\Release"
],
- "name": "rmwildcard *.pg[cd] in [CWD]\\src\\out\\Release",
+ "cwd": "[SLAVE_BUILD]",
+ "name": "rmwildcard *.pg[cd] in [SLAVE_BUILD]\\src\\out\\Release",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
@@ -152,17 +156,18 @@
"--target",
"Release",
"--src-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--goma-cache-dir",
- "[ROOT]\\b\\build\\slave\\goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--",
"chrome"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "PATH": "[CWD]\\src\\out\\Release;%(PATH)s"
+ "PATH": "[SLAVE_BUILD]\\src\\out\\Release;%(PATH)s"
},
"name": "Compile: Instrumentation phase."
},
@@ -172,16 +177,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"page_cycler.morejs"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: page_cycler.morejs"
},
{
@@ -190,16 +196,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.jslibstyleprototype"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.jslibstyleprototype"
},
{
@@ -208,16 +215,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.jslibeventprototype"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.jslibeventprototype"
},
{
@@ -226,16 +234,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"speedometer"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: speedometer"
},
{
@@ -244,16 +253,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"smoothness.top_25_smooth"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: smoothness.top_25_smooth"
},
{
@@ -262,16 +272,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"octane"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: octane"
},
{
@@ -280,16 +291,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_perf.svg"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_perf.svg"
},
{
@@ -298,16 +310,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.jslibtraverseprototype"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.jslibtraverseprototype"
},
{
@@ -316,16 +329,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_style.top_25"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_style.top_25"
},
{
@@ -334,16 +348,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.domcoreattr"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.domcoreattr"
},
{
@@ -352,16 +367,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_perf.dom"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_perf.dom"
},
{
@@ -370,16 +386,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.jslibattrprototype"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.jslibattrprototype"
},
{
@@ -388,16 +405,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"sunspider"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: sunspider"
},
{
@@ -406,16 +424,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"media.mse_cases"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: media.mse_cases"
},
{
@@ -424,16 +443,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"v8.infinite_scroll"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: v8.infinite_scroll"
},
{
@@ -442,16 +462,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_perf.events"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_perf.events"
},
{
@@ -460,16 +481,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.domcoretraverse"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.domcoretraverse"
},
{
@@ -478,16 +500,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.domcoremodify"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.domcoremodify"
},
{
@@ -496,16 +519,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.cssqueryjquery"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.cssqueryjquery"
},
{
@@ -514,16 +538,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"indexeddb_perf"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: indexeddb_perf"
},
{
@@ -532,16 +557,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_perf.canvas"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_perf.canvas"
},
{
@@ -550,16 +576,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.domcorequery"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.domcorequery"
},
{
@@ -568,16 +595,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_perf.bindings"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_perf.bindings"
},
{
@@ -586,16 +614,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.jslibtraversejquery"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.jslibtraversejquery"
},
{
@@ -604,16 +633,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"dromaeo.jslibmodifyprototype"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: dromaeo.jslibmodifyprototype"
},
{
@@ -622,16 +652,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_perf.css"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_perf.css"
},
{
@@ -640,16 +671,17 @@
"-u",
"RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
"--checkout-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--browser-type",
"release",
"--target-bits",
"32",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--benchmark",
"blink_perf.paint"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Telemetry benchmark: blink_perf.paint"
},
{
@@ -659,6 +691,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_DEFINES": "buildtype=Official chrome_pgo_phase=2 component=static_library fastbuild=0 target_arch=ia32 use_goma=0",
@@ -682,14 +715,15 @@
"--target",
"Release",
"--src-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--goma-cache-dir",
- "[ROOT]\\b\\build\\slave\\goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--",
"chrome"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -713,6 +747,7 @@
"--build-properties",
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"win_pgo\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"recipe\": \"chromium_pgo\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "package build"
},
{

Powered by Google App Engine
This is Rietveld 408576698