| Index: scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_NextGen_Win_Builder__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang.json b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_NextGen_Win_Builder__dbg_.json
|
| similarity index 86%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_NextGen_Win_Builder__dbg_.json
|
| index 2da856f2d121c703b54fcbca728eb7908b029017..002d18ade13653cbc41ea9f15ec9ced264535a41 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_NextGen_Win_Builder__dbg_.json
|
| @@ -14,9 +14,9 @@
|
| "-u",
|
| "[BUILD]\\scripts\\slave\\bot_update.py",
|
| "--master",
|
| - "chromium.fyi",
|
| + "chromium.gpu.fyi",
|
| "--builder",
|
| - "CrWinClang",
|
| + "GPU NextGen Win Builder (dbg)",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -29,6 +29,8 @@
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| + "--revision",
|
| + "src/third_party/angle@HEAD",
|
| "--output_manifest"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -120,7 +122,7 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library fastbuild=1 target_arch=ia32 test_isolation_mode=prepare"
|
| + "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=shared_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' internal_gles2_conform_tests=1 proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -129,15 +131,15 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.gpu.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.gpu.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"CrWinClang tester\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Win7 NextGen Debug (NVIDIA)\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| @@ -160,11 +162,12 @@
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| - "Release",
|
| + "Debug",
|
| + "--use-src-side-runtest-py",
|
| "--paths",
|
| "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"CrWinClang\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| + "{\"buildername\": \"GPU NextGen Win Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| @@ -188,53 +191,41 @@
|
| "-u",
|
| "RECIPE_MODULE[isolate]\\resources\\find_isolated_tests.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| + "[SLAVE_BUILD]\\src\\out\\Debug",
|
| "--clean-isolated-files"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "clean isolated files"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]\\scripts\\slave\\clang_revision.py",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "clang_revision",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| "[BUILD]\\scripts\\slave\\compile.py",
|
| "--target",
|
| - "Release",
|
| + "Debug",
|
| "--src-dir",
|
| "[SLAVE_BUILD]\\src",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| - "clang",
|
| - "--mode",
|
| - "official",
|
| - "--clobber",
|
| + "goma",
|
| + "--goma-jsonstatus",
|
| + "/path/to/tmp/json",
|
| + "--goma-dir",
|
| + "[BUILD]\\goma",
|
| + "--ninja-ensure-up-to-date",
|
| "--",
|
| - "all"
|
| + "browser_tests",
|
| + "browser_tests_run",
|
| + "crash_service"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "compile"
|
| + "name": "compile",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| + "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -242,7 +233,7 @@
|
| "-u",
|
| "RECIPE_MODULE[isolate]\\resources\\remove_build_metadata.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| + "[SLAVE_BUILD]\\src\\out\\Debug",
|
| "--src-dir",
|
| "[SLAVE_BUILD]\\src"
|
| ],
|
| @@ -261,7 +252,7 @@
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\browser_tests.isolated.gen.json"
|
| + "[SLAVE_BUILD]\\src\\out\\Debug\\browser_tests.isolated.gen.json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| @@ -279,15 +270,15 @@
|
| "-u",
|
| "[BUILD]\\scripts\\slave\\zip_build.py",
|
| "--target",
|
| - "Release",
|
| + "Debug",
|
| "--build-url",
|
| - "gs://chromium-fyi-archive/chromium.fyi/CrWinClang",
|
| + "gs://chromium-gpu-fyi-archive/chromium.gpu.fyi/GPU NextGen Win Builder (dbg)",
|
| "--build_revision",
|
| "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"CrWinClang\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"GPU NextGen Win Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"CrWinClang\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"GPU NextGen Win Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "package build"
|
| @@ -298,7 +289,7 @@
|
| "name": "trigger",
|
| "trigger_specs": [
|
| {
|
| - "builder_name": "CrWinClang tester",
|
| + "builder_name": "Win7 NextGen Debug (NVIDIA)",
|
| "properties": {
|
| "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
|
| "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
|
| @@ -316,7 +307,7 @@
|
| }
|
| ],
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@CrWinClang tester@@@"
|
| + "@@@STEP_TEXT@Win7 NextGen Debug (NVIDIA)@@@"
|
| ]
|
| },
|
| {
|
|
|