Have the regular analyzer bots test in dart 2 mode.

Change-Id: I91bf09600d0e5f099737be0363228cad6d0b5329
Reviewed-on: https://dart-review.googlesource.com/63642
Commit-Queue: Devon Carew <devoncarew@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
diff --git a/pkg/pkg.status b/pkg/pkg.status
index c64d77b..52608ee 100644
--- a/pkg/pkg.status
+++ b/pkg/pkg.status
@@ -104,8 +104,15 @@
 analysis_server/test/integration/edit/format_test: Pass, Slow
 analysis_server/test/integration/edit/import_elements_test: Pass, Slow
 analysis_server/test/integration/edit/organize_directives_test: Pass, Slow
+analysis_server/test/integration/edit/sort_members_test: Pass, Slow
 analysis_server/test/integration/search/find_top_level_declarations_test: Pass, RuntimeError # 31571
+analysis_server/test/services/correction/fix_test: Pass, Slow
+analysis_server/test/socket_server_test: Skip # Pass, Slow
+analysis_server/test/src/plugin/plugin_manager_test: Pass, Slow
 analyzer/test/file_system/physical_resource_provider_test: Pass, Fail # Issue 25472
+analyzer/test/generated/non_error_resolver_kernel_test: Pass, Slow
+analyzer/test/src/summary/resynthesize_ast_test: Pass, Slow
+analyzer/test/src/task/strong/front_end_inference_test: Pass, Slow
 analyzer/test/src/task/strong/inferred_type_test: Pass, Slow
 analyzer_cli/test/driver_test: Pass, Slow, Timeout
 mutation_observer: Skip # Skip tests on the VM if the package depends on dart:html
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index bcec0ac..11d54a7 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -1746,7 +1746,7 @@
         "analyzer-win-release"
       ],
       "meta": {
-        "description": "This configuration is used by the analyzer builders not running strong mode."
+        "description": "This configuration is used by the analyzer builders."
       },
       "steps": [
         {
@@ -1758,7 +1758,6 @@
           "name": "analyze tests",
           "arguments": [
             "--compiler=dart2analyzer",
-            "--no-preview-dart-2",
             "--use-sdk"
           ]
         },
@@ -1766,26 +1765,23 @@
           "name": "analyze pkg tests",
           "arguments": [
             "--compiler=dart2analyzer",
-            "--no-preview-dart-2",
             "--use-sdk",
             "pkg"
           ]
         },
         {
-          "name": "analyze tests checked",
+          "name": "analyze tests enable-asserts",
           "arguments": [
-            "--checked",
             "--compiler=dart2analyzer",
-            "--no-preview-dart-2",
+            "--enable-asserts",
             "--use-sdk"
           ]
         },
         {
-          "name": "analyze pkg tests checked",
+          "name": "analyze pkg tests enable-asserts",
           "arguments": [
-            "--checked",
             "--compiler=dart2analyzer",
-            "--no-preview-dart-2",
+            "--enable-asserts",
             "--use-sdk",
             "pkg"
           ]
@@ -1793,9 +1789,8 @@
         {
           "name": "analyzer unit tests",
           "arguments": [
-            "--checked",
             "--compiler=none",
-            "--no-preview-dart-2",
+            "--enable-asserts",
             "--use-sdk",
             "pkg/analyzer"
           ]
@@ -1803,9 +1798,8 @@
         {
           "name": "analysis_server unit tests",
           "arguments": [
-            "--checked",
             "--compiler=none",
-            "--no-preview-dart-2",
+            "--enable-asserts",
             "--use-sdk",
             "pkg/analysis_server"
           ]
@@ -1813,9 +1807,8 @@
         {
           "name": "analyzer_cli unit tests",
           "arguments": [
-            "--checked",
             "--compiler=none",
-            "--no-preview-dart-2",
+            "--enable-asserts",
             "--use-sdk",
             "pkg/analyzer_cli"
           ]
@@ -1823,9 +1816,8 @@
         {
           "name": "analyzer_plugin unit tests",
           "arguments": [
-            "--checked",
             "--compiler=none",
-            "--no-preview-dart-2",
+            "--enable-asserts",
             "--use-sdk",
             "pkg/analyzer_plugin"
           ]
diff --git a/tools/infra/config/cq.cfg b/tools/infra/config/cq.cfg
index be38497..fbe4a0c 100644
--- a/tools/infra/config/cq.cfg
+++ b/tools/infra/config/cq.cfg
@@ -19,7 +19,6 @@
     buckets {
       name: "luci.dart.try"
       builders { name: "analyzer-linux-release-try" }
-      builders { name: "analyzer-strong-linux-release-try" }
       builders { name: "benchmark-linux-try" }
       builders { name: "dart-sdk-windows-try" }
       builders { name: "dart2js-linux-d8-hostchecked-try" }