| Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__4_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_7_Intel_GPU_Perf__4_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__4_.json
|
| similarity index 93%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_7_Intel_GPU_Perf__4_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__4_.json
|
| index aeb7b42656df07ea52eddafb39bf2540c65e5100..15347c2c6d5fcc85d4a78c851216fbd73d5eda2a 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_7_Intel_GPU_Perf__4_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__4_.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]\\Win_7_Intel_GPU_Perf__4_",
|
| + "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -37,7 +37,7 @@
|
| "--master",
|
| "chromium.perf",
|
| "--builder",
|
| - "Win 7 Intel GPU Perf (4)",
|
| + "Win 10 High-DPI Perf (4)",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -55,7 +55,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_",
|
| + "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -200,7 +200,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_\\src",
|
| + "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -213,16 +213,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release_x64",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_7_Intel_GPU_Perf__4_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_High_DPI_Perf__4_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Win 7 Intel GPU Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win7-gpu-intel\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| + "{\"buildername\": \"Win 10 High-DPI Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-high-dpi\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -235,12 +235,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json",
|
| + "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.perf.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -261,7 +261,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]\\Win_7_Intel_GPU_Perf__4_\\src\\out\\Release_x64"
|
| + "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\out\\Release_x64"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -288,7 +288,7 @@
|
| "--target",
|
| "Release_x64",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_\\src",
|
| + "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src",
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--master-name",
|
| @@ -302,7 +302,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_\\src\\tools\\perf\\run_benchmark",
|
| + "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\tools\\perf\\run_benchmark",
|
| "list",
|
| "--browser",
|
| "release_x64",
|
| @@ -311,7 +311,7 @@
|
| "--num-shards",
|
| "5"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_",
|
| + "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -358,24 +358,24 @@
|
| "--target",
|
| "Release_x64",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 7 Intel GPU Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 7 Intel GPU Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=dromaeo.cssqueryjquery",
|
| - "--perf-id=chromium-rel-win7-gpu-intel",
|
| + "--perf-id=win-high-dpi",
|
| "--test-type=dromaeo.cssqueryjquery",
|
| "--step-name=dromaeo.cssqueryjquery",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Win 7 Intel GPU Perf (4)",
|
| + "--builder-name=Win 10 High-DPI Perf (4)",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| "/path/to/run_benchmark"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_",
|
| + "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -393,7 +393,7 @@
|
| "--target",
|
| "Release_x64"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win_7_Intel_GPU_Perf__4_",
|
| + "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
|
|