From c15466034e1b82905562a5f8c77e25335f16b921 Mon Sep 17 00:00:00 2001
From: Jens Johansen <jensj@google.com>
Date: Wed, 12 Jun 2024 10:21:23 +0000
Subject: [PATCH] [status_files] Cleanup status files

Make tool (by default) give error when test entry specified in status
file does not exist. Make -w (by default) remove such entries.

Cleanup most status files, fixing a few entries containing `.dart` and
removing obsolete entries (i.e. entries pointing to nonexisting tests).

This should for instance have given an error in
https://dart-review.googlesource.com/c/sdk/+/370600 saying that the file
I specified didn't exist (in that I shouldn't have specified the `.dart`
part).

TEST=No tests, this is status file maintenance.

Change-Id: Ie977bf15dea2e3dad8d771fd3e99917317e975f6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/370886
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 pkg/pkg.status                                | 36 +-------------
 pkg/status_file/bin/lint.dart                 | 48 +++++++++++++------
 pkg/status_file/bin/normalize.dart            | 20 ++++++--
 .../lib/status_file_entries_file_checker.dart | 43 +++++++++++++++++
 pkg/status_file/lib/status_file_linter.dart   | 21 +++++++-
 .../lib/status_file_normalizer.dart           | 29 ++++++++++-
 pkg/status_file/test/linter_test.dart         |  9 ++--
 pkg/status_file/test/normalize_test.dart      |  3 +-
 .../observatory/tests/service/service.status  |  4 --
 .../tests/service/service_kernel.status       |  4 --
 runtime/tests/vm/vm.status                    | 15 ------
 tests/language/language_dart2js.status        |  7 ---
 tests/language/language_dart2wasm.status      |  3 --
 tests/language/language_kernel.status         | 18 -------
 tests/language/language_spec_parser.status    |  1 -
 tests/lib/lib.status                          | 13 -----
 tests/lib/lib_analyzer.status                 |  3 --
 tests/lib/lib_dart2js.status                  | 11 -----
 tests/lib/lib_dartdevc.status                 | 11 -----
 tests/lib/lib_kernel.status                   |  1 -
 tests/lib/lib_vm.status                       |  1 -
 tests/standalone/standalone.status            | 12 -----
 tests/standalone/standalone_kernel.status     |  5 --
 .../standalone/standalone_precompiled.status  |  2 -
 tests/web/web.status                          | 16 -------
 25 files changed, 150 insertions(+), 186 deletions(-)
 create mode 100644 pkg/status_file/lib/status_file_entries_file_checker.dart

