Further widen nondeterministic processor testing
Add in all Windows and Mac bots
BUG=skia:6395
Change-Id: Ib0d2b36330a44c7cb04833fad6d55b3aa884aafe
Reviewed-on: https://skia-review.googlesource.com/10007
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index f69cc80..d72121c 100644
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -15,7 +15,7 @@
# This enables non-deterministic random seeding of the GPU FP optimization
# test. Limit testing until we're sure it's not going to cause an
# avalanche of problems.
- if 'Ubuntu' in bot:
+ if 'Ubuntu' in bot or 'Win' in bot or 'Mac' in bot:
args.append('--randomProcessorTest')
# 32-bit desktop bots tend to run out of memory, because they have relatively
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
index 94f00d8..2e39e75 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
@@ -218,6 +218,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]/dm",
"--nocpu",
+ "--randomProcessorTest",
"--config",
"8888",
"srgb",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
index ae0d98e..42c97a1 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
@@ -218,6 +218,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]/dm",
"--nogpu",
+ "--randomProcessorTest",
"--config",
"8888",
"srgb",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
index 514bc3b..9a4890f 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
@@ -220,6 +220,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]/dm",
"--nocpu",
+ "--randomProcessorTest",
"--config",
"commandbuffer",
"--src",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
index 7157698..fb4188c 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
@@ -220,6 +220,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
"--nocpu",
+ "--randomProcessorTest",
"--config",
"vk",
"--src",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json
index 6c86819..858fe34 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json
@@ -220,6 +220,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
"--nocpu",
+ "--randomProcessorTest",
"--config",
"angle_d3d11_es2",
"angle_d3d9_es2",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
index bf4aef5..3fb7554 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
@@ -220,6 +220,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
"--nocpu",
+ "--randomProcessorTest",
"--config",
"vk",
"--src",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
index e59ae00..860cb6d 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
@@ -220,6 +220,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
"--nocpu",
+ "--randomProcessorTest",
"--config",
"vk",
"--src",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
index 138259d..eb6d6ea 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
@@ -224,6 +224,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
"--nogpu",
+ "--randomProcessorTest",
"--config",
"8888",
"srgb",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
index 653c016..701d99f 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -220,6 +220,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
"--nocpu",
+ "--randomProcessorTest",
"--config",
"angle_d3d11_es2",
"angle_d3d9_es2",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
index 27eae55..a1140eb 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
@@ -224,6 +224,7 @@
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
"--nogpu",
+ "--randomProcessorTest",
"--config",
"8888",
"srgb",
