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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.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/use_v8_patch_on_blink_trybot_test_failures.json ('k') | scripts/slave/recipes/chromium_trybot.expected/webkit_tests_interrupted.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/use_v8_patch_on_chromium_trybot.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.json
index 46645b94e581582f0feb21f220e6bd94ba1faa6f..1354118db7bf96e07738bb471526200cc883e8d7 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.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\\v8",
"--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",
@@ -40,6 +41,7 @@
"src/v8@HEAD",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -114,6 +116,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -124,16 +127,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@@@"
@@ -141,10 +145,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",
@@ -152,6 +156,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@@@",
@@ -170,9 +175,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": [
@@ -186,10 +192,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": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (with patch)"
@@ -198,7 +205,7 @@
"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",
"--",
@@ -206,10 +213,11 @@
"Release",
"--use-src-side-runtest-py",
"--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_chromium_rel_ng\", \"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@{}@@@",
@@ -221,12 +229,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\src\\testing\\buildbot\\chromium.gpu.json",
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.gpu.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.gpu.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.gpu.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -236,12 +245,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\src\\testing\\buildbot\\chromium.win.json",
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.win.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -260,7 +270,7 @@
"--cached",
"--name-only"
],
- "cwd": "[CWD]\\src\\v8",
+ "cwd": "[SLAVE_BUILD]\\src\\v8",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -274,9 +284,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'@@@",
@@ -298,7 +309,7 @@
"cmd": [
"python",
"-u",
- "[CWD]\\src\\tools\\mb\\mb.py",
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
"analyze",
"-m",
"tryserver.chromium.win",
@@ -309,6 +320,7 @@
"{\"additional_compile_targets\": [\"chromium_builder_tests\"], \"files\": [\"v8/foo.cc\"], \"test_targets\": [\"blink_heap_unittests\", \"blink_platform_unittests\", \"mini_installer\", \"webkit_unit_tests\", \"wtf_unittests\"]}",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "analyze",
"~followup_annotations": [
"@@@STEP_TEXT@No compile necessary@@@",
@@ -345,24 +357,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_chromium_rel_ng",
"--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"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files (with patch)"
},
{
@@ -380,9 +394,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--goma-cache-dir",
- "[ROOT]\\b\\build\\slave\\goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -392,13 +406,14 @@
"--goma-service-account-json-file",
"C:\\creds\\service_accounts\\service-account-goma-client.json",
"--goma-dir",
- "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
+ "[CACHE]\\cipd\\goma",
"--goma-fail-fast",
"--goma-disable-local-fallback",
"--ninja-ensure-up-to-date",
"--",
"blink_tests"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -414,24 +429,26 @@
"-u",
"import sys; sys.exit(0)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "mark: before_tests"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\src\\testing\\scripts\\webkit_lint.py",
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\webkit_lint.py",
"--build-config-fs",
"Release",
"--use-src-side-runtest-py",
"--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_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}",
"run",
"--output",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "webkit_lint (with patch)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -445,18 +462,19 @@
"cmd": [
"python",
"-u",
- "[CWD]\\src\\testing\\scripts\\webkit_python_tests.py",
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\webkit_python_tests.py",
"--build-config-fs",
"Release",
"--use-src-side-runtest-py",
"--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_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}",
"run",
"--output",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "webkit_python_tests (with patch)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -482,13 +500,13 @@
"--slave-name=TestSlavename",
"--build-number=571",
"--run-python-script",
- "[ROOT]\\b\\build\\scripts\\slave\\chromium\\layout_test_wrapper.py",
+ "[BUILD]\\scripts\\slave\\chromium\\layout_test_wrapper.py",
"--target",
"Release",
"-o",
- "[CWD]\\layout-test-results",
+ "[SLAVE_BUILD]\\layout-test-results",
"--build-dir",
- "[CWD]\\src\\out",
+ "[SLAVE_BUILD]\\src\\out",
"--json-test-results",
"/path/to/tmp/json",
"--test-results-server",
@@ -500,6 +518,7 @@
"--step-name",
"webkit_tests (with patch)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "webkit_tests (with patch)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
@@ -509,11 +528,11 @@
"cmd": [
"python",
"-u",
- "[ROOT]\\b\\build\\scripts\\slave\\chromium\\archive_layout_test_results.py",
+ "[BUILD]\\scripts\\slave\\chromium\\archive_layout_test_results.py",
"--results-dir",
- "[CWD]\\layout-test-results",
+ "[SLAVE_BUILD]\\layout-test-results",
"--build-dir",
- "[CWD]\\src\\out",
+ "[SLAVE_BUILD]\\src\\out",
"--build-number",
"571",
"--builder-name",
@@ -521,6 +540,7 @@
"--gs-bucket",
"gs://chromium-layout-test-archives"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "archive_webkit_tests_results",
"~followup_annotations": [
"@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/win_chromium_rel_ng/571/layout-test-results/results.html@@@",
@@ -535,6 +555,7 @@
"--target",
"Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "process_dumps"
},
{
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot_test_failures.json ('k') | scripts/slave/recipes/chromium_trybot.expected/webkit_tests_interrupted.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698