Sync pdfium tryserver configs with main pdfium waterfall.

masters/master.tryserver.client.pdfium/builders.pyl

Index: masters/master.tryserver.client.pdfium/builders.pyl
diff --git a/masters/master.tryserver.client.pdfium/builders.pyl b/masters/master.tryserver.client.pdfium/builders.pyl
index 51d24d9459917eb71c577434b05f2158f261a758..fcf33785eb393db9ccc94860e098d8e5f0730528 100644
--- a/masters/master.tryserver.client.pdfium/builders.pyl
+++ b/masters/master.tryserver.client.pdfium/builders.pyl
@@ -48,19 +48,17 @@
         "v8": False,
       }
     },
-    "linux_skia": {
+    "linux_xfa": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["linux_slave_pool"],
       "slavebuilddir": "pdfium",
-      "category": "4skia",
+      "category": "1xfa",
       "properties": {
-        "skia": True,
         "xfa": True,
-        "skip_test": True,
       }
     },
-    "linux_xfa": {
+    "linux_xfa_asan_lsan": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["linux_slave_pool"],
@@ -68,18 +66,32 @@
       "category": "1xfa",
       "properties": {
         "xfa": True,
-      }
+        "memory_tool": "asan",
+      },
     },
-    "linux_xfa_asan_lsan": {
+    "linux_xfa_rel": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["linux_slave_pool"],
+      "slavebuilddir": "pdfium",
       "category": "1xfa",
       "properties": {
         "xfa": True,
-        "memory_tool": "asan",
+        "rel": True,
       },
     },
+    "linux_skia": {

[Wei Li, 2016/11/07 20:41:32]

Reordering is not necessary since whether to put a bot in experimental is a
decision made in config file on client side. the builder itself should not need
to be modified. WDYT? 

[Lei Zhang, 2016/11/07 21:21:55]

- The reordering certainly does not matter from the configuration perspective.
- The *_skia bots are not modified.
- I did it just so the ordering matches
masters/master.client.pdfium/builders.pyl better. In that file, the list is
[..., linux_no_v8, linux_xfa, ...] so I wanted the same here but with [...,
linux_no_v8, linux_xfa, ..., linux_skia] instead of [..., linux_no_v8,
linux_skia, linux_xfa, ...]

+      "recipe": "pdfium",
+      "scheduler": None,
+      "slave_pools": ["linux_slave_pool"],
+      "slavebuilddir": "pdfium",
+      "category": "4skia",
+      "properties": {
+        "skia": True,
+        "xfa": True,
+        "skip_test": True,
+      }
+    },
     "mac": {
       "recipe": "pdfium",
       "scheduler": None,
@@ -97,19 +109,17 @@
         "v8": False,
       }
     },
-    "mac_skia": {
+    "mac_xfa": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["mac_slave_pool"],
       "slavebuilddir": "pdfium",
-      "category": "4skia",
+      "category": "1xfa",
       "properties": {
-        "skia": True,
         "xfa": True,
-        "skip_test": True,
       }
     },
-    "mac_xfa": {
+    "mac_xfa_rel": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["mac_slave_pool"],
@@ -117,6 +127,19 @@
       "category": "1xfa",
       "properties": {
         "xfa": True,
+        "rel": True,
+      },
+    },
+    "mac_skia": {
+      "recipe": "pdfium",
+      "scheduler": None,
+      "slave_pools": ["mac_slave_pool"],
+      "slavebuilddir": "pdfium",
+      "category": "4skia",
+      "properties": {
+        "skia": True,
+        "xfa": True,
+        "skip_test": True,
       }
     },
     "win": {
@@ -136,19 +159,17 @@
         "v8": False,
       }
     },
-    "win_skia": {
+    "win_xfa": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["win_slave_pool"],
       "slavebuilddir": "pdfium",
-      "category": "4skia",
+      "category": "1xfa",
       "properties": {
-        "skia": True,
         "xfa": True,
-        "skip_test": True,
       }
     },
-    "win_xfa": {
+    "win_xfa_32": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["win_slave_pool"],
@@ -156,18 +177,55 @@
       "category": "1xfa",
       "properties": {
         "xfa": True,
-      }
+        "target_cpu": "x86",
+      },
     },
     "win_xfa_clang": {
       "recipe": "pdfium",
       "scheduler": None,
       "slave_pools": ["win_slave_pool"],
+      "slavebuilddir": "pdfium",
+      "category": "1xfa",
+      "properties": {
+        "xfa": True,
+        "clang": True,
+      },
+    },
+    "win_xfa_clang_32": {
+      "recipe": "pdfium",
+      "scheduler": None,
+      "slave_pools": ["win_slave_pool"],
+      "slavebuilddir": "pdfium",
       "category": "1xfa",
       "properties": {
         "xfa": True,
         "clang": True,
+        "target_cpu": "x86",
       },
     },
+    "win_xfa_rel": {
+      "recipe": "pdfium",
+      "scheduler": None,
+      "slave_pools": ["win_slave_pool"],
+      "slavebuilddir": "pdfium",
+      "category": "1xfa",
+      "properties": {
+        "xfa": True,
+        "rel": True,
+      }
+    },
+    "win_skia": {
+      "recipe": "pdfium",
+      "scheduler": None,
+      "slave_pools": ["win_slave_pool"],
+      "slavebuilddir": "pdfium",
+      "category": "4skia",
+      "properties": {
+        "skia": True,
+        "xfa": True,
+        "skip_test": True,
+      }
+    },
   },
 
   "schedulers": {},