aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules/flavor
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2018-03-20 16:36:16 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-20 20:54:37 +0000
commited4ff9c9d035a7626ce8e37099e90a4daef79b67 (patch)
tree5273ac0396f8ef270b70d2f71932f068fa0edd28 /infra/bots/recipe_modules/flavor
parent8d38a7f5215e584d2d3c94e77e213a89d1e4ff97 (diff)
Reland "Switch Win Exceptions Build to Clang."
This reverts commit 2f2419b936150e24ca1aea891ba405c8ea8ebdc7. Reason for revert: Creating CL to reland Original change's description: > Revert "Switch Win Exceptions Build to Clang." > > This reverts commit e1cb4778c70a6bef543a8936c5521a71a037f551. > > Reason for revert: Need to revert dependency https://skia-review.googlesource.com/c/skia/+/114093 > > Original change's description: > > 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> > > TBR=mtklein@google.com,benjaminwagner@google.com > > Change-Id: I36f4c6cdf890043d4b77b8d5347b4752f58ebd33 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/114420 > Reviewed-by: Ben Wagner <benjaminwagner@google.com> > Commit-Queue: Ben Wagner <benjaminwagner@google.com> TBR=mtklein@google.com,benjaminwagner@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: Ie4ba6c264b3ab2b3c63ac0e225638b0a4e70cda1 Reviewed-on: https://skia-review.googlesource.com/114822 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Ben Wagner <benjaminwagner@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.json70
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json56
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.py2
3 files changed, 71 insertions, 57 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
new file mode 100644
index 0000000000..822c2738c3
--- /dev/null
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
@@ -0,0 +1,70 @@
+[
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION",
+ "/path/to/tmp/"
+ ],
+ "infra_step": true,
+ "name": "Get clang_win VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn"
+ ],
+ "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-Clang-x86-Debug-Exceptions"
+ },
+ "infra_step": true,
+ "name": "fetch-gn"
+ },
+ {
+ "cmd": [
+ "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe",
+ "gen",
+ "[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\", \"-DDUMMY_clang_win_version=42\"] 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-Clang-x86-Debug-Exceptions"
+ },
+ "name": "gn gen"
+ },
+ {
+ "cmd": [
+ "ninja.exe",
+ "-k",
+ "0",
+ "-C",
+ "[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-Clang-x86-Debug-Exceptions"
+ },
+ "name": "ninja"
+ },
+ {
+ "name": "$result",
+ "recipe_result": null,
+ "status_code": 0
+ }
+] \ No newline at end of file
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-MSVC-x86-Debug-Exceptions.json
deleted file mode 100644
index bf08caa1a5..0000000000
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn"
- ],
- "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"
- },
- "infra_step": true,
- "name": "fetch-gn"
- },
- {
- "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\""
- ],
- "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"
- },
- "name": "gn gen"
- },
- {
- "cmd": [
- "ninja.exe",
- "-k",
- "0",
- "-C",
- "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-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"
- },
- "name": "ninja"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-] \ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py
index 4ebd98a9a2..b5ac5cdc53 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -81,10 +81,10 @@ 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-Release',
'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',