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

Unified Diff: scripts/slave/recipe_modules/pgo/example.expected/full_chromium_pgo_test_Test_builder.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/recipe_modules/pgo/example.expected/full_chromium_pgo_test_Test_builder.json
diff --git a/scripts/slave/recipe_modules/pgo/example.expected/full_chromium_pgo_test_Test_builder.json b/scripts/slave/recipe_modules/pgo/example.expected/full_chromium_pgo_test_Test_builder.json
index d5cb1c0c1e52d45f82df1dffe75b61ba42667105..221886bc3882517ee362c53da3d646cc4b601328 100644
--- a/scripts/slave/recipe_modules/pgo/example.expected/full_chromium_pgo_test_Test_builder.json
+++ b/scripts/slave/recipe_modules/pgo/example.expected/full_chromium_pgo_test_Test_builder.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,18 +156,19 @@
"--target",
"Release",
"--src-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--goma-cache-dir",
- "[ROOT]\\b\\build\\slave\\goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--clobber",
"--",
"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."
},
@@ -173,16 +178,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"
},
{
@@ -191,16 +197,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"
},
{
@@ -209,16 +216,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"
},
{
@@ -227,16 +235,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"
},
{
@@ -245,16 +254,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"
},
{
@@ -263,16 +273,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"
},
{
@@ -281,16 +292,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"
},
{
@@ -299,16 +311,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"
},
{
@@ -317,16 +330,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"
},
{
@@ -335,16 +349,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"
},
{
@@ -353,16 +368,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"
},
{
@@ -371,16 +387,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"
},
{
@@ -389,16 +406,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"
},
{
@@ -407,16 +425,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"
},
{
@@ -425,16 +444,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"
},
{
@@ -443,16 +463,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"
},
{
@@ -461,16 +482,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"
},
{
@@ -479,16 +501,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"
},
{
@@ -497,16 +520,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"
},
{
@@ -515,16 +539,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"
},
{
@@ -533,16 +558,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"
},
{
@@ -551,16 +577,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"
},
{
@@ -569,16 +596,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"
},
{
@@ -587,16 +615,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"
},
{
@@ -605,16 +634,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"
},
{
@@ -623,16 +653,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"
},
{
@@ -641,16 +672,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"
},
{
@@ -660,6 +692,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",
@@ -683,14 +716,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"
},

Powered by Google App Engine
This is Rietveld 408576698