aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'infra/bots/recipes')
-rw-r--r--infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json (renamed from infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json)20
-rw-r--r--infra/bots/recipes/compile.py2
-rw-r--r--infra/bots/recipes/perf.expected/trybot.json10
-rw-r--r--infra/bots/recipes/perf.py2
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json (renamed from infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json)4
-rw-r--r--infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json (renamed from infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json)4
-rw-r--r--infra/bots/recipes/test.py8
7 files changed, 28 insertions, 22 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index c63376bdb8..db58083a33 100644
--- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -91,10 +91,12 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
+ "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+ "CXX": "/usr/bin/clang++",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
},
"infra_step": true,
"name": "fetch-gn"
@@ -103,16 +105,18 @@
"cmd": [
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug",
- "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\", \"-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE\"] target_cpu=\"x86_64\""
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug",
+ "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-O1\", \"-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] target_cpu=\"x86_64\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
+ "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+ "CXX": "/usr/bin/clang++",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
},
"name": "gn gen"
},
@@ -120,15 +124,17 @@
"cmd": [
"ninja",
"-C",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug"
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
+ "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+ "CXX": "/usr/bin/clang++",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
},
"name": "ninja"
},
@@ -137,7 +143,7 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug",
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug",
"[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"
],
"infra_step": true,
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py
index da7ab8a333..2a8b25600e 100644
--- a/infra/bots/recipes/compile.py
+++ b/infra/bots/recipes/compile.py
@@ -83,6 +83,7 @@ TEST_BUILDERS = [
'Build-Debian9-Clang-x86_64-Debug',
'Build-Debian9-Clang-x86_64-Debug-ASAN',
'Build-Debian9-Clang-x86_64-Debug-MSAN',
+ 'Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE',
'Build-Debian9-Clang-x86_64-Release-Fast',
'Build-Debian9-Clang-x86_64-Release-Mini',
'Build-Debian9-Clang-x86_64-Release-Vulkan',
@@ -90,7 +91,6 @@ TEST_BUILDERS = [
'Build-Debian9-GCC-arm-Release-Chromecast',
'Build-Debian9-GCC-x86-Debug',
'Build-Debian9-GCC-x86_64-Debug-NoGPU',
- 'Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE',
'Build-Debian9-GCC-x86_64-Release-ANGLE',
'Build-Debian9-GCC-x86_64-Release-Flutter_Android',
'Build-Debian9-GCC-x86_64-Release-Mesa',
diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json
index 2eb3efdc4b..133657ce07 100644
--- a/infra/bots/recipes/perf.expected/trybot.json
+++ b/infra/bots/recipes/perf.expected/trybot.json
@@ -91,7 +91,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
],
"infra_step": true,
"name": "rmtree data"
@@ -106,7 +106,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
],
"infra_step": true,
"name": "makedirs data"
@@ -182,7 +182,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release/data/nanobench_abc123_1337000001.json",
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -200,7 +200,7 @@
"arch",
"x86_64",
"compiler",
- "MSVC",
+ "Clang",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
@@ -228,7 +228,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index bd35268eca..cea86611bf 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -417,7 +417,7 @@ def GenTests(api):
yield test
- builder = 'Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release'
+ builder = 'Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release'
yield (
api.test('trybot') +
api.properties(buildername=builder,
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index c8ba3dfc18..dcffa00591 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -224,7 +224,7 @@
"gitHash",
"abc123",
"builder",
- "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+ "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
@@ -235,7 +235,7 @@
"arch",
"x86_64",
"compiler",
- "GCC",
+ "Clang",
"configuration",
"Debug",
"cpu_or_gpu",
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-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
index ea9a58ac4c..85d189fc41 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-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
@@ -219,7 +219,7 @@
"gitHash",
"abc123",
"builder",
- "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext",
+ "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
@@ -230,7 +230,7 @@
"arch",
"x86_64",
"compiler",
- "MSVC",
+ "Clang",
"configuration",
"Release",
"cpu_or_gpu",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 5a883185fb..a433fd042b 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -865,14 +865,14 @@ TEST_BUILDERS = [
'Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release',
'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN',
'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN',
+ ('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug'
+ '-SK_USE_DISCARDABLE_SCALEDIMAGECACHE'),
'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-UBSAN_float_cast_overflow',
('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release'
'-SK_FORCE_RASTER_PIPELINE_BLITTER'),
'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN',
'Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug',
'Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug',
- ('Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug'
- '-SK_USE_DISCARDABLE_SCALEDIMAGECACHE'),
'Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release',
'Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer',
'Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug',
@@ -884,9 +884,9 @@ TEST_BUILDERS = [
'-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41'),
('Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release'
'-Valgrind_SK_CPU_LIMIT_SSE41'),
- 'Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan',
- ('Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release'
+ ('Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release'
'-ReleaseAndAbandonGpuContext'),
+ 'Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan',
'Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE',
'Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan',
'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-17 05:22:32 +0000