Make output of all tests verbose
Re-enable more verbose output across all bots.
There is no good reason why we shouldn't collect additional
information that helps triaging failure.
Some of the current output might have to be expanded down the road.
Bug: skia:
Change-Id: I5ff89a803f1e390bbd859756cba53a359d2801ba
Reviewed-on: https://skia-review.googlesource.com/45140
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Stephan Altmueller <stephana@google.com>
diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json
index 5217a76..5c9dbc4 100644
--- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json
@@ -971,7 +971,8 @@
"_",
"image",
"_",
- ".SRW"
+ ".SRW",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug",
diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Debug.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Debug.json
index 73fc813..9a7f16f 100644
--- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Debug.json
@@ -973,7 +973,8 @@
"_",
".SRW",
"--match",
- "~gradients_view_perspective_nodither"
+ "~gradients_view_perspective_nodither",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug",
diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json
index 7fdb36d..c11a2ad 100644
--- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json
+++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json
@@ -613,7 +613,8 @@
"~matrixconvolution",
"~blur_image_filter",
"~blur_0.01",
- "~GM_animated-image-blurs"
+ "~GM_animated-image-blurs",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Release",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
index 3f35645..51e7a91 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@@ -458,7 +458,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release.json
index d5d8a5f..a2f2220 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release.json
@@ -557,7 +557,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Release",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
index 83e7711..07a1663 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
@@ -461,7 +461,8 @@
"_",
".SRW",
"--match",
- "~HalfFloatAlphaTextureTest"
+ "~HalfFloatAlphaTextureTest",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug",
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
index a4e988a..78bd76e 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@@ -453,7 +453,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index 703870f..e6e4466 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -455,7 +455,8 @@
"complexclip4_aa",
"--match",
"~Once",
- "~Shared"
+ "~Shared",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json
index 634a3c7..342c31e 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json
@@ -262,7 +262,8 @@
"--src",
"gm",
"image",
- "colorImage"
+ "colorImage",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json
index 63dfd82..5a72f11 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@@ -459,7 +459,8 @@
"--match",
"~ReadWriteAlpha",
"~RGBA4444TextureTest",
- "~RGB565TextureTest"
+ "~RGB565TextureTest",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 9cf5eee..a7c6840 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -550,7 +550,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index 01e57f9..1ee47cc 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -552,7 +552,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index 54101d6..64da519 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -548,7 +548,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index 323c3ae..3daebe4 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -280,7 +280,8 @@
"_",
".SRW",
"--match",
- "~Threaded"
+ "~Threaded",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Release",
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
index f9cbfb6..131e1f5 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
@@ -281,6 +281,7 @@
".SRW",
"--match",
"~Threaded",
+ "--verbose",
"--abandonGpuContext"
],
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
index 5cf58ea..1d278d1 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@@ -398,7 +398,8 @@
"_",
".SRW",
"--match",
- "~VkHeapTests"
+ "~VkHeapTests",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
index f88cde6..e74f642 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
@@ -403,7 +403,8 @@
"_",
"image",
"_",
- ".SRW"
+ ".SRW",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug_x64",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
index 8231774..ea9a58a 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
@@ -410,6 +410,7 @@
"image",
"_",
".SRW",
+ "--verbose",
"--releaseAndAbandonGpuContext"
],
"env": {
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
index dab1d9a..36095c0 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
@@ -478,7 +478,8 @@
"angle_gl_es2",
"gm",
"_",
- "discard"
+ "discard",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug_x64",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
index fa59c8e..6089fba 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@@ -618,7 +618,8 @@
"~SpecialImage_Gpu",
"~WritePixels_Gpu",
"~WritePixelsNonTexture_Gpu",
- "~XfermodeImageFilterCroppedInput_Gpu"
+ "~XfermodeImageFilterCroppedInput_Gpu",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug_x64",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
index 7667b04..d66098a 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
@@ -403,7 +403,8 @@
"_",
"image",
"_",
- ".SRW"
+ ".SRW",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug_x64",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
index ef69bc9..a4e6580 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -408,7 +408,8 @@
"_",
"image",
"_",
- ".SRW"
+ ".SRW",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug_x64",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
index beae093..ce61228 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
@@ -403,7 +403,8 @@
"_",
"image",
"_",
- ".SRW"
+ ".SRW",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug_x64",
diff --git a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json
index 7c38aec..382236f 100644
--- a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json
@@ -611,7 +611,8 @@
"_",
"image",
"_",
- ".SRW"
+ ".SRW",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Debug",
diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json
index 50cfd59..b71a850 100644
--- a/infra/bots/recipes/test.expected/failed_dm.json
+++ b/infra/bots/recipes/test.expected/failed_dm.json
@@ -548,7 +548,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json
index 4842107..a126511 100644
--- a/infra/bots/recipes/test.expected/trybot.json
+++ b/infra/bots/recipes/test.expected/trybot.json
@@ -609,7 +609,8 @@
"tiles_rt-8888",
"gm",
"_",
- "complexclip4_aa"
+ "complexclip4_aa",
+ "--verbose"
],
"env": {
"BUILDTYPE": "Release_x64",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 5192bcb..494296b 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -657,28 +657,8 @@
or 'Win8-MSVC-ShuttleB' in bot):
args.append('--noRAW_threading')
- # Some people don't like verbose output.
- verbose = False
-
- if 'Intel' in bot and api.vars.is_linux and not 'Vulkan' in bot:
- # TODO(dogben): Track down what's causing bots to die.
- verbose = True
-
- if 'Valgrind' in bot and 'PreAbandonGpuContext' in bot:
- verbose = True
-
- if 'NexusPlayer' in bot and 'CPU' in bot:
- # The Nexus Player's image decoding tests are slow enough that swarming
- # times it out for not printing anything frequently enough. --verbose
- # makes dm print something every time we start or complete a task.
- verbose = True
-
- if 'Android' in bot or 'iOS' in bot:
- # Enable verbose output on mobile platforms.
- verbose = True
-
- if verbose:
- args.append('--verbose')
+ # Let's make all bots produce verbose output by default.
+ args.append('--verbose')
return args