diff options
Diffstat (limited to 'infra')
13 files changed, 39 insertions, 12 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json index 609fa0796e..58fbd480cc 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index c6e64880f9..000ec21e9a 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json index 28ec945aa8..2d5be8c5f6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { 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 index bf08caa1a5..74ccbbe378 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-MSVC-x86-Debug-Exceptions.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json index 301fcd2878..ecb2aeff38 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[START_DIR]/out/Debug_x64" + "[START_DIR]/out/Debug_x64", + "-j", + "1000" ], "cwd": "[START_DIR]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index a8d63ee953..ee46b82a56 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -193,6 +193,9 @@ with open(sys.argv[1], 'w') as f: # only Goma warns about this. extra_cflags.append('-Wno-nonportable-include-path') ninja_args.extend(['-j', '2000']) + elif 'Win' in os: + # TODO(dogben): Experiment with this setting for other builds. + ninja_args.extend(['-j', '1000']) sanitize = '' for t in extra_tokens: diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index 48ba7332fb..b5901349ea 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -135,7 +135,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64" + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index fe4b577f22..4240d66329 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -131,7 +131,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE\\Debug" + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE\\Debug", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index c4223faab0..ef0d5c3bb2 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -131,7 +131,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug" + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json index 48807d3a1e..141678bb39 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json @@ -131,7 +131,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug" + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json index 13e0a1bcbb..a9a923f83d 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -131,7 +131,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release" + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 1a7894477a..0412aed288 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -135,7 +135,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 1b7a54d4cb..5632bad7cc 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -139,7 +139,9 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "-j", + "1000" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { |