scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.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/findit/chromium/test.expected/nonexistent_test_step_skipped.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json

diff --git a/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json b/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json

index c26d95fe89d1a7a4afbe26a29524db574d8712a1..04e3c3e3248486ef5e02f0f88695abf4fe9e628b 100644

--- a/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json

+++ b/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json

@@ -5,6 +5,7 @@

"-u",

"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "taskkill"

{

@@ -19,19 +20,20 @@

"--slave",

"build1-a1",

"--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",

"src@r1",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"

@@ -105,6 +107,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "ensure_goma"

{

@@ -115,16 +118,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@@@"

@@ -132,10 +136,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",

@@ -143,6 +147,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@@@",

@@ -161,9 +166,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": [

@@ -177,10 +183,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 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 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"

@@ -189,7 +196,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",

"--",

@@ -197,10 +204,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_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"

+ "cwd": "[SLAVE_BUILD]",

"name": "get compile targets for scripts",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{}@@@",

@@ -212,12 +220,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",

"~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@@@"

]

@@ -236,7 +245,7 @@

"--format=%H",

"r0..r1"

- "cwd": "[CWD]\\src",

+ "cwd": "[SLAVE_BUILD]\\src",

"name": "git commits in range",

"stdout": "/path/to/tmp/",

"~followup_annotations": [

@@ -246,6 +255,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1"

{

@@ -254,6 +264,7 @@

"-u",

"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.taskkill",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -271,19 +282,20 @@

"--slave",

"build1-a1",

"--spec",

"--root",

"src",

"--revision_mapping_file",

"--git-cache-dir",

- "[ROOT]\\b\\build\\slave\\cache_dir",

+ "[GIT_CACHE]",

"--output_json",

"/path/to/tmp/json",

"--revision",

"src@r1",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"

@@ -358,6 +370,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.ensure_goma",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -371,16 +384,17 @@

"--platform",

"windows-amd64",

"--dest-directory",

- "[CWD]\\cipd",

+ "[SLAVE_BUILD]\\cipd",

"--json-output",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.ensure_goma.install cipd",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@2@@@",

"@@@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@@@"

@@ -388,10 +402,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",

@@ -399,6 +413,7 @@

"--service-account-json",

"C:\\creds\\service_accounts\\service-account-goma-client.json"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.ensure_goma.ensure_installed",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@2@@@",

@@ -420,10 +435,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",

"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"

"name": "test r1.gclient runhooks",

@@ -435,7 +451,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",

"--",

@@ -443,10 +459,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\"}",

"--properties",

"{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.get compile targets for scripts",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

@@ -459,13 +476,14 @@

"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": "test r1.read test spec",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

- "@@@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_LINE@json.output@ \"Win7 Tests (1)\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",

@@ -490,6 +508,7 @@

"python",

"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.cleanup_temp",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -501,9 +520,10 @@

"-u",

"RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",

"--build-dir",

- "[CWD]\\src\\out\\Release",

+ "[SLAVE_BUILD]\\src\\out\\Release",

"--clean-isolated-files"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.clean isolated files",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -513,20 +533,21 @@

"cmd": [

"python",

"-u",

- "[CWD]\\src\\tools\\mb\\mb.py",

+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",

"gen",

"-m",

"chromium.win",

"-b",

"Win Builder",

"--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",

"--swarming-targets-file",

"gl_tests\n",

"//out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.generate_build_files",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

@@ -549,9 +570,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",

@@ -561,12 +582,13 @@

"--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",

"--ninja-ensure-up-to-date",

"--",

"gl_tests",

"gl_tests_run"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"

@@ -583,11 +605,11 @@

"-u",

"RECIPE_MODULE[build::isolate]\\resources\\remove_build_metadata.py",

"--build-dir",

- "[CWD]\\src\\out\\Release",

+ "[SLAVE_BUILD]\\src\\out\\Release",

"--src-dir",

- "[CWD]\\src"

+ "[SLAVE_BUILD]\\src"

- "cwd": "[CWD]",

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.remove_build_metadata",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -598,15 +620,16 @@

"python",

"-u",

"RECIPE_MODULE[build::isolate]\\resources\\isolate.py",

- "[CWD]\\src\\tools\\swarming_client",

+ "[SLAVE_BUILD]\\src\\tools\\swarming_client",

"batcharchive",

"--dump-json",

"/path/to/tmp/json",

"--isolate-server",

"https://isolateserver.appspot.com",

"--verbose",

- "[CWD]\\src\\out\\Release\\gl_tests.isolated.gen.json"

+ "[SLAVE_BUILD]\\src\\out\\Release\\gl_tests.isolated.gen.json"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.isolate tests",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

@@ -620,7 +643,7 @@

"cmd": [

"python",

"-u",

- "[CWD]\\src\\tools\\swarming_client\\swarming.py",

+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",

"trigger",

"--swarming",

"https://chromium-swarm.appspot.com",

@@ -680,6 +703,7 @@

"--gtest_filter=Test.One:Test.Two:Test.Three",

"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.[trigger] gl_tests (r1) on Windows-7-SP1",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

@@ -706,9 +730,9 @@

"python",

"RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",

"--swarming-client-dir",

- "[CWD]\\src\\tools\\swarming_client",

+ "[SLAVE_BUILD]\\src\\tools\\swarming_client",

"--temp-root-dir",

- "[TMP]",

+ "[TMP_BASE]",

"--merged-test-output",

"/path/to/tmp/json",

"--",

@@ -721,6 +745,7 @@

"1",

"gl_tests (r1)/Windows-7-SP1/[dummy has/win_chromium_variable/1"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.gl_tests (r1) on Windows-7-SP1",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

@@ -749,6 +774,7 @@

"--chrome-revision",

"170242"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.Upload to test-results [test r1.gl_tests (r1) on Windows-7-SP1]",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -762,6 +788,7 @@

"--target",

"Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.process_dumps",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -773,6 +800,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "report",

"~followup_annotations": [

"@@@STEP_LOG_LINE@report@{@@@",