aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar borenet <borenet@google.com>2015-05-05 13:11:27 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-05-05 13:11:27 -0700
commite3aeaec7ddda15faa923d34b67b4cdba71f5d119 (patch)
tree42606fb393fe1b788682a5bfa81cfa0174bc44b8 /tools
parentd31c13d0441aecc8b2a4fa4f45fd5e59584cb3ea (diff)
Add matrix configs to DM
Diffstat (limited to 'tools')
-rw-r--r--tools/dm_flags.json70
-rwxr-xr-xtools/dm_flags.py4
2 files changed, 73 insertions, 1 deletions
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 6cd63e3805..9c329af8e8 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -1,9 +1,16 @@
{
"Pretend-iOS-Bot": [
+ "--matrix",
+ "0",
+ "1",
+ "1",
+ "0",
"--config",
"565",
"8888",
"gpu",
+ "upright-matrix-8888",
+ "upright-matrix-gpu",
"pdf",
"serialize-8888",
"tiles_rt-8888",
@@ -154,10 +161,17 @@
"~WritePixels"
],
"Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug": [
+ "--matrix",
+ "0",
+ "1",
+ "1",
+ "0",
"--config",
"565",
"8888",
"gpu",
+ "upright-matrix-8888",
+ "upright-matrix-gpu",
"msaa4",
"serialize-8888",
"tiles_rt-8888",
@@ -308,10 +322,17 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release": [
+ "--matrix",
+ "0",
+ "1",
+ "1",
+ "0",
"--config",
"565",
"8888",
"gpu",
+ "upright-matrix-8888",
+ "upright-matrix-gpu",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@@ -464,10 +485,17 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release": [
+ "--matrix",
+ "0",
+ "1",
+ "1",
+ "0",
"--config",
"565",
"8888",
"gpu",
+ "upright-matrix-8888",
+ "upright-matrix-gpu",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@@ -614,10 +642,17 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug": [
+ "--matrix",
+ "0",
+ "1",
+ "1",
+ "0",
"--config",
"565",
"8888",
"gpu",
+ "upright-matrix-8888",
+ "upright-matrix-gpu",
"nvprmsaa4",
"msaa4",
"serialize-8888",
@@ -766,10 +801,17 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
+ "--matrix",
+ "0",
+ "1",
+ "1",
+ "0",
"--config",
"565",
"8888",
"gpu",
+ "upright-matrix-8888",
+ "upright-matrix-gpu",
"--blacklist",
"gpu",
"_",
@@ -913,10 +955,17 @@
"~ResourceCache"
],
"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",
"msaa16",
"pdf",
"serialize-8888",
@@ -1040,10 +1089,17 @@
"~Math"
],
"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",
"msaa16",
"pdf",
"serialize-8888",
@@ -1191,10 +1247,17 @@
"~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",
@@ -1343,10 +1406,17 @@
"~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",
"serialize-8888",
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 4f700a3ca6..c060b20157 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -29,7 +29,9 @@ cov_start = lineno()+1 # We care about coverage starting just past this def.
def get_args(bot):
args = []
- configs = ['565', '8888', 'gpu']
+ configs = ['565', '8888', 'gpu', 'upright-matrix-8888', 'upright-matrix-gpu']
+
+ args.extend('--matrix 0 1 1 0'.split(' '))
if 'TegraK1' in bot or 'GTX550Ti' in bot or 'GTX660' in bot or 'GT610' in bot:
if 'Android' in bot: