diff options
Diffstat (limited to 'infra/bots/recipe_modules')
-rw-r--r-- | infra/bots/recipe_modules/core/examples/full.py | 2 | ||||
-rw-r--r-- | infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json (renamed from infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json) | 12 | ||||
-rw-r--r-- | infra/bots/recipe_modules/flavor/examples/full.py | 2 | ||||
-rw-r--r-- | infra/bots/recipe_modules/run/examples/full.expected/test.json | 38 | ||||
-rw-r--r-- | infra/bots/recipe_modules/run/examples/full.py | 2 | ||||
-rw-r--r-- | infra/bots/recipe_modules/vars/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json (renamed from infra/bots/recipe_modules/vars/examples/full.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json) | 0 | ||||
-rw-r--r-- | infra/bots/recipe_modules/vars/examples/full.py | 2 |
7 files changed, 29 insertions, 29 deletions
diff --git a/infra/bots/recipe_modules/core/examples/full.py b/infra/bots/recipe_modules/core/examples/full.py index b2655b1d12..655703a74e 100644 --- a/infra/bots/recipe_modules/core/examples/full.py +++ b/infra/bots/recipe_modules/core/examples/full.py @@ -15,7 +15,7 @@ def RunSteps(api): def GenTests(api): - buildername = 'Build-Win-MSVC-x86_64-Release-Vulkan' + buildername = 'Build-Win-Clang-x86_64-Release-Vulkan' yield ( api.test('test') + api.properties(buildername=buildername, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index bec12ba97e..832633d058 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -10,7 +10,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "infra_step": true, "name": "fetch-gn" @@ -19,15 +19,15 @@ "cmd": [ "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan/Release_x64", - "--args=is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" windk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/d3cb0e37bdd120ad0ac4650b674b09e81be45616\"" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" windk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/d3cb0e37bdd120ad0ac4650b674b09e81be45616\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -35,14 +35,14 @@ "cmd": [ "ninja.exe", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan/Release_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index e8bf10decf..597a485a30 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -73,8 +73,8 @@ TEST_BUILDERS = [ 'Build-Win-Clang-arm64-Release-Android', 'Build-Win-Clang-x86_64-Debug-GDI', 'Build-Win-Clang-x86_64-Release', + 'Build-Win-Clang-x86_64-Release-Vulkan', 'Build-Win-MSVC-x86-Debug-Exceptions', - 'Build-Win-MSVC-x86_64-Release-Vulkan', 'Housekeeper-PerCommit-CheckGeneratedFiles', 'Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android', 'Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android', diff --git a/infra/bots/recipe_modules/run/examples/full.expected/test.json b/infra/bots/recipe_modules/run/examples/full.expected/test.json index e8cd023648..60daaab546 100644 --- a/infra/bots/recipe_modules/run/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json @@ -7,7 +7,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "fail", "~followup_annotations": [ @@ -23,7 +23,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "fail again", "~followup_annotations": [ @@ -40,7 +40,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "do a thing" }, @@ -53,7 +53,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "run 0" }, @@ -106,7 +106,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "mydir:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "env" }, @@ -156,7 +156,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail", "~followup_annotations": [ @@ -173,7 +173,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #1" }, @@ -185,7 +185,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 2)", "~followup_annotations": [ @@ -202,7 +202,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #2" }, @@ -214,7 +214,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 3)", "~followup_annotations": [ @@ -231,7 +231,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #3" }, @@ -243,7 +243,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 4)", "~followup_annotations": [ @@ -260,7 +260,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #4" }, @@ -272,7 +272,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 5)", "~followup_annotations": [ @@ -288,7 +288,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success", "~followup_annotations": [ @@ -305,7 +305,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #1 (2)" }, @@ -317,7 +317,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success (attempt 2)", "~followup_annotations": [ @@ -334,7 +334,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #2 (2)" }, @@ -346,7 +346,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success (attempt 3)" }, diff --git a/infra/bots/recipe_modules/run/examples/full.py b/infra/bots/recipe_modules/run/examples/full.py index f531cef9d4..0fb237c1b9 100644 --- a/infra/bots/recipe_modules/run/examples/full.py +++ b/infra/bots/recipe_modules/run/examples/full.py @@ -64,7 +64,7 @@ def RunSteps(api): def GenTests(api): - buildername = 'Build-Win-MSVC-x86_64-Release-Vulkan' + buildername = 'Build-Win-Clang-x86_64-Release-Vulkan' yield ( api.test('test') + api.properties(buildername=buildername, diff --git a/infra/bots/recipe_modules/vars/examples/full.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/vars/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index 4594f9e6b9..4594f9e6b9 100644 --- a/infra/bots/recipe_modules/vars/examples/full.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/vars/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json diff --git a/infra/bots/recipe_modules/vars/examples/full.py b/infra/bots/recipe_modules/vars/examples/full.py index e875a2353d..9c66aeec64 100644 --- a/infra/bots/recipe_modules/vars/examples/full.py +++ b/infra/bots/recipe_modules/vars/examples/full.py @@ -25,7 +25,7 @@ TEST_BUILDERS = [ 'Build-Debian9-GCC-x86_64-Release-Flutter_Android', 'Build-Debian9-GCC-x86_64-Release-PDFium', 'Build-Mac-Clang-x86_64-Debug-CommandBuffer', - 'Build-Win-MSVC-x86_64-Release-Vulkan', + 'Build-Win-Clang-x86_64-Release-Vulkan', 'Housekeeper-Weekly-RecreateSKPs', 'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug', 'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN', |