| Index: scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win7_Release__AMD_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win7_Release__ATI_.json b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win7_Release__AMD_.json
|
| similarity index 92%
|
| rename from scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win7_Release__ATI_.json
|
| rename to scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win7_Release__AMD_.json
|
| index f86fc63ef124cc3073bf162e55dd7b378634d860..87cdc6a315d3b037a0c84a1f5a305f1ebe08e2b9 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win7_Release__ATI_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win7_Release__AMD_.json
|
| @@ -12,7 +12,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -48,7 +48,7 @@
|
| "src@1111111",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win7_Release__ATI_",
|
| + "cwd": "[BUILDER_CACHE]\\Win7_Release__AMD_",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -190,7 +190,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src\\tools\\swarming_client\\swarming.py",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -206,7 +206,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win7_Release__ATI_\\src",
|
| + "cwd": "[BUILDER_CACHE]\\Win7_Release__AMD_\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_DEFINES": "component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| @@ -218,7 +218,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -226,9 +226,9 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]\\\\Win7_Release__ATI_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]\\\\Win7_Release__AMD_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Win7 Release (ATI)\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| + "{\"buildername\": \"Win7 Release (AMD)\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -241,14 +241,14 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src\\testing\\buildbot\\chromium.gpu.fyi.json",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src\\testing\\buildbot\\chromium.gpu.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.gpu.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win7_Release__ATI_\\src\\testing\\buildbot\\chromium.gpu.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win7_Release__AMD_\\src\\testing\\buildbot\\chromium.gpu.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Win7 Release (ATI)\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Win7 Release (AMD)\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| @@ -278,7 +278,7 @@
|
| "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",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src\\out\\Release"
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src\\out\\Release"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -305,7 +305,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src",
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--master-name",
|
| @@ -321,11 +321,11 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src\\out\\Release",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src\\out\\Release",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win7_Release__ATI_",
|
| + "cwd": "[BUILDER_CACHE]\\Win7_Release__AMD_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -343,7 +343,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src\\tools\\swarming_client\\swarming.py",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src\\tools\\swarming_client\\swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -354,7 +354,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (ATI)/571",
|
| + "browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (AMD)/571",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -376,7 +376,7 @@
|
| "pool",
|
| "Chrome",
|
| "--tag",
|
| - "buildername:Win7 Release (ATI)",
|
| + "buildername:Win7 Release (AMD)",
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| @@ -402,16 +402,16 @@
|
| "--",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win7_Release__ATI_",
|
| + "cwd": "[BUILDER_CACHE]\\Win7_Release__AMD_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| "name": "[trigger] browser_tests on Windows-7-SP1",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (ATI)/571\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (AMD)/571\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (ATI)/571\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (AMD)/571\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -431,7 +431,7 @@
|
| "python",
|
| "RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
|
| "--swarming-client-dir",
|
| - "[BUILDER_CACHE]\\Win7_Release__ATI_\\src\\tools\\swarming_client",
|
| + "[BUILDER_CACHE]\\Win7_Release__AMD_\\src\\tools\\swarming_client",
|
| "--temp-root-dir",
|
| "[TMP_BASE]",
|
| "--merged-test-output",
|
| @@ -443,9 +443,9 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (ATI)/571\", \"tasks\": {\"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (ATI)/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
|
| + "{\"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (AMD)/571\", \"tasks\": {\"browser_tests/Windows-7-SP1/ffffffffff/Win7 Release (AMD)/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win7_Release__ATI_",
|
| + "cwd": "[BUILDER_CACHE]\\Win7_Release__AMD_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -464,7 +464,7 @@
|
| "--master-name",
|
| "chromium.gpu.fyi",
|
| "--builder-name",
|
| - "Win7 Release (ATI)",
|
| + "Win7 Release (AMD)",
|
| "--build-number",
|
| "571",
|
| "--test-type",
|
| @@ -474,7 +474,7 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win7_Release__ATI_",
|
| + "cwd": "[BUILDER_CACHE]\\Win7_Release__AMD_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -488,7 +488,7 @@
|
| "--target",
|
| "Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win7_Release__ATI_",
|
| + "cwd": "[BUILDER_CACHE]\\Win7_Release__AMD_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
|
|