diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-03-13 15:36:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-14 15:16:40 +0000 |
| commit | e1cb4778c70a6bef543a8936c5521a71a037f551 (patch) | |
| tree | cbbf9618793fc7483e5e4847bd0fc885bc2fab9e /infra/bots/recipe_modules/flavor | |
| parent | 40091fd4fc453eb514bf7ca903326fa3538ab6c9 (diff) | |
Switch Win Exceptions Build to Clang.
No-Try: true
Change-Id: I119c7853299b6eef65f991b41cbb2afb0a35f431
Reviewed-on: https://skia-review.googlesource.com/113673
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json (renamed from infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json) | 12 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/flavor/examples/full.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json index bf08caa1a5..3f00b4c574 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -10,7 +10,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions" }, "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-Debug-Exceptions/Debug", - "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug", + "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions" }, "name": "gn gen" }, @@ -37,14 +37,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index 430011ae8e..350a0e88d6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -81,13 +81,13 @@ TEST_BUILDERS = [ 'Build-Mac-Clang-x86_64-Debug-CommandBuffer', 'Build-Mac-Clang-x86_64-Debug-Metal', 'Build-Win-Clang-arm64-Release-Android', + 'Build-Win-Clang-x86-Debug-Exceptions', 'Build-Win-Clang-x86_64-Debug-GDI', 'Build-Win-Clang-x86_64-Debug-GomaNoFallback', 'Build-Win-Clang-x86_64-Release', 'Build-Win-Clang-x86_64-Release-ANGLE_Goma', 'Build-Win-Clang-x86_64-Release-Goma', 'Build-Win-Clang-x86_64-Release-Vulkan', - 'Build-Win-MSVC-x86-Debug-Exceptions', 'Housekeeper-PerCommit-CheckGeneratedFiles', 'Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android', 'Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android', |