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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.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/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_dbg.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_optional_gpu_tests_rel.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json
index f8bd1b176359bc6e922c0ea629bc008c090af536..2028e8a50e6efeeb1e4ed7264f1d0052b470514f 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.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'}, {'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'}]",
+ "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'}]",
"--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]",
"--issue",
"12853011",
"--patchset",
@@ -38,6 +39,7 @@
"src@HEAD",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -111,6 +113,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -121,16 +124,17 @@
"--platform",
"windows-amd64",
"--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@@@"
@@ -138,10 +142,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",
@@ -149,6 +153,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@@@",
@@ -167,9 +172,10 @@
"cmd": [
"python",
"-u",
- "[CWD]\\src\\tools\\swarming_client\\swarming.py",
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
"--version"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -183,10 +189,11 @@
"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_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (with patch)"
@@ -195,17 +202,18 @@
"cmd": [
"python",
"-u",
- "[CWD]\\src\\testing\\scripts\\get_compile_targets.py",
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release_x64",
"--paths",
- "{\"checkout\": \"[CWD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
"{\"buildername\": \"win_clang_x64_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -217,12 +225,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\src\\testing\\buildbot\\chromium.fyi.json",
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -241,7 +250,7 @@
"--cached",
"--name-only"
],
- "cwd": "[CWD]\\src",
+ "cwd": "[SLAVE_BUILD]\\src",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -255,9 +264,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'@@@",
@@ -280,6 +290,7 @@
"-u",
"import sys; sys.exit(0)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "analyze",
"~followup_annotations": [
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
@@ -309,24 +320,26 @@
"python",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\src\\tools\\mb\\mb.py",
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
"gen",
"-m",
"tryserver.chromium.win",
"-b",
"win_clang_x64_rel",
"--config-file",
- "[CWD]\\src\\tools\\mb\\mb_config.pyl",
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
"--goma-dir",
- "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
+ "[CACHE]\\cipd\\goma",
"//out/Release_x64"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files (with patch)"
},
{
@@ -336,10 +349,11 @@
"-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\clang_revision.py",
"--src-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -366,9 +380,9 @@
"--target",
"Release_x64",
"--src-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--goma-cache-dir",
- "[ROOT]\\b\\build\\slave\\goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -380,13 +394,14 @@
"--mode",
"official",
"--goma-dir",
- "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
+ "[CACHE]\\cipd\\goma",
"--goma-fail-fast",
"--goma-disable-local-fallback",
"--clobber",
"--",
"all"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -402,6 +417,7 @@
"-u",
"import sys; sys.exit(0)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "mark: before_tests"
},
{
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_dbg.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_optional_gpu_tests_rel.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698