Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Perf.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Perf.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Perf.json |
index 4cb10208a401e2a663e5ece6de03a82dcbb5eeac..6bf14bc764c55549a270519dd0c369047483ae48 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Perf.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Perf.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', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]", |
"--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]" |
}, |
@@ -106,6 +108,7 @@ |
}, |
{ |
"cmd": [], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma" |
}, |
{ |
@@ -116,16 +119,17 @@ |
"--platform", |
"windows-386", |
"--dest-directory", |
- "[CWD]\\cipd", |
+ "[SLAVE_BUILD]\\cipd", |
"--json-output", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma.install cipd", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
@@ -133,10 +137,10 @@ |
}, |
{ |
"cmd": [ |
- "fake_slave_build/cipd", |
+ "[SLAVE_BUILD]\\cipd\\cipd", |
"ensure", |
"--root", |
- "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma", |
+ "[CACHE]\\cipd\\goma", |
"--list", |
"infra_internal/goma/client/windows-amd64 release", |
"--json-output", |
@@ -144,6 +148,7 @@ |
"--service-account-json", |
"C:\\creds\\service_accounts\\service-account-goma-client.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma.ensure_installed", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -165,9 +170,10 @@ |
"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": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' target_arch=ia32 use_goma=1", |
+ "GYP_DEFINES": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 use_goma=1", |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -181,6 +187,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -188,8 +195,9 @@ |
"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", |
- "[CWD]\\src\\out\\Release" |
+ "[SLAVE_BUILD]\\src\\out\\Release" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rmtree build directory", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -219,13 +227,14 @@ |
"--build-number", |
"571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "extract build" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\tools\\perf\\run_benchmark", |
+ "[SLAVE_BUILD]\\src\\tools\\perf\\run_benchmark", |
"list", |
"--browser", |
"release", |
@@ -234,6 +243,7 @@ |
"--num-shards", |
"1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "List Perf Tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -297,6 +307,7 @@ |
"-v", |
"--b=2" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "blink_perf.all.exact", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[]@@@", |
@@ -332,6 +343,7 @@ |
"-v", |
"--b=2" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "blink_perf.all.release", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[]@@@", |
@@ -366,6 +378,7 @@ |
"--upload-results", |
"blink_perf.dom" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "blink_perf.dom", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[]@@@", |
@@ -398,6 +411,7 @@ |
"--run-python-script", |
"/path/to/run_benchmark" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "dromaeo.cssqueryjquery", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[]@@@", |
@@ -430,6 +444,7 @@ |
"--run-python-script", |
"/path/to/run_benchmark" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "dromaeo.cssqueryjquery.release", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[]@@@", |
@@ -444,6 +459,7 @@ |
"--target", |
"Release" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "process_dumps" |
}, |
{ |