commit 59a68b531083156bb7450d611b55ac09638c1a65
author Devon Carew <devoncarew@google.com> Wed Aug 15 14:35:11 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Aug 15 14:35:11 2018 +0000
tree d9d9f751c05b177cfee1afa77681cdfd43440d75
parent 964a2fb9bbff241b83ffc3d1728c89ebead44615

Merge the analyzer-use-cfe-linux, analyzer-use-cfe-mac, and analyzer-use-cfe-win bots.

Change-Id: I72c3e4c8154b5950793f8df9bcc3d48a793f73eb
Reviewed-on: https://dart-review.googlesource.com/70142
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>

tools/bots/test_matrix.json

diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 88d38fc..ef3a730 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -1811,7 +1811,8 @@
     {
       "builders": [
         "analyzer-use-cfe-linux",
-        "analyzer-use-cfe-mac"
+        "analyzer-use-cfe-mac",
+        "analyzer-use-cfe-win"
       ],
       "meta": {
         "description": "The configuration used by the analyzer builders running --use-cfe."
@@ -1904,80 +1905,6 @@
       ]
     },
     {
-      "builders": [
-        "analyzer-use-cfe-win"
-      ],
-      "meta": {
-        "description": "TODO(devoncarew): Temporarily duplicated from above due to #33540"
-      },
-      "steps": [
-        {
-          "name": "build dart",
-          "script": "tools/build.py",
-          "arguments": ["create_sdk"]
-        },
-        {
-          "name": "analyze pkg/analysis_server --use-cfe",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "pkg/analyzer_cli/bin/analyzer.dart",
-            "--fatal-warnings",
-            "--use-cfe",
-            "pkg/analysis_server"
-          ]
-        },
-        {
-          "name": "analyze pkg/analyzer --use-cfe",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "pkg/analyzer_cli/bin/analyzer.dart",
-            "--fatal-warnings",
-            "--use-cfe",
-            "pkg/analyzer"
-          ]
-        },
-        {
-          "name": "analyze pkg/analyzer_cli --use-cfe",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "pkg/analyzer_cli/bin/analyzer.dart",
-            "--fatal-warnings",
-            "--use-cfe",
-            "pkg/analyzer_cli"
-          ]
-        },
-        {
-          "name": "analyze pkg/front_end --use-cfe",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "pkg/analyzer_cli/bin/analyzer.dart",
-            "--fatal-warnings",
-            "--use-cfe",
-            "pkg/front_end"
-          ]
-        },
-        {
-          "name": "analyze pkg/kernel --use-cfe",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "pkg/analyzer_cli/bin/analyzer.dart",
-            "--fatal-warnings",
-            "--use-cfe",
-            "pkg/kernel"
-          ]
-        },
-        {
-          "name": "run language2 tests",
-          "arguments": [
-            "--compiler=dart2analyzer",
-            "--use-cfe",
-            "--use-sdk",
-            "language_2"
-          ]
-        }
-      ]
-    },
-    {
       "builders": ["analyzer-analysis-server-linux"],
       "meta": {
         "description": "Analyze analyzer related packages."