diff options
| -rw-r--r-- | tools/dm_flags.json | 52 | ||||
| -rwxr-xr-x | tools/dm_flags.py | 11 |
2 files changed, 3 insertions, 60 deletions
diff --git a/tools/dm_flags.json b/tools/dm_flags.json index d0613ff048..7af09f0679 100644 --- a/tools/dm_flags.json +++ b/tools/dm_flags.json @@ -1,16 +1,9 @@ { "Pretend-iOS-Bot": [ - "--matrix", - "0", - "1", - "1", - "0", "--config", "565", "8888", "gpu", - "upright-matrix-8888", - "upright-matrix-gpu", "pdf", "pdf_poppler", "serialize-8888", @@ -1923,17 +1916,10 @@ "--noRAW_threading" ], "Test-Mac10.8-Clang-MacMini4.1-CPU-SSE4-x86_64-Release": [ - "--matrix", - "0", - "1", - "1", - "0", "--config", "565", "8888", "gpu", - "upright-matrix-8888", - "upright-matrix-gpu", "msaa16", "pdf", "pdf_poppler", @@ -2155,21 +2141,13 @@ "image-cacherator-from-ctable" ], "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN": [ - "--matrix", - "0", - "1", - "1", - "0", "--config", "565", "8888", "gpu", - "upright-matrix-8888", - "upright-matrix-gpu", "f16", "srgb", "sp-8888", - "twice-8888", "2ndpic-8888", "remote-8888", "remote_cache-8888", @@ -2397,21 +2375,13 @@ "~Shared" ], "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [ - "--matrix", - "0", - "1", - "1", - "0", "--config", "565", "8888", "gpu", - "upright-matrix-8888", - "upright-matrix-gpu", "f16", "srgb", "sp-8888", - "twice-8888", "2ndpic-8888", "remote-8888", "remote_cache-8888", @@ -2636,21 +2606,13 @@ "image-cacherator-from-ctable" ], "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [ - "--matrix", - "0", - "1", - "1", - "0", "--config", "565", "8888", "gpu", - "upright-matrix-8888", - "upright-matrix-gpu", "f16", "srgb", "sp-8888", - "twice-8888", "2ndpic-8888", "remote-8888", "remote_cache-8888", @@ -2897,17 +2859,10 @@ "~Threaded" ], "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [ - "--matrix", - "0", - "1", - "1", - "0", "--config", "565", "8888", "gpu", - "upright-matrix-8888", - "upright-matrix-gpu", "nvprmsaa16", "msaa16", "pdf", @@ -3232,17 +3187,10 @@ "~Threaded" ], "Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [ - "--matrix", - "0", - "1", - "1", - "0", "--config", "565", "8888", "gpu", - "upright-matrix-8888", - "upright-matrix-gpu", "msaa16", "pdf", "pdf_poppler", diff --git a/tools/dm_flags.py b/tools/dm_flags.py index f78e3c761f..4d2adf774d 100755 --- a/tools/dm_flags.py +++ b/tools/dm_flags.py @@ -31,15 +31,10 @@ def get_args(bot): configs = ['565', '8888', 'gpu'] - if 'Android' not in bot: - configs.extend(('upright-matrix-8888', 'upright-matrix-gpu')) - args.extend('--matrix 0 1 1 0'.split(' ')) - if '-GCE-' in bot: - configs.extend(['f16', 'srgb']) - configs.append('sp-8888') - configs.extend(['twice-8888', '2ndpic-8888']) - configs.extend(['remote-8888', 'remote_cache-8888']) + configs.extend(['f16', 'srgb']) # Gamma-correct formats. + configs.extend(['sp-8888', '2ndpic-8888']) # Test niche uses of SkPicture. + configs.extend(['remote-8888', 'remote_cache-8888']) # Hacking, WIP. if '-TSAN' not in bot: if ('TegraK1' in bot or |