diff --git a/pkg/pkg.status b/pkg/pkg.status
index b002d5f19a3..4a87684e8a1 100644
--- a/pkg/pkg.status
+++ b/pkg/pkg.status
@@ -10,13 +10,11 @@
 */*/packages/*/*: Skip
 */packages/*/*: Skip
 analyzer/test/src/summary/macro_test: Slow, Pass
-analyzer/test/src/task/strong/checker_test: Slow, Pass
-analyzer/test/verify_diagnostics_test.dart: Slow, Pass
-analyzer/test/verify_docs_test.dart: Slow, Pass
+analyzer/test/verify_diagnostics_test: Slow, Pass
+analyzer/test/verify_docs_test: Slow, Pass
 analyzer_plugin/test/plugin/folding_mixin_test: Slow, Pass
 compiler/test/analyses/analyze_test: Slow, Pass
 compiler/test/analyses/api_dynamic_test: Slow, Pass
-compiler/test/analyses/dart2js_dynamic_test: Slow, Pass
 compiler/test/closure/closure_test: Slow, Pass
 compiler/test/codegen/load_elimination_test: Slow, Pass
 compiler/test/codegen/model_test: Slow, Pass
@@ -77,7 +75,6 @@ wasm/*: SkipByDesign # These can't be run without running wasm:setup first.
 
 [ $compiler == dart2analyzer ]
 dev_compiler/test/options/*: SkipByDesign
-testing/test/dart_sdk_negative_test: SkipByDesign
 
 [ $compiler == dart2js ]
 _fe_analyzer_shared/test/*: SkipByDesign # Only meant to run on vm
@@ -118,13 +115,11 @@ vm_service/test/async_scope_test: SkipByDesign # Debugger is disabled in AOT mod
 vm_service/test/async_single_step_exception_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/awaiter_async_stack_contents_2_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/awaiter_async_stack_contents_test: SkipByDesign # Debugger is disabled in AOT mode.
-vm_service/test/bad_reload_test: SkipByDesign # Hot reload is disabled in AOT mode.
 vm_service/test/branch_coverage_test: SkipByDesign # Hot reload is disabled in AOT mode.
 vm_service/test/break*: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/capture_stdio_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/causal_async*: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/code_test: SkipByDesign # Debugger is disabled in AOT mode.
-vm_service/test/complex_reload_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/coverage_async_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/coverage_closure_call_after_optimization_test: SkipByDesign # Debugger and coverage are disabled in AOT mode.
 vm_service/test/coverage_closure_call_test: SkipByDesign # Debugger and coverage are disabled in AOT mode.
@@ -141,7 +136,6 @@ vm_service/test/eval_*test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/evaluate_*test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/external_compilation_service_test: SkipByDesign # Spawns a secondary process.
 vm_service/test/field_script_test: SkipByDesign # Debugger is disabled in AOT mode.
-vm_service/test/get_allocation_samples_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/get_allocation_traces_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/get_instances_as_*: SkipByDesign # Debugger is disabled in AOT mode
 vm_service/test/get_instances_rpc_test: SkipByDesign # Debugger is disabled in AOT mode.
@@ -190,7 +184,6 @@ vm_service/test/reload_sources_test: SkipByDesign # Hot reload is disabled in AO
 vm_service/test/resume_shutdown_race_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/rewind*: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/sdk_break_with_mixin_test: SkipByDesign # Debugger is disabled in AOT mode.
-vm_service/test/set_library_debuggable_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/set_sdk_library_debuggable_test: SkipByDesign # Debugger is disabled in AOT mode.
 vm_service/test/sigquit_starts_service_test: SkipByDesign # Spawns a secondary process using Platform.executable.
 vm_service/test/simple_reload_test: SkipByDesign # Hot reload is disabled in AOT mode.
@@ -222,12 +215,6 @@ analysis_server/test/benchmarks_test: Slow, Pass
 analysis_server/test/domain_completion_test: Slow, Pass
 analysis_server/test/edit/refactoring_test: Slow, Pass
 analysis_server/test/integration/*: Slow, Pass
-analysis_server/test/services/completion/dart/imported_reference_contributor_test: Slow, Pass
-analysis_server/test/services/completion/dart/keyword_contributor_test: Slow, Pass
-analysis_server/test/services/completion/dart/local_reference_contributor_test: Slow, Pass
-analysis_server/test/services/completion/dart/type_member_contributor_test: Slow, Pass
-analysis_server/test/services/refactoring/extract_method_test: Slow, Pass
-analysis_server/test/services/refactoring/inline_method_test: Slow, Pass
 analysis_server/test/socket_server_test: Skip # Pass, Slow
 analysis_server/test/src/plugin/plugin_manager_test: Slow, Pass
 analyzer/test/src/dart/analysis/driver_test: Slow, Pass
@@ -253,7 +240,6 @@ vm_snapshot_analysis/test/*: SkipByDesign # Only meant to run on vm
 
 [ $system == windows ]
 front_end/test/fasta/bootstrap_test: Skip # Issue 31902
-front_end/test/fasta/strong_test: Pass, Slow, Timeout
 front_end/test/incremental_dart2js_load_from_dill_test: Pass, Slow
 vm_service/test/private_rpcs/dev_fs_http_put_test: Skip # Windows disallows "?" in paths
 vm_service/test/private_rpcs/dev_fs_http_put_weird_char_test: Skip # Windows disallows "\r" in paths
@@ -277,7 +263,6 @@ testing/test/analyze_test: SkipByDesign
 compiler/test/codegen/value_range_test: Slow, Pass
 compiler/test/end_to_end/exit_code_test: Slow, Pass
 compiler/test/end_to_end/output_type_test: Slow, Pass
-compiler/test/end_to_end/uri_retention_test: Slow, Pass
 compiler/test/jsinterop/declaration_test: Slow, Pass
 compiler/test/jsinterop/interop_anonymous_unreachable_test: Slow, Pass
 compiler/test/jsinterop/world_test: Slow, Pass
@@ -320,27 +305,13 @@ modular_test/test/loader/loader_test: SkipByDesign
 modular_test/test/specification_parser_test: SkipByDesign
 modular_test/test/src/find_sdk_root2_test: SkipByDesign
 
-[ $compiler == dart2js && $runtime == d8 ]
-front_end/test/src/base/uri_resolver_test: SkipByDesign # Relies on access to file system
-
 [ $compiler == dart2js && $runtime != d8 ]
 front_end/test/mixin_export_test: RuntimeError # Issue 30576
 
-[ $compiler == dart2js && $browser ]
-crypto/test/sha1_test: Slow, Pass
-crypto/test/sha256_test: Slow, Pass
-
-[ $compiler == dart2js && $checked ]
-crypto/test/base64_test: Slow, Pass
-
 [ $compiler == dart2js && $host_asserts ]
 js_ast/test/printer_callback_test: Slow, Pass
 js_ast/test/string_escape_test: Slow, Pass
 
-[ $compiler == dart2js && ($runtime == chrome || $runtime == ff) ]
-async/test/stream_zip_test: SkipSlow # Times out. Issue 22050
-collection/test/unmodifiable_collection_test: SkipSlow # Times out. Issue 22050
-
 [ $runtime == vm && $system != linux ]
 dartdev/test/commands/info_linux_test: SkipByDesign
 
@@ -350,8 +321,6 @@ dartdev/test/commands/info_macos_test: SkipByDesign
 [ $runtime == vm && $system == windows ]
 analysis_server/test/analysis/get_errors_test: Skip # runtime error, Issue 22180
 analysis_server/test/src/plugin/plugin_manager_test: Slow, Pass # Issue 34231
-analyzer/test/src/task/strong/checker_test: Slow, Pass
-analyzer/tool/task_dependency_graph/check_test: Slow, Pass
 
 [ $runtime == vm && $system == windows && $checked ]
 front_end/tool/perf_test: Slow, Pass
@@ -360,7 +329,6 @@ front_end/tool/perf_test: Slow, Pass
 dartdev/test/commands/info_windows_test: SkipByDesign
 
 [ $runtime == vm && $checked ]
-analysis_server/test/completion_test: Slow, Pass
 analysis_server/test/integration/edit/sort_members_test: Slow, Pass
 analysis_server/test/socket_server_test: Skip # Pass, Slow
 
diff --git a/pkg/status_file/bin/lint.dart b/pkg/status_file/bin/lint.dart
index 73105ea4c2b..fca2152c83d 100644
--- a/pkg/status_file/bin/lint.dart
+++ b/pkg/status_file/bin/lint.dart
@@ -16,6 +16,10 @@ ArgParser buildParser() {
       negatable: false,
       defaultsTo: false,
       help: "Warn if a status header expression contains '||'.");
+  parser.addFlag("check-for-non-existing",
+      negatable: true,
+      defaultsTo: true,
+      help: "Check for and error on non-existing test entries.");
   parser.addFlag("text",
       abbr: "t",
       negatable: false,
@@ -43,19 +47,25 @@ void main(List<String> arguments) {
     return;
   }
   bool checkForDisjunctions = results["check-for-disjunctions"];
+  bool checkForNonExisting = results["check-for-non-existing"];
   bool usePipe = results["text"];
   if (usePipe) {
-    lintStdIn(checkForDisjunctions: checkForDisjunctions);
+    lintStdIn(
+        checkForDisjunctions: checkForDisjunctions,
+        checkForNonExisting: checkForNonExisting);
   } else {
     if (results.rest.length != 1) {
       printHelp(parser);
       exit(1);
     }
-    lintPath(results.rest.first, checkForDisjunctions: checkForDisjunctions);
+    lintPath(results.rest.first,
+        checkForDisjunctions: checkForDisjunctions,
+        checkForNonExisting: checkForNonExisting);
   }
 }
 
-void lintStdIn({bool checkForDisjunctions = false}) {
+void lintStdIn(
+    {bool checkForDisjunctions = false, required bool checkForNonExisting}) {
   var strings = <String>[];
   try {
     while (true) {
@@ -66,15 +76,18 @@ void lintStdIn({bool checkForDisjunctions = false}) {
   } on StdinException {
     // I do not know why this happens.
   }
-  if (!lintText(strings)) {
+  if (!lintText(strings, checkForNonExisting: checkForNonExisting)) {
     exit(1);
   }
 }
 
-void lintPath(path, {bool checkForDisjunctions = false}) {
+void lintPath(path,
+    {bool checkForDisjunctions = false, required bool checkForNonExisting}) {
   var filesWithErrors = <String>[];
   if (FileSystemEntity.isFileSync(path)) {
-    if (!lintFile(path, checkForDisjunctions: checkForDisjunctions)) {
+    if (!lintFile(path,
+        checkForDisjunctions: checkForDisjunctions,
+        checkForNonExisting: checkForNonExisting)) {
       filesWithErrors.add(path);
     }
   } else if (FileSystemEntity.isDirectorySync(path)) {
@@ -82,7 +95,9 @@ void lintPath(path, {bool checkForDisjunctions = false}) {
       if (!canLint(entry.path)) {
         return;
       }
-      if (!lintFile(entry.path, checkForDisjunctions: checkForDisjunctions)) {
+      if (!lintFile(entry.path,
+          checkForDisjunctions: checkForDisjunctions,
+          checkForNonExisting: checkForNonExisting)) {
         filesWithErrors.add(entry.path);
       }
     });
@@ -96,22 +111,26 @@ void lintPath(path, {bool checkForDisjunctions = false}) {
   }
 }
 
-bool lintText(List<String> text, {bool checkForDisjunctions = false}) {
+bool lintText(List<String> text,
+    {bool checkForDisjunctions = false, required bool checkForNonExisting}) {
   try {
     var statusFile = StatusFile.parse("stdin", text);
     return lintStatusFile(statusFile,
-        checkForDisjunctions: checkForDisjunctions);
+        checkForDisjunctions: checkForDisjunctions,
+        checkForNonExisting: checkForNonExisting);
   } on status_file.SyntaxError {
     stderr.writeln("Could not parse stdin.");
   }
   return false;
 }
 
-bool lintFile(String path, {bool checkForDisjunctions = false}) {
+bool lintFile(String path,
+    {bool checkForDisjunctions = false, required bool checkForNonExisting}) {
   try {
     var statusFile = StatusFile.read(path);
     return lintStatusFile(statusFile,
-        checkForDisjunctions: checkForDisjunctions);
+        checkForDisjunctions: checkForDisjunctions,
+        checkForNonExisting: checkForNonExisting);
   } on status_file.SyntaxError catch (error) {
     stderr.writeln("Could not parse $path:\n$error");
   }
@@ -119,9 +138,10 @@ bool lintFile(String path, {bool checkForDisjunctions = false}) {
 }
 
 bool lintStatusFile(StatusFile statusFile,
-    {bool checkForDisjunctions = false}) {
-  var lintingErrors =
-      lint(statusFile, checkForDisjunctions: checkForDisjunctions);
+    {bool checkForDisjunctions = false, required bool checkForNonExisting}) {
+  var lintingErrors = lint(statusFile,
+      checkForDisjunctions: checkForDisjunctions,
+      checkForNonExisting: checkForNonExisting);
   if (lintingErrors.isEmpty) {
     print("${statusFile.path}\n Status file passed all tests");
     print("");
diff --git a/pkg/status_file/bin/normalize.dart b/pkg/status_file/bin/normalize.dart
index 232cf921038..5e9c2344421 100644
--- a/pkg/status_file/bin/normalize.dart
+++ b/pkg/status_file/bin/normalize.dart
@@ -18,6 +18,11 @@ ArgParser buildParser() {
       negatable: false,
       defaultsTo: false,
       help: "Overwrite input files with formatted output.");
+  parser.addFlag("delete-non-existing",
+      abbr: 'd',
+      negatable: true,
+      defaultsTo: true,
+      help: "Remove non-existing test entries.");
   parser.addFlag("help",
       abbr: "h",
       negatable: false,
@@ -44,24 +49,28 @@ void main(List<String> arguments) {
   }
   print("");
   bool overwrite = results["overwrite"];
+  bool deleteNonExisting = results["delete-non-existing"];
   for (var path in results.rest) {
     if (FileSystemEntity.isFileSync(path)) {
-      normalizeFile(path, overwrite);
+      normalizeFile(path, overwrite, deleteNonExisting: deleteNonExisting);
     } else if (FileSystemEntity.isDirectorySync(path)) {
       Directory(path).listSync(recursive: true).forEach((entry) {
         if (!canLint(entry.path)) {
           return;
         }
-        normalizeFile(entry.path, overwrite);
+        normalizeFile(entry.path, overwrite,
+            deleteNonExisting: deleteNonExisting);
       });
     }
   }
 }
 
-bool normalizeFile(String path, bool writeFile) {
+bool normalizeFile(String path, bool writeFile,
+    {required bool deleteNonExisting}) {
   try {
     var statusFile = StatusFile.read(path);
-    var normalizedStatusFile = normalizeStatusFile(statusFile);
+    var normalizedStatusFile =
+        normalizeStatusFile(statusFile, deleteNonExisting: deleteNonExisting);
     if (writeFile) {
       File(path).writeAsStringSync(normalizedStatusFile.toString());
       print("Normalized $path");
@@ -70,7 +79,8 @@ bool normalizeFile(String path, bool writeFile) {
     }
     // Check if there are linting errors remaining, such as line comments,
     // that needs to be handled manually.
-    var lintErrors = lint(normalizedStatusFile);
+    var lintErrors =
+        lint(normalizedStatusFile, checkForNonExisting: deleteNonExisting);
     if (lintErrors.isNotEmpty) {
       print("The normalizer could not remove all linting errors. The following "
           "has to be removed manually:");
diff --git a/pkg/status_file/lib/status_file_entries_file_checker.dart b/pkg/status_file/lib/status_file_entries_file_checker.dart
new file mode 100644
index 00000000000..1537a0a40df
--- /dev/null
+++ b/pkg/status_file/lib/status_file_entries_file_checker.dart
@@ -0,0 +1,43 @@
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:io';
+
+import 'canonical_status_file.dart';
+
+RegExp _underscoreTestEnd = RegExp(r"(^.*_test$)");
+RegExp _underscoreTestDotDart = RegExp(r"(^.*_test.dart)");
+RegExp _underscoreTestSlash = RegExp(r"(^.*_test)/");
+
+bool isNonExistingEntry(Uri statusFileUri, StatusEntry entry) {
+  if (entry.path.contains("*")) return false;
+
+  var thirdPartyBase = Uri.base.resolve("third_party/");
+  // skip "third_part/" --- e.g.
+  // "third_party/pkg/native_toolchain_c.status" doesn't point as things
+  // otherwise normally does.
+  if (statusFileUri.path.startsWith(thirdPartyBase.path)) {
+    return false;
+  }
+
+  String? path;
+  for (var regexp in [
+    _underscoreTestEnd,
+    _underscoreTestDotDart,
+    _underscoreTestSlash
+  ]) {
+    var matches = regexp.allMatches(entry.path);
+    if (matches.length == 1) {
+      path = matches.single[1]!;
+      break;
+    }
+  }
+
+  if (path == null) return false;
+  var testPath = statusFileUri.resolveUri(Uri.file("$path.dart"));
+  if (!File.fromUri(testPath).existsSync()) {
+    return true;
+  }
+  return false;
+}
diff --git a/pkg/status_file/lib/status_file_linter.dart b/pkg/status_file/lib/status_file_linter.dart
index ffc7c71327e..ddfc538e682 100644
--- a/pkg/status_file/lib/status_file_linter.dart
+++ b/pkg/status_file/lib/status_file_linter.dart
@@ -5,6 +5,7 @@
 import 'dart:math' as math;
 
 import 'package:status_file/canonical_status_file.dart';
+import 'package:status_file/status_file_entries_file_checker.dart';
 
 class LintingError {
   final int lineNumber;
@@ -18,7 +19,8 @@ class LintingError {
 }
 
 /// Main function to check a status file for linting errors.
-List<LintingError> lint(StatusFile file, {checkForDisjunctions = false}) {
+List<LintingError> lint(StatusFile file,
+    {bool checkForDisjunctions = false, required bool checkForNonExisting}) {
   var errors = <LintingError>[];
   for (var section in file.sections) {
     errors
@@ -29,6 +31,9 @@ List<LintingError> lint(StatusFile file, {checkForDisjunctions = false}) {
     if (checkForDisjunctions) {
       errors.addAll(lintDisjunctionsInHeader(section));
     }
+    if (checkForNonExisting) {
+      errors.addAll(lintEntryExists(file, section));
+    }
   }
   errors.addAll(lintSectionHeaderOrdering(file.sections));
   errors.addAll(lintSectionHeaderDuplicates(file.sections));
@@ -114,6 +119,20 @@ Iterable<LintingError> lintAlphabeticalOrderingOfPaths(StatusSection section) {
   return [];
 }
 
+/// Checks that entries actually represent existing files.
+Iterable<LintingError> lintEntryExists(StatusFile file, StatusSection section) {
+  Uri statusFileUri = Uri.base.resolveUri(Uri.file(file.path));
+  List<LintingError> errors = [];
+  for (var entry in section.entries.whereType<StatusEntry>()) {
+    if (isNonExistingEntry(statusFileUri, entry)) {
+      errors.add(
+          LintingError(entry.lineNumber, "This path doesn't seem to exist."));
+    }
+  }
+
+  return errors;
+}
+
 /// Checks that each section expression have been normalized.
 Iterable<LintingError> lintNormalizedSection(StatusSection section) {
   var nonNormalized = section.condition.toString();
diff --git a/pkg/status_file/lib/status_file_normalizer.dart b/pkg/status_file/lib/status_file_normalizer.dart
index a3895b7fe8b..414f26f5342 100644
--- a/pkg/status_file/lib/status_file_normalizer.dart
+++ b/pkg/status_file/lib/status_file_normalizer.dart
@@ -3,21 +3,48 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:status_file/src/expression.dart';
+import 'package:status_file/status_file_entries_file_checker.dart';
 
 import 'canonical_status_file.dart';
 import 'dart:convert';
 
-StatusFile normalizeStatusFile(StatusFile statusFile) {
+StatusFile normalizeStatusFile(StatusFile statusFile,
+    {required bool deleteNonExisting}) {
   StatusFile newStatusFile = _sortSectionsAndCombine(statusFile);
   for (var section in newStatusFile.sections) {
+    if (deleteNonExisting) {
+      _deleteNonExistingEntries(statusFile, section);
+    }
     _sortEntriesInSection(section);
     _oneLineBetweenSections(section);
   }
+
+  // Remove any empty sections.
+  newStatusFile.sections.removeWhere((section) =>
+      section.sectionHeaderComments.isEmpty &&
+      (section.entries.isEmpty ||
+          (section.entries.length == 1 &&
+              section.entries.single is EmptyEntry)));
+
   // Remove empty line at the end of the file
   newStatusFile.sections.last.entries.removeLast();
   return newStatusFile;
 }
 
+void _deleteNonExistingEntries(StatusFile file, StatusSection section) {
+  Uri statusFileUri = Uri.base.resolveUri(Uri.file(file.path));
+  Set<Entry> remove = {};
+  for (var entry in section.entries.whereType<StatusEntry>()) {
+    if (isNonExistingEntry(statusFileUri, entry)) {
+      // Doesn't exist. Remove it.
+      remove.add(entry);
+    }
+  }
+  if (remove.isNotEmpty) {
+    section.entries.removeWhere(remove.contains);
+  }
+}
+
 /// Sort section entries alphabetically.
 void _sortEntriesInSection(StatusSection section) {
   section.entries.sort((a, b) {
diff --git a/pkg/status_file/test/linter_test.dart b/pkg/status_file/test/linter_test.dart
index bfd2ae3f8b3..c84375517b4 100644
--- a/pkg/status_file/test/linter_test.dart
+++ b/pkg/status_file/test/linter_test.dart
@@ -43,13 +43,16 @@ StatusFile createFromString(String text) {
 
 expectError(String text, String expectedError, {bool disjunctions = false}) {
   var statusFile = createFromString(text);
-  var errors = lint(statusFile, checkForDisjunctions: disjunctions).toList();
+  var errors = lint(statusFile,
+          checkForDisjunctions: disjunctions, checkForNonExisting: false)
+      .toList();
   Expect.equals(expectedError, errors.first.toString());
 }
 
 expectNoError(String text, {bool disjunctions = true}) {
-  var errors =
-      lint(createFromString(text), checkForDisjunctions: disjunctions).toList();
+  var errors = lint(createFromString(text),
+          checkForDisjunctions: disjunctions, checkForNonExisting: false)
+      .toList();
   Expect.listEquals([], errors);
 }
 
diff --git a/pkg/status_file/test/normalize_test.dart b/pkg/status_file/test/normalize_test.dart
index c3e4f1e332d..52ceceaac90 100644
--- a/pkg/status_file/test/normalize_test.dart
+++ b/pkg/status_file/test/normalize_test.dart
@@ -26,7 +26,8 @@ void normalizeCheck() {
   for (var file in files) {
     print("------- ${file.path} -------");
     var statusFile = StatusFile.read(file.path);
-    var statusFileOther = normalizeStatusFile(StatusFile.read(file.path));
+    var statusFileOther = normalizeStatusFile(StatusFile.read(file.path),
+        deleteNonExisting: false);
     checkSemanticallyEqual(statusFile, statusFileOther,
         warnOnDuplicateHeader: true);
     checkFileHeaderIntact(statusFile, statusFileOther);
diff --git a/runtime/observatory/tests/service/service.status b/runtime/observatory/tests/service/service.status
index ed805fc0982..5cda46f0218 100644
--- a/runtime/observatory/tests/service/service.status
+++ b/runtime/observatory/tests/service/service.status
@@ -4,7 +4,6 @@
 
 # Flaky failures
 async_generator_breakpoint_test: Pass, Slow # Uses --stacktrace-every=...
-dds_log_history_size_gigantic_test: Pass, Slow # Involves processing lots of logs
 field_script_test: Pass, RuntimeError
 get_allocation_samples_test: Pass, RuntimeError # Inconsistent stack trace
 get_isolate_rpc_test: Pass, RuntimeError # Issue 29324
@@ -45,9 +44,6 @@ uri_mappings_lookup_test: SkipByDesign # Relies on file paths in the SDK.
 [ $compiler == fasta && $runtime == none ]
 *: ExtraSlow # Attempt to not flake in batch compile mode. See also issue 53672.
 
-[ $mode == debug && $system == windows ]
-dds_log_history_size_gigantic_test: Skip # Too slow: dartbug.com/41825
-
 [ $mode == debug && $system == windows && $checked ]
 async_scope_test: Pass, Slow
 
diff --git a/runtime/observatory/tests/service/service_kernel.status b/runtime/observatory/tests/service/service_kernel.status
index e8614b5d92e..844cb916f35 100644
--- a/runtime/observatory/tests/service/service_kernel.status
+++ b/runtime/observatory/tests/service/service_kernel.status
@@ -73,7 +73,6 @@ causal_async_stack_contents_test: SkipByDesign # Debugger is disabled in AOT mod
 causal_async_stack_presence_test: SkipByDesign # Debugger is disabled in AOT mode.
 causal_async_star_stack_contents_test: SkipByDesign # Debugger is disabled in AOT mode.
 causal_async_star_stack_presence_test: SkipByDesign # Debugger is disabled in AOT mode.
-client_resume_approvals_reload_test: SkipByDesign # Debugger is disabled in AOT mode.
 code_test: SkipByDesign # Debugger is disabled in AOT mode.
 column_breakpoint_test: SkipByDesign # Debugger is disabled in AOT mode.
 complex_reload_test: SkipByDesign # Debugger is disabled in AOT mode.
@@ -109,7 +108,6 @@ issue_25465_test: SkipByDesign # Debugger is disabled in AOT mode.
 issue_27238_test: SkipByDesign # Debugger is disabled in AOT mode.
 issue_27287_test: SkipByDesign # Debugger is disabled in AOT mode.
 issue_30555_test: SkipByDesign # Debugger is disabled in AOT mode.
-kill_paused_test: SkipByDesign # Debugger is disabled in AOT mode.
 library_dependency_test: SkipByDesign # Uses 'dart:mirrors' library.
 local_variable_declaration_test: SkipByDesign # Debugger is disabled in AOT mode.
 local_variable_in_awaiter_async_frame_test: SkipByDesign # Debugger is disabled in AOT mode.
@@ -166,7 +164,6 @@ set_breakpoint_state_test: SkipByDesign # Debugger is disabled in AOT mode.
 set_library_debuggable_test: SkipByDesign # Debugger is disabled in AOT mode.
 sigquit_starts_service_test: SkipByDesign # Spawns a secondary process using Platform.executable.
 simple_reload_test: SkipByDesign # Hot reload is disabled in AOT mode.
-steal_breakpoint_test: SkipByDesign # Debugger is disabled in AOT mode.
 step_into_async_no_await_test: SkipByDesign # Debugger is disabled in AOT mode.
 step_over_await_test: SkipByDesign # Debugger is disabled in AOT mode.
 step_test: SkipByDesign # Debugger is disabled in AOT mode.
@@ -264,7 +261,6 @@ async_generator_breakpoint_test: SkipByDesign # No incremental compiler availabl
 bad_reload_test: Skip # Times out on sim architectures, also RuntimeError.
 break_on_activation_test: RuntimeError # Issue #34736
 breakpoint_in_package_parts_class_file_uri_test: RuntimeError # Issue #34736
-dds_log_history_size_gigantic_test: SkipSlow # Involves hundreds of thousands of log messages
 debugger_inspect_test: RuntimeError, Timeout # Issue #34736
 eval_internal_class_test: RuntimeError # Issue #34736
 eval_regression_flutter20255_test: SkipByDesign # No incremental compiler available.
diff --git a/runtime/tests/vm/vm.status b/runtime/tests/vm/vm.status
index 54e5f800e9d..9d0b1d156e7 100644
--- a/runtime/tests/vm/vm.status
+++ b/runtime/tests/vm/vm.status
@@ -26,7 +26,6 @@ dart/isolates/*: Pass, Slow # Tests use many isolates and take a longer time.
 dart/isolates/concurrency_stress_sanity_test: Pass, Slow # Spawns subprocesses
 dart/isolates/fast_object_copy_test: Pass, Slow # Slow due to doing a lot of transitive object copies.
 dart/minimal_kernel_test: Pass, Slow # Spawns several subprocesses
-dart/null_safety_autodetection_in_kernel_compiler_test: Pass, Slow # Spawns several subprocesses
 dart/print_object_layout_test: Pass, Slow # Spawns several subprocesses
 dart/regress32619_test: Pass, Slow
 dart/slow_path_shared_stub_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag.
@@ -39,7 +38,6 @@ dart/cachable_idempotent_test: Skip # CachableIdempotent calls are not supported
 dart/disassemble_aot_test: SkipByDesign # IA32 does not support AOT.
 dart/regress32597_2_test: Pass, Slow # Uses --optimization-counter-threshold=10 without a kernel service snapshot.
 dart/regress38467_test: Pass, Slow # Uses --optimization-counter-threshold=10 without a kernel service snapshot.
-dart/type_casts_with_null_safety_autodetection_test: Pass, Slow # Uses --optimization-counter-threshold=10 without a kernel service snapshot.
 
 [ $builder_tag == obfuscated ]
 dart/heapsnapshot_cli_test: SkipByDesign # Relies on symbol names
@@ -52,7 +50,6 @@ dart/appjit*: SkipByDesign # Test needs to a particular opt-counter value
 dart/finalizer/finalizer_isolate_groups_run_gc_test: SkipByDesign # GC happens at unpredictable times.
 dart/kernel_determinism_test: SkipSlow
 dart/minimal_kernel_test: SkipSlow # gen_kernel is too slow with optimization_counter_threshold
-dart/null_safety_autodetection_in_kernel_compiler_test: SkipSlow # gen_kernel is too slow with optimization_counter_threshold
 
 [ $compiler == app_jitk ]
 dart/snapshot_version_test: RuntimeError
@@ -72,11 +69,8 @@ dart/b162922506_test: SkipByDesign # Only run in JIT
 dart/entrypoints/jit/*: SkipByDesign # These tests should only run on JIT.
 dart/kernel_determinism_test: SkipByDesign # Test needs to run from source
 dart/minimal_kernel_test: SkipByDesign # Test needs to run from source
-dart/null_safety_autodetection_in_kernel_compiler_test: SkipByDesign # Test needs to run from source
-dart/regress_44026_test: SkipByDesign # Test needs to run from source
 dart/snapshot_depfile_test: SkipByDesign # Test needs to run from source
 dart/spawn_uri_from_kernel_blob_test: SkipByDesign # Only run in JIT.
-dart/type_casts_with_null_safety_autodetection_test: SkipByDesign # Test needs to run from source
 
 [ $compiler == dartkp ]
 dart/await_type_check_with_dynamic_loading_test: SkipByDesign # Uses dart:mirrors.
@@ -101,10 +95,8 @@ dart/appjit_cha_deopt_test: Pass, Slow # Quite slow in debug mode, uses --optimi
 dart/b162922506_test: SkipSlow # Generates very large input file
 dart/hash_map_probes_limit_test: SkipSlow # Test includes large program compilation.
 dart/minimal_kernel_test: SkipSlow # gen_kernel is too slow in debug mode
-dart/null_safety_autodetection_in_kernel_compiler_test: SkipSlow # gen_kernel is too slow in debug mode
 dart/regress47472_test: Pass, Slow # Slow due to throwing 1 million exceptions.
 dart/spawn_shutdown_test: Pass, Slow # VM Shutdown test, It can take some time for all the isolates to shutdown in a Debug build.
-dart/type_casts_with_null_safety_autodetection_test: Pass, Slow # Very slow in debug mode, uses --optimization-counter-threshold=10
 
 [ $mode == product ]
 cc/CoreSnapshotSize: SkipByDesign # Imports dart:mirrors
@@ -130,7 +122,6 @@ dart/gc/fragmentation*: Skip # Uses too much memory with TSAN overhead and kills
 dart/gc/out_of_memory*: Skip # Uses too much memory with TSAN overhead and kills bot
 dart/gc/scavenger_abort_test: Skip # Uses too much memory with TSAN overhead and kills bot
 dart/hash_map_probes_limit_test: SkipSlow # Test includes large program compilation.
-dart/regress_40462_test: SkipSlow
 dart/regress_40753_test: Skip # This test crashes on the bot, but not locally, and infrastructure repeatedly fails to locate its coredump.
 dart/trigger_gc_in_native_test: Skip # This test crashes on the bot, but not locally, and infrastructure repeatedly fails to locate its coredump.
 dart/unobfuscated_static_symbols_test: Pass, Slow # Test includes creating several snapshots in both ELF and assembly modes.
@@ -269,7 +260,6 @@ dart/enable_mirrors_test: SkipByDesign # Separate kernel compilation doesn't res
 dart/isolates/fast_object_copy2_test*: Skip # Uses ffi which is not available on simulated architectures
 dart/isolates/fast_object_copy_test*: SkipSlow
 dart/minimal_kernel_test: SkipSlow # gen_kernel is too slow on simulated architectures
-dart/null_safety_autodetection_in_kernel_compiler_test: SkipSlow # gen_kernel is too slow on simulated architectures
 dart/snapshot_version_test: RuntimeError # Please triage.
 
 [ $compiler == dartk && ($hot_reload || $hot_reload_rollback) ]
@@ -287,7 +277,6 @@ dart/regress_52703_test: SkipSlow
 dart/isolates/dart_api_create_lightweight_isolate_test: SkipByDesign # https://dartbug.com/40579 Dart C API symbols not available.
 
 [ $compiler == dartkp && $simulator ]
-dart/awaiter_stacks/async_throws_stack_lazy_non_symbolic_test: Pass, Slow
 dart/awaiter_stacks/stream_methods_test/1: Pass, Slow
 dart/isolates/fast_object_copy2_test*: Skip # Uses ffi which is not available on simulated architectures
 dart/isolates/fast_object_copy_test*: SkipSlow
@@ -346,9 +335,6 @@ dart/emit_aot_size_info_flag_test: SkipByDesign # This test is for VM AOT only a
 dart/split_aot_kernel_generation2_test: SkipByDesign # This test is for VM AOT only and is quite slow (so we don't run it in debug mode).
 dart/split_aot_kernel_generation_test: SkipByDesign # This test is for VM AOT only and is quite slow (so we don't run it in debug mode).
 
-[ $mode != debug || $runtime != dart_precompiled ]
-in_memory_elf_test: Skip # Tests a debug-mode flag to dart_precompiled_runtime.
-
 # It makes no sense to run any test that uses spawnURI under the simulator
 # as that would involve running CFE (the front end) in simulator mode
 # to compile the URI file specified in spawnURI code.
@@ -373,7 +359,6 @@ dart/appjit*: SkipByDesign # Cannot reload with URI pointing to app snapshot.
 dart/disassemble_determinism_test: SkipSlow # Runs expensive fibonacci(32) computation in 2 subprocesses
 dart/issue_31959_31960_test: SkipSlow
 dart/minimal_kernel_test: SkipSlow # gen_kernel is too slow in hot reload testing mode
-dart/null_safety_autodetection_in_kernel_compiler_test: SkipSlow # gen_kernel is too slow in hot reload testing mode
 dart/print_flow_graph_determinism_test: SkipSlow
 dart/slow_path_shared_stub_test: SkipSlow # Too slow with --shared-slow-path-triggers-gc flag and not relevant outside precompiled.
 dart/spawn_infinite_loop_test: Skip # We can shutdown an isolate before it reloads.
diff --git a/tests/language/language_dart2js.status b/tests/language/language_dart2js.status
index 8e4ec242fa7..d86f536d596 100644
--- a/tests/language/language_dart2js.status
+++ b/tests/language/language_dart2js.status
@@ -8,7 +8,6 @@ async_star/async_star_await_for_test: Skip # evades flake detection https://gith
 external_abstract_fields/external_fields_test: SkipByDesign # Non-JS-interop external members are not supported
 inference_update_2/external_field_test: SkipByDesign # Non-JS-interop external members are not supported
 inference_update_2/why_not_promoted_external_error_test: SkipByDesign # Non-JS-interop external members are not supported
-mixin_method_override_test/G5: Skip # Issue 34354
 number/int64_literal_runtime*_test: Skip # This is testing Dart 2.0 int64 semantics
 regress/regress41983_test: Slow, Pass # Stress test that requires longer time to compile
 vm/*: SkipByDesign # Tests for the VM.
@@ -22,12 +21,6 @@ control_flow_collections/for_non_bool_condition_test: Crash # Issue 36442
 regress/regress45428_test: SkipByDesign # No argument type checks in production mode, issue 45528
 type_object/futureor_tostring_test: Skip # Type syntax is not preserved in minified mode
 
-[ $compiler == dart2js && $runtime == chromeOnAndroid ]
-override_field_test/02: Slow, Pass # TODO(kasperl): Please triage.
-
-[ $compiler == dart2js && $runtime == d8 ]
-import/conditional_string_test: SkipByDesign # No XHR in d8
-
 [ $compiler == dart2js && $runtime == jsshell ]
 await/for_test: Skip # Jsshell does not provide periodic timers, Issue 7728
 
diff --git a/tests/language/language_dart2wasm.status b/tests/language/language_dart2wasm.status
index 9af854a66b8..fe38051bb12 100644
--- a/tests/language/language_dart2wasm.status
+++ b/tests/language/language_dart2wasm.status
@@ -7,6 +7,3 @@
 inference_update_2/why_not_promoted_external_error_test: SkipByDesign # Non-JS-interop external members are not supported
 number/web_int_literals_test: SkipByDesign # WASM has real integers.
 vm/*: SkipByDesign # Tests for the VM.
-
-[ $compiler == dart2wasm && $runtime == d8 ]
-import/conditional_string_test: SkipByDesign # No XHR in d8
diff --git a/tests/language/language_kernel.status b/tests/language/language_kernel.status
index 7c6b0932dbd..791795a9a33 100644
--- a/tests/language/language_kernel.status
+++ b/tests/language/language_kernel.status
@@ -22,16 +22,11 @@ mixin/mixin6_test: SkipByDesign # Prints type names
 mixin/mixin_bound2_test: SkipByDesign # Prints type names
 unsorted/cyclic_type2_test: SkipByDesign # Prints type names
 unsorted/many_named_arguments_test: SkipByDesign # Checks names of arguments
-unsorted/symbol_literal_test/02: SkipByDesign # We don't obfuscate const Symbol constructor
 vm/bool_check_stack_traces_test: SkipByDesign # Looks for filenames in stacktrace output
 vm/no_such_args_error_message_vm_test: SkipByDesign # Looks for function name in error message
 vm/no_such_method_error_message_callable_vm_test: SkipByDesign # Expects unobfuscated method names
 vm/no_such_method_error_message_vm_test: SkipByDesign # Looks for unobfuscated name in error message
 
-[ $compiler == dartk && $mode == debug && $hot_reload ]
-async_star/async_star2_test/01: Crash
-async_star/async_star2_test/05: Crash
-
 [ $compiler == dartk && $mode == debug && ($hot_reload || $hot_reload_rollback) ]
 enum/duplicate_test/02: Crash # Issue 34606
 enum/duplicate_test/none: Crash # Issue 34606
@@ -54,15 +49,6 @@ vm/regress_29145_test: Skip # Issue 29145
 [ $compiler == dartk && $hot_reload_rollback ]
 symbol/conflict_test: Slow, Pass
 
-[ $compiler == dartk && ($hot_reload || $hot_reload_rollback) ]
-async_star/async_star2_test/01: Skip # Timeout
-async_star/async_star2_test/02: Skip # Timeout
-async_star/async_star2_test/03: Skip # Timeout
-async_star/async_star2_test/04: Skip # Timeout
-async_star/async_star2_test/05: Skip # Timeout
-async_star/async_star2_test/none: Skip # Timeout
-type_constants_test/none: Skip # Deferred libraries and hot reload.
-
 [ $compiler == dartkp && $mode == debug && $runtime == dart_precompiled ]
 vm/precompiled_static_initializer_test: Slow, Pass
 
@@ -75,14 +61,10 @@ deferred/redirecting_factory_test: Crash # Issue 23408, KernelVM bug: Deferred l
 export/ambiguous_main_test: Skip # Issue 29895 Fail Issue 14763
 export/double_same_main_test: Skip # Issue 29895 Crash Issue 29895
 field/increment_bailout_test: SkipByDesign
-generic_methods_recursive_bound_test/03: Crash
 main/no_main_test/01: Skip
 main/not_a_function_test: Skip
 mixin/illegal_super_use_test: Skip # Issues 24478 and 23773
 mixin/illegal_superclass_test: Skip # Issues 24478 and 23773
-no_such_method/many_overridden_test.dart: SkipByDesign
-null_test/mirrors: Skip # Uses mirrors.
-null_test/none: SkipByDesign
 optimize/deopt_inlined_function_lazy_test: Skip # Incompatible flag: --deoptimize-alot
 unsorted/hello_dart_test: Skip # Incompatible flag: --compile_all
 unsorted/invocation_mirror2_test: SkipByDesign
diff --git a/tests/language/language_spec_parser.status b/tests/language/language_spec_parser.status
index d5991466a44..f8ae206dc95 100644
--- a/tests/language/language_spec_parser.status
+++ b/tests/language/language_spec_parser.status
@@ -7,7 +7,6 @@ class/large_class_declaration_test: Skip # JVM stack overflow.
 closure/type_test: Pass # Marked as RuntimeError for all in language_2.status.
 const/native_factory_test: Skip # Uses `native`.
 double/invalid_test: Skip # Contains illegally formatted double.
-nnbd/syntax/opt_out_nnbd_modifiers_test: Skip # Requires opt-out of NNBD.
 regress/regress1751477_test: Skip # Times out: 9 levels, exponential blowup => 430 secs.
 syntax/deep_nesting_expression_test: Skip # JVM stack overflow.
 syntax/deep_nesting_statement_test: Skip # JVM stack overflow.
diff --git a/tests/lib/lib.status b/tests/lib/lib.status
index 0390e4a319c..eaecbcac52d 100644
--- a/tests/lib/lib.status
+++ b/tests/lib/lib.status
@@ -28,7 +28,6 @@ isolate/issue_24243_parent_isolate_test: Skip # Requires checked mode
 
 [ $runtime == d8 ]
 js/export/static_interop_mock/proto_test: SkipByDesign # Uses dart:html.
-js/js_util/javascriptobject_extensions_test: SkipByDesign # Uses dart:html.
 js/static_interop_test/constants_test: SkipByDesign # Uses dart:html.
 js/static_interop_test/futurevaluetype_test: SkipByDesign # Uses dart:html.
 js/static_interop_test/import/import_test: SkipByDesign # TODO(srujzs): This test uses the file system to load a module. Since the test runner doesn't start an HTTP server for d8, I don't think this is supported.
@@ -68,7 +67,6 @@ js/instanceof_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS
 js/is_check_and_as_cast_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/js_util/async_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/js_util/implicit_downcast_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
-js/js_util/javascriptobject_extensions_test.dart: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/js_util/jsify_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/js_util/operator_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/js_util/promise_reject_null_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
@@ -82,11 +80,9 @@ js/static_interop_test/call_method_test: SkipByDesign # Issue 42085. CSP policy
 js/static_interop_test/extension_type/external_extension_member_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/extension_type/external_member_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/extension_type/external_static_member_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
-js/static_interop_test/extension_type/external_static_member_with_namespaces_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/external_extension_members_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/external_static_member_lowerings_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/external_static_member_lowerings_trusttypes_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
-js/static_interop_test/external_static_member_lowerings_with_namespaces_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/isa/functional_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/isa/library_renaming_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
 js/static_interop_test/js_array_proxy_or_ref_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
@@ -148,12 +144,9 @@ isolate/count_test: Skip # Isolate.spawnUri
 isolate/cross_isolate_message_test: Skip # Isolate.spawnUri
 isolate/deferred_in_isolate2_test: Skip # Isolate.spawnUri
 isolate/deferred_in_isolate_test: Skip # Isolate.spawnUri
-isolate/detect_nullsafety_1_test: Skip # Tests Source, Kernel, appJIT modes
-isolate/detect_nullsafety_2_test: Skip # Tests Source, Kernel, appJIT modes
 isolate/error_at_spawnuri_test: Skip # Isolate.spawnUri
 isolate/error_exit_at_spawnuri_test: Skip # Isolate.spawnUri
 isolate/exit_at_spawnuri_test: Skip # Isolate.spawnUri
-isolate/illegal_msg_function_test: Skip # Isolate.spawnUri
 isolate/illegal_msg_mirror_test: Skip # Isolate.spawnUri
 isolate/isolate_complex_messages_test: Skip # Isolate.spawnUri
 isolate/issue_21398_parent_isolate1_test: Skip # Isolate.spawnUri
@@ -166,12 +159,6 @@ isolate/message_test: Skip # Isolate.spawnUri
 isolate/mint_maker_test: Skip # Isolate.spawnUri
 isolate/nested_spawn2_test: Skip # Isolate.spawnUri
 isolate/nested_spawn_test: Skip # Isolate.spawnUri
-isolate/nnbd_spawn_autodetect_1_test: Skip # Tests Source, Kernel, appJIT modes
-isolate/nnbd_spawn_autodetect_2_test: Skip # Tests Source, Kernel, appJIT modes
-isolate/nnbd_spawnuri_autodetect_1_test: Skip # Uses Isolate.spawnUri
-isolate/nnbd_spawnuri_autodetect_2_test: Skip # Uses Isolate.spawnUri
-isolate/nnbd_spawnuri_autodetect_3_test: Skip # Uses Isolate.spawnUri
-isolate/nnbd_spawnuri_autodetect_4_test: Skip # Uses Isolate.spawnUri
 isolate/no_package_test: Skip # Isolate.spawnUri
 isolate/package_config_test: Skip # Isolate.spawnUri
 isolate/raw_port_test: Skip # Isolate.spawnUri
diff --git a/tests/lib/lib_analyzer.status b/tests/lib/lib_analyzer.status
index 113c571b625..8ed3c7d6556 100644
--- a/tests/lib/lib_analyzer.status
+++ b/tests/lib/lib_analyzer.status
@@ -1,6 +1,3 @@
 # Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
-
-[ $compiler == dart2analyzer ]
-html/js_function_getter_trust_types_test: Skip # dart2js specific flags.
diff --git a/tests/lib/lib_dart2js.status b/tests/lib/lib_dart2js.status
index 52bd162c874..62d9d6c7b88 100644
--- a/tests/lib/lib_dart2js.status
+++ b/tests/lib/lib_dart2js.status
@@ -5,13 +5,7 @@
 [ $compiler == dart2js ]
 convert/chunked_conversion_utf88_test: Slow, Pass
 convert/utf85_test: Slow, Pass
-developer/metrics_num_test: Skip # Because of an int / double type test.
 developer/timeline_test: Skip # Not supported
-html/custom/document_register_basic_test: Slow, Pass
-html/custom/document_register_type_extensions_test/construction: Slow, Pass
-html/custom/document_register_type_extensions_test/registration: Slow, Pass
-html/custom/entered_left_view/shadow_dom_test: Slow, Pass
-html/custom_elements_test: Slow, Pass # Issue 26789
 html/interactive_geolocation_test: Skip # Requires allowing geo location.
 html/isolates_test: SkipByDesign
 html/worker_api_test: SkipByDesign
@@ -51,11 +45,7 @@ convert/streamed_conversion_json_utf8_encode_test: SkipSlow # Times out. Issue 2
 convert/streamed_conversion_utf8_decode_test: SkipSlow # Times out. Issue 22050
 convert/utf85_test: Slow, Pass
 html/callback_list_test: SkipByDesign # FileSystem not supported in FireFox.
-html/custom/attribute_changed_callback_test: Skip # Times out
-html/custom/created_callback_test: Skip # Times out
-html/custom/document_register_basic_test: Skip # Times out, or unittest times out
 html/dart_object_local_storage_test: Skip # sessionStorage NS_ERROR_DOM_NOT_SUPPORTED_ERR
-html/file_sample_test: Skip # FileSystem not supported on FireFox.
 html/fileapi_supported_test: Skip # FileSystem not supported on FireFox.
 html/fileapi_supported_throws_test: Skip # FileSystem not supported on FireFox.
 html/history_test: Skip # Issue 22050
@@ -65,7 +55,6 @@ html/request_animation_frame_test: Skip # Async test hangs.
 [ $compiler == dart2js && $runtime == safari ]
 html/audiocontext_test: Skip # evades flake detection https://github.com/dart-lang/sdk/issues/50718
 html/callback_list_test: SkipByDesign # FileSystem not supported in Safari.
-html/file_sample_test: Skip # FileSystem not supported on Safari.
 html/fileapi_supported_throws_test: Skip # FileSystem not supported on Safari
 html/input_element_date_test: Skip # evades flake detection https://github.com/dart-lang/sdk/issues/50718
 html/input_element_datetime_test: Skip # evades flake detection https://github.com/dart-lang/sdk/issues/50718
diff --git a/tests/lib/lib_dartdevc.status b/tests/lib/lib_dartdevc.status
index 061b81a31a6..01c75c4ac27 100644
--- a/tests/lib/lib_dartdevc.status
+++ b/tests/lib/lib_dartdevc.status
@@ -7,19 +7,8 @@ convert/chunked_conversion_utf88_test: Slow, Pass
 convert/json_utf8_chunk_test: Slow, Pass
 convert/streamed_conversion_utf8_decode_test: Slow, Pass # Issue 29922
 convert/utf85_test: Slow, Pass
-developer/metrics_num_test: Skip # Because of an int / double type test.
 html/callback_list_test: Skip # Test requires user interaction to accept permissions.
-html/custom/attribute_changed_callback_test: Skip # Issue 31577
-html/custom/created_callback_test: Skip # Issue 31577
-html/custom/document_register_basic_test: Skip # Issue 31577
-html/custom/document_register_template_test: Skip # Issue 31577
-html/custom/document_register_type_extensions_test: Skip # Issue 31577
-html/custom/element_upgrade_test: Skip # Issue 31577
 html/custom/entered_left_view/*: Skip # Issue 31577
-html/custom_element_method_clash_test: Skip # Issue 29922
-html/custom_element_name_clash_test: Skip # Issue 29922
-html/custom_elements_23127_test: Skip # Issue 29922
-html/custom_elements_test: Skip # Issue 29922
 html/fileapi_*: SkipByDesign # Issue 53864
 html/interactive_geolocation_test: Skip # Requires allowing geo location.
 isolate/*: SkipByDesign # No support for dart:isolate in dart4web (http://dartbug.com/30538)
diff --git a/tests/lib/lib_kernel.status b/tests/lib/lib_kernel.status
index 050cea871ba..2faf2b7a760 100644
--- a/tests/lib/lib_kernel.status
+++ b/tests/lib/lib_kernel.status
@@ -46,7 +46,6 @@ mirrors/invocation_fuzz_test: Crash
 mirrors/metadata_allowed_values_test/16: Skip # Flaky, crashes.
 
 [ $compiler == dartk && $hot_reload_rollback ]
-isolate/illegal_msg_function_test: Skip # Timeout
 isolate/pause_test: Skip # Timeout
 
 [ $compiler == dartk && ($hot_reload || $hot_reload_rollback) ]
diff --git a/tests/lib/lib_vm.status b/tests/lib/lib_vm.status
index edd6c146d49..2b73d598243 100644
--- a/tests/lib/lib_vm.status
+++ b/tests/lib/lib_vm.status
@@ -20,7 +20,6 @@ async/future_or_only_in_async_test/00: MissingCompileTimeError
 convert/streamed_conversion_json_utf8_decode_test: Pass, Slow # Infrequent timeouts.
 html/*: SkipByDesign # dart:html not supported on VM.
 js/*: SkipByDesign
-mirrors/deferred_type_test: CompileTimeError
 mirrors/generic_bounded_by_type_parameter_test/02: MissingCompileTimeError
 mirrors/generic_bounded_test/01: MissingCompileTimeError
 mirrors/generic_bounded_test/02: MissingCompileTimeError
diff --git a/tests/standalone/standalone.status b/tests/standalone/standalone.status
index d186f7ea0fd..ddeacd2c0c0 100644
--- a/tests/standalone/standalone.status
+++ b/tests/standalone/standalone.status
@@ -16,7 +16,6 @@ package/scenarios/invalid/non_existent_packages_file_test: CompileTimeError
 
 [ $builder_tag == dwarf ]
 io/socket_connect_stacktrace_test: SkipByDesign # Assumes stacktrace can be inspected directly, without decoding
-regress_53519_test.dart: SkipByDesign # Relies on symbolic stack traces.
 stack_trace/full1_test: SkipByDesign # Relies on symbolic stack traces.
 stack_trace/full2_test: SkipByDesign # Relies on symbolic stack traces.
 stack_trace/full3_test: SkipByDesign # Relies on symbolic stack traces.
@@ -39,7 +38,6 @@ io/socket_source_address_test: SkipByDesign
 
 [ $builder_tag == obfuscated ]
 no_such_method_error_with_invocation_test: SkipByDesign # Checks the member names in the NSM error message.
-regress_53519_test.dart: SkipByDesign # Relies on symbolic stack traces.
 
 [ $compiler == app_jitk ]
 io/socket_sigpipe_test: SkipByDesign # Spawns server process using Platform.executable
@@ -66,16 +64,6 @@ io/addlatexhash_test: Skip
 io/issue_46436_test: SkipByDesign # Uses mirrors.
 io/print_test: SkipByDesign # Attempts to spawn dart using Platform.executable
 io/socket_sigpipe_test: SkipByDesign # Spawns server process using Platform.executable
-io/wait_for_event_isolate_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_microtask_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_nested_microtask_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_nested_timer_microtask_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_nested_timer_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_nested_waits_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_timer_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_zone_caught_error_test: SkipByDesign # Uses mirrors.
-io/wait_for_event_zone_test: SkipByDesign # Uses mirrors.
-io/wait_for_test: SkipByDesign # Uses mirrors.
 verbose_gc_to_bmu_test: Skip # Attempts to spawn dart using Platform.executable
 
 [ $sanitizer == asan ]
diff --git a/tests/standalone/standalone_kernel.status b/tests/standalone/standalone_kernel.status
index 154cf897fc0..83694f80c1d 100644
--- a/tests/standalone/standalone_kernel.status
+++ b/tests/standalone/standalone_kernel.status
@@ -6,10 +6,6 @@
 
 io/process_sync_test: Pass, Slow # Spawns synchronously subprocesses in sequence.
 
-[ $system == android ]
-io/http_ban_http_embedder_test: Skip # Requires http server bound to non-loopback; not provided by system.
-io/http_ban_http_normal_test: Skip # Requires http server bound to non-loopback; not provided by system.
-
 [ $arch == ia32 && $builder_tag == optimization_counter_threshold ]
 io/file_lock_test: SkipSlow # Timeout
 
@@ -28,7 +24,6 @@ no_support_debugger_test: Skip # kernel-service snapshot not compatible with fla
 [ $compiler == dartk && $system == windows ]
 io/dart_std_io_pipe_test: Slow, Pass
 io/secure_builtin_roots_test: Skip # Issues 32137 and 32138.
-io/wait_for_event_isolate_test: Skip # Issues 32137 and 32138.
 map_insert_remove_oom_test: Skip # Heap limit too low.
 
 [ $compiler == dartk && $hot_reload ]
diff --git a/tests/standalone/standalone_precompiled.status b/tests/standalone/standalone_precompiled.status
index eaa1970bda4..41284c11fa4 100644
--- a/tests/standalone/standalone_precompiled.status
+++ b/tests/standalone/standalone_precompiled.status
@@ -46,8 +46,6 @@ io/stdin_sync_test: Skip
 io/stdio_implicit_close_test: Skip
 io/stdio_nonblocking_test: Skip
 io/stdout_stderr_test: Skip
-io/test_extension_fail_test: Skip
-io/test_extension_test: Skip
 io/windows_environment_test: Skip
 package/scenarios/empty_packages_file/empty_packages_file_noimports_test: Skip
 package/scenarios/invalid/invalid_utf8_test: Skip
diff --git a/tests/web/web.status b/tests/web/web.status
index 8d5c0c099c7..f09a47a89d6 100644
--- a/tests/web/web.status
+++ b/tests/web/web.status
@@ -3,7 +3,6 @@
 # BSD-style license that can be found in the LICENSE file.
 
 [ $compiler != dart2js ]
-dummy_compiler_test: SkipByDesign # Issue 30773. Test should be migrated as a unit test of dart2js, is only intended to test self-hosting.
 internal/deferred_url_test: SkipByDesign # test specific for the dart2js runtime
 
 [ $compiler == dart2wasm ]
@@ -17,9 +16,6 @@ async_stacktrace_test: Skip # Issue 53555
 native/*: Skip # dart2js tests for native keyword
 wasm_js_shared/weak_reference_polyfill_test: SkipByDesign # Test specific for the dart2js/dart2wasm runtime
 
-[ $runtime == jsshell ]
-deferred/load_in_correct_order_test: SkipByDesign # jsshell preamble does not support this test.
-
 [ $browser ]
 native/*: Skip
 
@@ -28,7 +24,6 @@ operator_test: Skip
 string_interpolation_test: Skip
 
 [ $compiler == dart2js && $runtime == chrome && $system == windows ]
-class_test: Slow, Pass # Issue 25940
 closure_capture3_test: Slow, Pass # Issue 25940
 closure_capture5_test: Slow, Pass # Issue 25940
 conditional_test: Slow, Pass # Issue 25940
@@ -36,9 +31,6 @@ consistent_codeUnitAt_error_test: Slow, Pass # Issue 25940
 constant_javascript_semantics2_test: Slow, Pass # Issue 25940
 deferred_split_test: Slow, Pass # Issue 25940
 
-[ $compiler == dart2js && $runtime == chrome && $csp ]
-deferred/load_in_correct_order_test: SkipByDesign # Purposely uses `eval`
-
 [ $compiler == dart2js && $runtime == d8 ]
 internal/object_members_test: SkipByDesign # Browser test
 
@@ -46,7 +38,6 @@ internal/object_members_test: SkipByDesign # Browser test
 consistent_index_error_string_test: Slow, Pass # Issue 25940
 
 [ $compiler == dart2js && $csp ]
-deferred_custom_loader_test: SkipByDesign # Issue 25683
 deferred_fail_and_retry_test: SkipByDesign # Uses eval to simulate failed loading.
 internal/object_members_test: SkipByDesign # Uses eval for interop
 js_interop_non_null_asserts_disabled_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
@@ -55,7 +46,6 @@ regress/issue/49129_test: SkipByDesign # Uses eval for interop
 
 [ $compiler == dart2js && !$host_asserts ]
 deferred/many_parts/many_parts_test: Slow, Pass # Large stress test by design
-dummy_compiler_test: Slow, Pass # Issue 32439. self-hosting doesn't work with CFE yet.
 
 [ $compiler == dart2js && $minified ]
 code_motion_exception_test: Skip # Requires unminified operator names.
@@ -63,12 +53,6 @@ code_motion_exception_test: Skip # Requires unminified operator names.
 [ $compiler == dart2js && ($runtime == ff || $runtime == jsshell || $runtime == safari) ]
 code_motion_exception_test: Skip # Required V8 specific format of JavaScript errors.
 
-[ $compiler == dart2js && ($browser || $host_asserts) ]
-dummy_compiler_test: SkipByDesign # Issue 30773. Test should be migrated as a unit test of dart2js, is only intended to test self-hosting.
-
 [ $compiler == dartk && $runtime == vm ]
 new_from_env_test: SkipByDesign # dart2js only test
 unconditional_dartio_import_test: SkipByDesign # dart2js only test
-
-[ $compiler == dartkp || $runtime == vm ]
-weak_reference_test: SkipByDesign # Web only test