aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json9
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/adb_in_path.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/big_issue_number.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/download_and_push_skps.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/failed_dm.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/failed_get_hashes.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json3
-rw-r--r--infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json3
-rw-r--r--infra/bots/recipes/swarm_test.py13
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json12
-rw-r--r--infra/bots/recipes/swarm_trigger.py7
44 files changed, 234 insertions, 17 deletions
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json
index 305cb64d14..9cdc095869 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json
@@ -508,6 +508,8 @@
"Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -542,6 +544,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
index 8dd7b597d5..02e3eb1824 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
@@ -414,6 +414,8 @@
"Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -449,6 +451,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--threads",
"0",
"--blacklist",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json
index d895dd7889..086761c304 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json
@@ -508,6 +508,8 @@
"Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm64",
@@ -544,6 +546,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json
index 5fcc260ea3..aba5145e74 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json
@@ -508,6 +508,8 @@
"Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -542,6 +544,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json
index 9827a8ff7f..816c711ae6 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json
@@ -508,6 +508,8 @@
"Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -543,6 +545,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
index 93695e49e8..ad36c6f967 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
@@ -508,6 +508,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -541,6 +543,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json
index 3131aefa50..ceb8a452ee 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json
@@ -508,6 +508,8 @@
"Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm64",
@@ -542,6 +544,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json
index cafd3dce65..b3d326877e 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json
@@ -508,6 +508,8 @@
"Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release",
"build_number",
"5",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"x86",
@@ -538,6 +540,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
index ad1176b906..c47bda10aa 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
@@ -196,6 +196,8 @@
"Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -231,6 +233,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
index 6b254a14f6..ef489a6007 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
@@ -196,6 +196,8 @@
"Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -233,6 +235,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
index 82ce356fc5..f3d4753a12 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
@@ -196,6 +196,8 @@
"Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -225,6 +227,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index 8c998e32af..18890da3e7 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -147,6 +147,8 @@
"500",
"patchset",
"1",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -183,6 +185,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 98f21b424a..f24f76b5aa 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -195,6 +195,8 @@
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86",
@@ -237,6 +239,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index ab7f7aea7e..f4f037e784 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -81,6 +81,8 @@
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -119,6 +121,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index 100fa867fe..3dee1278ff 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -196,6 +196,8 @@
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -236,6 +238,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
index de32817bdc..c6f7167f02 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@@ -81,6 +81,8 @@
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -119,6 +121,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index 3c98cdf82c..fefcd6071a 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -88,6 +88,8 @@
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -122,6 +124,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
@@ -458,6 +461,8 @@
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -492,6 +497,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
@@ -829,6 +835,8 @@
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -863,6 +871,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
index 3330f22cfb..d6119939be 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
@@ -195,6 +195,8 @@
"Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]\\svg",
"--key",
"arch",
"x86_64",
@@ -224,6 +226,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
index 6e09eecf33..b8a5a1c4c5 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
@@ -199,6 +199,8 @@
"500",
"patchset",
"1",
+ "--svgs",
+ "[SLAVE_BUILD]\\svg",
"--key",
"arch",
"x86_64",
@@ -234,6 +236,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
index d9396dac3c..bad447040a 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -195,6 +195,8 @@
"Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE",
"build_number",
"5",
+ "--svgs",
+ "[SLAVE_BUILD]\\svg",
"--key",
"arch",
"x86_64",
@@ -233,6 +235,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
index 83500c9fd8..969b79500a 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
@@ -505,6 +505,8 @@
"Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug",
"build_number",
"5",
+ "--svgs",
+ "skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -539,6 +541,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json
index 34e46b45c3..1f3d4b6c69 100644
--- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json
+++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json
@@ -504,6 +504,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -537,6 +539,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json
index 8a9d554347..cf729cac49 100644
--- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json
+++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json
@@ -199,6 +199,8 @@
"2147533002",
"patchset",
"1",
+ "--svgs",
+ "[SLAVE_BUILD]\\svg",
"--key",
"arch",
"x86_64",
@@ -234,6 +236,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
index ae0133efe2..c9fd3ff532 100644
--- a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
+++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
@@ -606,6 +606,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -639,6 +641,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
index 89f0194686..150bafe397 100644
--- a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
+++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
@@ -606,6 +606,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -639,6 +641,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json
index 98773bb88f..bc7df36fbe 100644
--- a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json
+++ b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json
@@ -606,6 +606,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -639,6 +641,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json
index d8a77b4cde..6072b719ec 100644
--- a/infra/bots/recipes/swarm_test.expected/failed_dm.json
+++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json
@@ -196,6 +196,8 @@
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
"build_number",
"6",
+ "--svgs",
+ "[SLAVE_BUILD]/svg",
"--key",
"arch",
"x86_64",
@@ -236,6 +238,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
index eb8048fa35..ca080c864e 100644
--- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
+++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
@@ -510,6 +510,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -543,6 +545,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
index fa8ed7153c..896a10fd2a 100644
--- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
+++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
@@ -610,6 +610,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -643,6 +645,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
index 27b57d4f48..b7d0b812f2 100644
--- a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
+++ b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
@@ -610,6 +610,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -643,6 +645,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json
index 73c442c353..f5df2a397f 100644
--- a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json
+++ b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json
@@ -610,6 +610,8 @@
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
"build_number",
"6",
+ "--svgs",
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
@@ -643,6 +645,7 @@
"gm",
"image",
"colorImage",
+ "svg",
"--blacklist",
"f16",
"_",
diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py
index c8a8e78969..65ec6933e6 100644
--- a/infra/bots/recipes/swarm_test.py
+++ b/infra/bots/recipes/swarm_test.py
@@ -138,11 +138,7 @@ def dm_flags(bot):
args.extend(configs)
# Run tests, gms, and image decoding tests everywhere.
- args.extend('--src tests gm image colorImage'.split(' '))
- # TODO(rmistry): Remove the below once we want to enable SVGs for all bots.
- if (bot == 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot' or
- bot == 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared'):
- args.append('svg')
+ args.extend('--src tests gm image colorImage svg'.split(' '))
if 'GalaxyS' in bot:
args.extend(('--threads', '0'))
@@ -440,12 +436,7 @@ def test_steps(api):
'--properties'
] + properties
- # TODO(rmistry): Remove the below once we want to enable SVGs for all bots.
- if (api.vars.builder_name ==
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot' or
- api.vars.builder_name ==
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared'):
- args.extend(['--svgs', api.flavor.device_dirs.svg_dir])
+ args.extend(['--svgs', api.flavor.device_dirs.svg_dir])
args.append('--key')
args.extend(key_params(api))
diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
index 64817f4451..2c31930ee4 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
@@ -485,6 +485,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -635,6 +645,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
index e3e9695cc9..c3e02c47ad 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
@@ -492,6 +492,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -637,6 +647,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
index 4389d4ea6b..f21e61385a 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
@@ -492,6 +492,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -637,6 +647,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
index a99e09f46d..f59ad2c300 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
@@ -480,6 +480,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -628,6 +638,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index ba9c5a9b7d..78b61c5690 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -281,6 +281,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -394,6 +404,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"[dummy hash for test_skia]",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index d78ac7378c..c2ce4b9118 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -480,6 +480,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -628,6 +638,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index d1f052d228..c4cad61129 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -480,6 +480,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -628,6 +638,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index d091dfd5d6..3eb69e4864 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -480,6 +480,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -625,6 +635,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
index d19b717723..3524a6ecb7 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
@@ -492,6 +492,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -637,6 +647,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
index 474ae7e9db..9626d20247 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
@@ -492,6 +492,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -640,6 +650,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
index a3eede9edb..3c2fa52e21 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
@@ -480,6 +480,16 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "name": "read svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
@@ -625,6 +635,8 @@
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
+ "--cipd-package",
+ "svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index 2948b5dbf5..1fdd57174f 100644
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -683,12 +683,7 @@ def RunSteps(api):
# SKPs, SkImages, SVGs.
cipd_packages.append(cipd_pkg(api, infrabots_dir, 'skp'))
cipd_packages.append(cipd_pkg(api, infrabots_dir, 'skimage'))
- # TODO(rmistry): Remove the below once we want to enable SVGs for all bots.
- if (api.properties['buildername'] ==
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot' or
- api.properties['buildername'] ==
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared'):
- cipd_packages.append(cipd_pkg(api, infrabots_dir, 'svg'))
+ cipd_packages.append(cipd_pkg(api, infrabots_dir, 'svg'))
# Trigger test and perf tasks.
test_task = None