From 368c175ae90684daee60e2e134826517e21f9451 Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Fri, 27 Sep 2024 23:43:40 +0000
Subject: [PATCH 1/7] Skip some wasm tests

Try to unblock CI. Some wasm tests are failing to load without a clear
failure message.
---
 integration_tests/regression/lib/issue_2142/test.dart | 4 ++++
 integration_tests/wasm/test/hello_world_test.dart     | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/integration_tests/regression/lib/issue_2142/test.dart b/integration_tests/regression/lib/issue_2142/test.dart
index 06afc5adc..12280b111 100644
--- a/integration_tests/regression/lib/issue_2142/test.dart
+++ b/integration_tests/regression/lib/issue_2142/test.dart
@@ -2,6 +2,10 @@
 // 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.
 
+// TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+@TestOn('!wasm')
+library;
+
 import 'package:test/test.dart';
 import 'import.dart';
 
diff --git a/integration_tests/wasm/test/hello_world_test.dart b/integration_tests/wasm/test/hello_world_test.dart
index 9ddd5116b..106bbdf6e 100644
--- a/integration_tests/wasm/test/hello_world_test.dart
+++ b/integration_tests/wasm/test/hello_world_test.dart
@@ -2,7 +2,8 @@
 // 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.
 
-@TestOn('wasm')
+// TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+@TestOn('wasm && !(windows || chrome)')
 // This retry is a regression test for https://github.com/dart-lang/test/issues/2006
 @Retry(2)
 library;

From 555ba31d0fcb537cb6b2ef7a5ac587fbf4e8cdb8 Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Sat, 28 Sep 2024 00:10:01 +0000
Subject: [PATCH 2/7] Skip at the CI config level

---
 .github/workflows/dart.yml                    | 242 +++---------------
 integration_tests/wasm/dart_test.yaml         |  12 +-
 integration_tests/wasm/mono_pkg.yaml          |   3 +-
 .../wasm/test/hello_world_test.dart           |   3 +-
 4 files changed, 45 insertions(+), 215 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index d0db67731..1bb28fcf5 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -238,54 +238,6 @@ jobs:
         if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/test_core
   job_005:
-    name: "analyze_and_format; windows; Dart 3.5.0-311.0.dev; PKG: integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
-    runs-on: windows-latest
-    steps:
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
-        with:
-          sdk: "3.5.0-311.0.dev"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart analyze --fatal-infos"
-        run: dart analyze --fatal-infos
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-  job_006:
-    name: "analyze_and_format; windows; Dart dev; PKG: integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
-    runs-on: windows-latest
-    steps:
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
-        with:
-          sdk: dev
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart analyze --fatal-infos"
-        run: dart analyze --fatal-infos
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-  job_007:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: integration_tests/regression; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -320,9 +272,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_008:
+  job_006:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/checks; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -357,9 +307,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_009:
+  job_007:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test_core; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -394,9 +342,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_010:
+  job_008:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: ubuntu-latest
     steps:
@@ -431,9 +377,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_011:
+  job_009:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: integration_tests/wasm; `dart test --timeout=60s`"
     runs-on: ubuntu-latest
     steps:
@@ -468,9 +412,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_012:
+  job_010:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: ubuntu-latest
     steps:
@@ -505,9 +447,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_013:
+  job_011:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: ubuntu-latest
     steps:
@@ -542,9 +482,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_014:
+  job_012:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: ubuntu-latest
     steps:
@@ -579,9 +517,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_015:
+  job_013:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: ubuntu-latest
     steps:
@@ -616,9 +552,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_016:
+  job_014:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: ubuntu-latest
     steps:
@@ -653,9 +587,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_017:
+  job_015:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`"
     runs-on: ubuntu-latest
     steps:
@@ -690,9 +622,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_018:
+  job_016:
     name: "unit_test; linux; Dart dev; PKG: integration_tests/regression; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -727,9 +657,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_019:
+  job_017:
     name: "unit_test; linux; Dart dev; PKG: pkgs/checks; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -764,9 +692,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_020:
+  job_018:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test_core; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -801,9 +727,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_021:
+  job_019:
     name: "unit_test; linux; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: ubuntu-latest
     steps:
@@ -838,9 +762,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_022:
+  job_020:
     name: "unit_test; linux; Dart dev; PKG: integration_tests/wasm; `dart test --timeout=60s`"
     runs-on: ubuntu-latest
     steps:
@@ -875,9 +797,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_023:
+  job_021:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: ubuntu-latest
     steps:
@@ -912,9 +832,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_024:
+  job_022:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: ubuntu-latest
     steps:
@@ -949,9 +867,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_025:
+  job_023:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: ubuntu-latest
     steps:
@@ -986,9 +902,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_026:
+  job_024:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: ubuntu-latest
     steps:
@@ -1023,9 +937,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_027:
+  job_025:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: ubuntu-latest
     steps:
@@ -1060,9 +972,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_028:
+  job_026:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`"
     runs-on: ubuntu-latest
     steps:
@@ -1097,9 +1007,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_029:
+  job_027:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: macos-latest
     steps:
@@ -1134,9 +1042,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_030:
+  job_028:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: macos-latest
     steps:
@@ -1171,9 +1077,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_031:
+  job_029:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: macos-latest
     steps:
@@ -1208,9 +1112,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_032:
+  job_030:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: macos-latest
     steps:
@@ -1245,9 +1147,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_033:
+  job_031:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: macos-latest
     steps:
@@ -1282,9 +1182,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_034:
+  job_032:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1309,36 +1207,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_035:
-    name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: integration_tests/wasm; `dart test --timeout=60s`"
-    runs-on: windows-latest
-    steps:
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
-        with:
-          sdk: "3.5.0-311.0.dev"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart test --timeout=60s"
-        run: "dart test --timeout=60s"
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-    needs:
-      - job_001
-      - job_002
-      - job_003
-      - job_004
-      - job_005
-      - job_006
-  job_036:
+  job_033:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: windows-latest
     steps:
@@ -1363,9 +1232,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_037:
+  job_034:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: windows-latest
     steps:
@@ -1390,9 +1257,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_038:
+  job_035:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: windows-latest
     steps:
@@ -1417,9 +1282,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_039:
+  job_036:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: windows-latest
     steps:
@@ -1444,9 +1307,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_040:
+  job_037:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: windows-latest
     steps:
@@ -1471,9 +1332,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_041:
+  job_038:
     name: "unit_test; windows; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1498,36 +1357,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-      - job_006
-  job_042:
-    name: "unit_test; windows; Dart dev; PKG: integration_tests/wasm; `dart test --timeout=60s`"
-    runs-on: windows-latest
-    steps:
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
-        with:
-          sdk: dev
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart test --timeout=60s"
-        run: "dart test --timeout=60s"
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-    needs:
-      - job_001
-      - job_002
-      - job_003
-      - job_004
-      - job_005
-      - job_006
-  job_043:
+  job_039:
     name: Notify failure
     runs-on: ubuntu-latest
     if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()"
@@ -1577,7 +1407,3 @@ jobs:
       - job_036
       - job_037
       - job_038
-      - job_039
-      - job_040
-      - job_041
-      - job_042
diff --git a/integration_tests/wasm/dart_test.yaml b/integration_tests/wasm/dart_test.yaml
index 14308c465..6dacbcd11 100644
--- a/integration_tests/wasm/dart_test.yaml
+++ b/integration_tests/wasm/dart_test.yaml
@@ -1,5 +1,9 @@
-platforms: [chrome, firefox]
-# Node doesn't work because the version available in the current Ubuntu GitHub runners is too
-# old to support WASM+GC, which would be required to run Dart tests.
-#platforms: [chrome, firefox, node]
+platforms:
+# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+#- chrome
+- firefox
+# Node doesn't work because the version available in the current Ubuntu GitHub
+# runners is too old to support WASM+GC, which would be required to run Dart
+# tests.
+#- node
 compilers: [dart2wasm]
diff --git a/integration_tests/wasm/mono_pkg.yaml b/integration_tests/wasm/mono_pkg.yaml
index a8f341085..ecd071c24 100644
--- a/integration_tests/wasm/mono_pkg.yaml
+++ b/integration_tests/wasm/mono_pkg.yaml
@@ -6,7 +6,8 @@ sdk:
 
 os:
 - linux
-- windows
+# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+# - windows
 
 stages:
 - analyze_and_format:
diff --git a/integration_tests/wasm/test/hello_world_test.dart b/integration_tests/wasm/test/hello_world_test.dart
index 106bbdf6e..9ddd5116b 100644
--- a/integration_tests/wasm/test/hello_world_test.dart
+++ b/integration_tests/wasm/test/hello_world_test.dart
@@ -2,8 +2,7 @@
 // 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.
 
-// TODO(https://github.com/dart-lang/test/issues/1790) - unskip
-@TestOn('wasm && !(windows || chrome)')
+@TestOn('wasm')
 // This retry is a regression test for https://github.com/dart-lang/test/issues/2006
 @Retry(2)
 library;

From 9b3e5bfb37408818684147e1be7590371b073e32 Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Sat, 28 Sep 2024 00:22:05 +0000
Subject: [PATCH 3/7] Skip on linux dev too

---
 .github/workflows/dart.yml            | 91 +++++++--------------------
 integration_tests/wasm/dart_test.yaml |  4 +-
 integration_tests/wasm/mono_pkg.yaml  |  3 +-
 3 files changed, 25 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 1bb28fcf5..0d05c7557 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -126,16 +126,16 @@ jobs:
         if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/test_core
   job_004:
-    name: "analyze_and_format; linux; Dart dev; PKGS: integration_tests/regression, integration_tests/spawn_hybrid, integration_tests/wasm, pkgs/checks, pkgs/test, pkgs/test_api, pkgs/test_core; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
+    name: "analyze_and_format; linux; Dart dev; PKGS: integration_tests/regression, integration_tests/spawn_hybrid, pkgs/checks, pkgs/test, pkgs/test_api, pkgs/test_core; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_tests/regression-integration_tests/spawn_hybrid-integration_tests/wasm-pkgs/checks-pkgs/test-pkgs/test_api-pkgs/test_core;commands:format-analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_tests/regression-integration_tests/spawn_hybrid-pkgs/checks-pkgs/test-pkgs/test_api-pkgs/test_core;commands:format-analyze_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_tests/regression-integration_tests/spawn_hybrid-integration_tests/wasm-pkgs/checks-pkgs/test-pkgs/test_api-pkgs/test_core
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_tests/regression-integration_tests/spawn_hybrid-pkgs/checks-pkgs/test-pkgs/test_api-pkgs/test_core
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -172,19 +172,6 @@ jobs:
         run: dart analyze --fatal-infos
         if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'"
         working-directory: integration_tests/spawn_hybrid
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart analyze --fatal-infos"
-        run: dart analyze --fatal-infos
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
       - id: pkgs_checks_pub_upgrade
         name: pkgs/checks; dart pub upgrade
         run: dart pub upgrade
@@ -763,41 +750,6 @@ jobs:
       - job_003
       - job_004
   job_020:
-    name: "unit_test; linux; Dart dev; PKG: integration_tests/wasm; `dart test --timeout=60s`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_tests/wasm;commands:test_2"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_tests/wasm
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
-        with:
-          sdk: dev
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart test --timeout=60s"
-        run: "dart test --timeout=60s"
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-    needs:
-      - job_001
-      - job_002
-      - job_003
-      - job_004
-  job_021:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: ubuntu-latest
     steps:
@@ -832,7 +784,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_022:
+  job_021:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: ubuntu-latest
     steps:
@@ -867,7 +819,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_023:
+  job_022:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: ubuntu-latest
     steps:
@@ -902,7 +854,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_024:
+  job_023:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: ubuntu-latest
     steps:
@@ -937,7 +889,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_025:
+  job_024:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: ubuntu-latest
     steps:
@@ -972,7 +924,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_026:
+  job_025:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`"
     runs-on: ubuntu-latest
     steps:
@@ -1007,7 +959,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_027:
+  job_026:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: macos-latest
     steps:
@@ -1042,7 +994,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_028:
+  job_027:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: macos-latest
     steps:
@@ -1077,7 +1029,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_029:
+  job_028:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: macos-latest
     steps:
@@ -1112,7 +1064,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_030:
+  job_029:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: macos-latest
     steps:
@@ -1147,7 +1099,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_031:
+  job_030:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: macos-latest
     steps:
@@ -1182,7 +1134,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_032:
+  job_031:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1207,7 +1159,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_033:
+  job_032:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: windows-latest
     steps:
@@ -1232,7 +1184,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_034:
+  job_033:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: windows-latest
     steps:
@@ -1257,7 +1209,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_035:
+  job_034:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: windows-latest
     steps:
@@ -1282,7 +1234,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_036:
+  job_035:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: windows-latest
     steps:
@@ -1307,7 +1259,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_037:
+  job_036:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: windows-latest
     steps:
@@ -1332,7 +1284,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_038:
+  job_037:
     name: "unit_test; windows; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1357,7 +1309,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_039:
+  job_038:
     name: Notify failure
     runs-on: ubuntu-latest
     if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()"
@@ -1406,4 +1358,3 @@ jobs:
       - job_035
       - job_036
       - job_037
-      - job_038
diff --git a/integration_tests/wasm/dart_test.yaml b/integration_tests/wasm/dart_test.yaml
index 6dacbcd11..a5e9fbe96 100644
--- a/integration_tests/wasm/dart_test.yaml
+++ b/integration_tests/wasm/dart_test.yaml
@@ -1,9 +1,9 @@
 platforms:
 # TODO(https://github.com/dart-lang/test/issues/1790) - unskip
-#- chrome
+# - chrome
 - firefox
 # Node doesn't work because the version available in the current Ubuntu GitHub
 # runners is too old to support WASM+GC, which would be required to run Dart
 # tests.
-#- node
+# - node
 compilers: [dart2wasm]
diff --git a/integration_tests/wasm/mono_pkg.yaml b/integration_tests/wasm/mono_pkg.yaml
index ecd071c24..496a903d2 100644
--- a/integration_tests/wasm/mono_pkg.yaml
+++ b/integration_tests/wasm/mono_pkg.yaml
@@ -2,7 +2,8 @@
 
 sdk:
 - pubspec
-- dev
+# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+# - dev
 
 os:
 - linux

From 2843d3e87c77f16e904082886f0571d53127493b Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Sat, 28 Sep 2024 00:39:05 +0000
Subject: [PATCH 4/7] Remove failing tests entirely

Chrome tests are failing to start up, and firefox tests are not running
any test cases.
---
 integration_tests/wasm/dart_test.yaml         |  9 -------
 integration_tests/wasm/mono_pkg.yaml          | 20 ----------------
 integration_tests/wasm/pubspec.yaml           |  7 ------
 .../wasm/test/hello_world_test.dart           | 24 -------------------
 4 files changed, 60 deletions(-)
 delete mode 100644 integration_tests/wasm/dart_test.yaml
 delete mode 100644 integration_tests/wasm/mono_pkg.yaml
 delete mode 100644 integration_tests/wasm/pubspec.yaml
 delete mode 100644 integration_tests/wasm/test/hello_world_test.dart

diff --git a/integration_tests/wasm/dart_test.yaml b/integration_tests/wasm/dart_test.yaml
deleted file mode 100644
index a5e9fbe96..000000000
--- a/integration_tests/wasm/dart_test.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-platforms:
-# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
-# - chrome
-- firefox
-# Node doesn't work because the version available in the current Ubuntu GitHub
-# runners is too old to support WASM+GC, which would be required to run Dart
-# tests.
-# - node
-compilers: [dart2wasm]
diff --git a/integration_tests/wasm/mono_pkg.yaml b/integration_tests/wasm/mono_pkg.yaml
deleted file mode 100644
index 496a903d2..000000000
--- a/integration_tests/wasm/mono_pkg.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# See https://pub.dev/packages/mono_repo
-
-sdk:
-- pubspec
-# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
-# - dev
-
-os:
-- linux
-# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
-# - windows
-
-stages:
-- analyze_and_format:
-  - group:
-    - format
-    - analyze: --fatal-infos
-- unit_test:
-  # The config here is a regression test for https://github.com/dart-lang/test/issues/2006
-  - test: --timeout=60s
diff --git a/integration_tests/wasm/pubspec.yaml b/integration_tests/wasm/pubspec.yaml
deleted file mode 100644
index 8dc9ef989..000000000
--- a/integration_tests/wasm/pubspec.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: wasm_tests
-publish_to: none
-environment:
-  sdk: ^3.5.0-311.0.dev
-resolution: workspace
-dev_dependencies:
-  test: any
diff --git a/integration_tests/wasm/test/hello_world_test.dart b/integration_tests/wasm/test/hello_world_test.dart
deleted file mode 100644
index 9ddd5116b..000000000
--- a/integration_tests/wasm/test/hello_world_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2022, 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.
-
-@TestOn('wasm')
-// This retry is a regression test for https://github.com/dart-lang/test/issues/2006
-@Retry(2)
-library;
-
-import 'package:test/test.dart';
-
-void main() {
-  test('1 == 1', () {
-    expect(1, equals(1));
-  });
-
-  test('asserts are enabled', () {
-    expect(shouldFail, throwsA(isA<AssertionError>()));
-  });
-}
-
-void shouldFail() {
-  assert(1 == 2);
-}

From 481611b8dc488f42fd862315040faf50b192d9a0 Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Sat, 28 Sep 2024 00:40:11 +0000
Subject: [PATCH 5/7] mono_repo generate

---
 .github/workflows/dart.yml | 111 +++++++++++--------------------------
 tool/ci.sh                 |   4 --
 2 files changed, 31 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 0d05c7557..16ef8719c 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -40,16 +40,16 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
+    name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKG: integration_tests/regression; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression-integration_tests/wasm;commands:format-analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression;commands:format-analyze_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression-integration_tests/wasm
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression
             os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -73,19 +73,6 @@ jobs:
         run: dart analyze --fatal-infos
         if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'"
         working-directory: integration_tests/regression
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart analyze --fatal-infos"
-        run: dart analyze --fatal-infos
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
   job_003:
     name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: pkgs/checks, pkgs/test_core; `dart analyze`"
     runs-on: ubuntu-latest
@@ -365,41 +352,6 @@ jobs:
       - job_003
       - job_004
   job_009:
-    name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: integration_tests/wasm; `dart test --timeout=60s`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/wasm;commands:test_2"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/wasm
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
-        with:
-          sdk: "3.5.0-311.0.dev"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      - id: integration_tests_wasm_pub_upgrade
-        name: integration_tests/wasm; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-      - name: "integration_tests/wasm; dart test --timeout=60s"
-        run: "dart test --timeout=60s"
-        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
-        working-directory: integration_tests/wasm
-    needs:
-      - job_001
-      - job_002
-      - job_003
-      - job_004
-  job_010:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: ubuntu-latest
     steps:
@@ -434,7 +386,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_011:
+  job_010:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: ubuntu-latest
     steps:
@@ -469,7 +421,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_012:
+  job_011:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: ubuntu-latest
     steps:
@@ -504,7 +456,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_013:
+  job_012:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: ubuntu-latest
     steps:
@@ -539,7 +491,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_014:
+  job_013:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: ubuntu-latest
     steps:
@@ -574,7 +526,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_015:
+  job_014:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`"
     runs-on: ubuntu-latest
     steps:
@@ -609,7 +561,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_016:
+  job_015:
     name: "unit_test; linux; Dart dev; PKG: integration_tests/regression; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -644,7 +596,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_017:
+  job_016:
     name: "unit_test; linux; Dart dev; PKG: pkgs/checks; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -679,7 +631,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_018:
+  job_017:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test_core; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -714,7 +666,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_019:
+  job_018:
     name: "unit_test; linux; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: ubuntu-latest
     steps:
@@ -749,7 +701,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_020:
+  job_019:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: ubuntu-latest
     steps:
@@ -784,7 +736,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_021:
+  job_020:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: ubuntu-latest
     steps:
@@ -819,7 +771,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_022:
+  job_021:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: ubuntu-latest
     steps:
@@ -854,7 +806,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_023:
+  job_022:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: ubuntu-latest
     steps:
@@ -889,7 +841,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_024:
+  job_023:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: ubuntu-latest
     steps:
@@ -924,7 +876,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_025:
+  job_024:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`"
     runs-on: ubuntu-latest
     steps:
@@ -959,7 +911,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_026:
+  job_025:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: macos-latest
     steps:
@@ -994,7 +946,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_027:
+  job_026:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: macos-latest
     steps:
@@ -1029,7 +981,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_028:
+  job_027:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: macos-latest
     steps:
@@ -1064,7 +1016,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_029:
+  job_028:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: macos-latest
     steps:
@@ -1099,7 +1051,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_030:
+  job_029:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: macos-latest
     steps:
@@ -1134,7 +1086,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_031:
+  job_030:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1159,7 +1111,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_032:
+  job_031:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: windows-latest
     steps:
@@ -1184,7 +1136,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_033:
+  job_032:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: windows-latest
     steps:
@@ -1209,7 +1161,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_034:
+  job_033:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: windows-latest
     steps:
@@ -1234,7 +1186,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_035:
+  job_034:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: windows-latest
     steps:
@@ -1259,7 +1211,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_036:
+  job_035:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: windows-latest
     steps:
@@ -1284,7 +1236,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_037:
+  job_036:
     name: "unit_test; windows; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1309,7 +1261,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_038:
+  job_037:
     name: Notify failure
     runs-on: ubuntu-latest
     if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()"
@@ -1357,4 +1309,3 @@ jobs:
       - job_034
       - job_035
       - job_036
-      - job_037
diff --git a/tool/ci.sh b/tool/ci.sh
index 040c70df8..ed123f9c7 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -127,10 +127,6 @@ for PKG in ${PKGS}; do
         echo 'dart test -p chrome,vm,node'
         dart test -p chrome,vm,node || EXIT_CODE=$?
         ;;
-      test_2)
-        echo 'dart test --timeout=60s'
-        dart test --timeout=60s || EXIT_CODE=$?
-        ;;
       *)
         echo -e "\033[31mUnknown TASK '${TASK}' - TERMINATING JOB\033[0m"
         exit 64

From 187016ac0b6384be220d7afa9a0961107fd1ed8c Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Sat, 28 Sep 2024 00:43:50 +0000
Subject: [PATCH 6/7] add dart2js tests instead

Work around missing firefox tests by adding tests that will run.
---
 .github/workflows/dart.yml                    | 111 +++++++++++++-----
 integration_tests/wasm/dart_test.yaml         |   9 ++
 integration_tests/wasm/mono_pkg.yaml          |  20 ++++
 integration_tests/wasm/pubspec.yaml           |   7 ++
 .../wasm/test/hello_world_test.dart           |  24 ++++
 tool/ci.sh                                    |   4 +
 6 files changed, 144 insertions(+), 31 deletions(-)
 create mode 100644 integration_tests/wasm/dart_test.yaml
 create mode 100644 integration_tests/wasm/mono_pkg.yaml
 create mode 100644 integration_tests/wasm/pubspec.yaml
 create mode 100644 integration_tests/wasm/test/hello_world_test.dart

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 16ef8719c..0d05c7557 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -40,16 +40,16 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKG: integration_tests/regression; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
+    name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression;commands:format-analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression-integration_tests/wasm;commands:format-analyze_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/regression-integration_tests/wasm
             os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -73,6 +73,19 @@ jobs:
         run: dart analyze --fatal-infos
         if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'"
         working-directory: integration_tests/regression
+      - id: integration_tests_wasm_pub_upgrade
+        name: integration_tests/wasm; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: integration_tests/wasm
+      - name: "integration_tests/wasm; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
+        working-directory: integration_tests/wasm
+      - name: "integration_tests/wasm; dart analyze --fatal-infos"
+        run: dart analyze --fatal-infos
+        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
+        working-directory: integration_tests/wasm
   job_003:
     name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: pkgs/checks, pkgs/test_core; `dart analyze`"
     runs-on: ubuntu-latest
@@ -352,6 +365,41 @@ jobs:
       - job_003
       - job_004
   job_009:
+    name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: integration_tests/wasm; `dart test --timeout=60s`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/wasm;commands:test_2"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev;packages:integration_tests/wasm
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
+        with:
+          sdk: "3.5.0-311.0.dev"
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - id: integration_tests_wasm_pub_upgrade
+        name: integration_tests/wasm; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: integration_tests/wasm
+      - name: "integration_tests/wasm; dart test --timeout=60s"
+        run: "dart test --timeout=60s"
+        if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'"
+        working-directory: integration_tests/wasm
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_010:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: ubuntu-latest
     steps:
@@ -386,7 +434,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_010:
+  job_011:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: ubuntu-latest
     steps:
@@ -421,7 +469,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_011:
+  job_012:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: ubuntu-latest
     steps:
@@ -456,7 +504,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_012:
+  job_013:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: ubuntu-latest
     steps:
@@ -491,7 +539,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_013:
+  job_014:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: ubuntu-latest
     steps:
@@ -526,7 +574,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_014:
+  job_015:
     name: "unit_test; linux; Dart 3.5.0-311.0.dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`"
     runs-on: ubuntu-latest
     steps:
@@ -561,7 +609,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_015:
+  job_016:
     name: "unit_test; linux; Dart dev; PKG: integration_tests/regression; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -596,7 +644,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_016:
+  job_017:
     name: "unit_test; linux; Dart dev; PKG: pkgs/checks; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -631,7 +679,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_017:
+  job_018:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test_core; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -666,7 +714,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_018:
+  job_019:
     name: "unit_test; linux; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: ubuntu-latest
     steps:
@@ -701,7 +749,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_019:
+  job_020:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: ubuntu-latest
     steps:
@@ -736,7 +784,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_020:
+  job_021:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: ubuntu-latest
     steps:
@@ -771,7 +819,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_021:
+  job_022:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: ubuntu-latest
     steps:
@@ -806,7 +854,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_022:
+  job_023:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: ubuntu-latest
     steps:
@@ -841,7 +889,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_023:
+  job_024:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: ubuntu-latest
     steps:
@@ -876,7 +924,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_024:
+  job_025:
     name: "unit_test; linux; Dart dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`"
     runs-on: ubuntu-latest
     steps:
@@ -911,7 +959,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_025:
+  job_026:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: macos-latest
     steps:
@@ -946,7 +994,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_026:
+  job_027:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: macos-latest
     steps:
@@ -981,7 +1029,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_027:
+  job_028:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: macos-latest
     steps:
@@ -1016,7 +1064,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_028:
+  job_029:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: macos-latest
     steps:
@@ -1051,7 +1099,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_029:
+  job_030:
     name: "unit_test; osx; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: macos-latest
     steps:
@@ -1086,7 +1134,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_030:
+  job_031:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1111,7 +1159,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_031:
+  job_032:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`"
     runs-on: windows-latest
     steps:
@@ -1136,7 +1184,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_032:
+  job_033:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`"
     runs-on: windows-latest
     steps:
@@ -1161,7 +1209,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_033:
+  job_034:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`"
     runs-on: windows-latest
     steps:
@@ -1186,7 +1234,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_034:
+  job_035:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`"
     runs-on: windows-latest
     steps:
@@ -1211,7 +1259,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_035:
+  job_036:
     name: "unit_test; windows; Dart 3.5.0-311.0.dev; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`"
     runs-on: windows-latest
     steps:
@@ -1236,7 +1284,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_036:
+  job_037:
     name: "unit_test; windows; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`"
     runs-on: windows-latest
     steps:
@@ -1261,7 +1309,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-  job_037:
+  job_038:
     name: Notify failure
     runs-on: ubuntu-latest
     if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()"
@@ -1309,3 +1357,4 @@ jobs:
       - job_034
       - job_035
       - job_036
+      - job_037
diff --git a/integration_tests/wasm/dart_test.yaml b/integration_tests/wasm/dart_test.yaml
new file mode 100644
index 000000000..0ab5b0811
--- /dev/null
+++ b/integration_tests/wasm/dart_test.yaml
@@ -0,0 +1,9 @@
+platforms:
+# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+# - chrome
+- firefox
+# Node doesn't work because the version available in the current Ubuntu GitHub
+# runners is too old to support WASM+GC, which would be required to run Dart
+# tests.
+# - node
+compilers: [dart2wasm, dart2js]
diff --git a/integration_tests/wasm/mono_pkg.yaml b/integration_tests/wasm/mono_pkg.yaml
new file mode 100644
index 000000000..496a903d2
--- /dev/null
+++ b/integration_tests/wasm/mono_pkg.yaml
@@ -0,0 +1,20 @@
+# See https://pub.dev/packages/mono_repo
+
+sdk:
+- pubspec
+# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+# - dev
+
+os:
+- linux
+# TODO(https://github.com/dart-lang/test/issues/1790) - unskip
+# - windows
+
+stages:
+- analyze_and_format:
+  - group:
+    - format
+    - analyze: --fatal-infos
+- unit_test:
+  # The config here is a regression test for https://github.com/dart-lang/test/issues/2006
+  - test: --timeout=60s
diff --git a/integration_tests/wasm/pubspec.yaml b/integration_tests/wasm/pubspec.yaml
new file mode 100644
index 000000000..8dc9ef989
--- /dev/null
+++ b/integration_tests/wasm/pubspec.yaml
@@ -0,0 +1,7 @@
+name: wasm_tests
+publish_to: none
+environment:
+  sdk: ^3.5.0-311.0.dev
+resolution: workspace
+dev_dependencies:
+  test: any
diff --git a/integration_tests/wasm/test/hello_world_test.dart b/integration_tests/wasm/test/hello_world_test.dart
new file mode 100644
index 000000000..9ddd5116b
--- /dev/null
+++ b/integration_tests/wasm/test/hello_world_test.dart
@@ -0,0 +1,24 @@
+// Copyright (c) 2022, 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.
+
+@TestOn('wasm')
+// This retry is a regression test for https://github.com/dart-lang/test/issues/2006
+@Retry(2)
+library;
+
+import 'package:test/test.dart';
+
+void main() {
+  test('1 == 1', () {
+    expect(1, equals(1));
+  });
+
+  test('asserts are enabled', () {
+    expect(shouldFail, throwsA(isA<AssertionError>()));
+  });
+}
+
+void shouldFail() {
+  assert(1 == 2);
+}
diff --git a/tool/ci.sh b/tool/ci.sh
index ed123f9c7..040c70df8 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -127,6 +127,10 @@ for PKG in ${PKGS}; do
         echo 'dart test -p chrome,vm,node'
         dart test -p chrome,vm,node || EXIT_CODE=$?
         ;;
+      test_2)
+        echo 'dart test --timeout=60s'
+        dart test --timeout=60s || EXIT_CODE=$?
+        ;;
       *)
         echo -e "\033[31mUnknown TASK '${TASK}' - TERMINATING JOB\033[0m"
         exit 64

From ace63b42e2a251421cfad5aae0a325b944158fa6 Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Sat, 28 Sep 2024 01:00:47 +0000
Subject: [PATCH 7/7] Drop teston

---
 integration_tests/wasm/test/hello_world_test.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/integration_tests/wasm/test/hello_world_test.dart b/integration_tests/wasm/test/hello_world_test.dart
index 9ddd5116b..6c3c5e6ef 100644
--- a/integration_tests/wasm/test/hello_world_test.dart
+++ b/integration_tests/wasm/test/hello_world_test.dart
@@ -2,7 +2,6 @@
 // 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.
 
-@TestOn('wasm')
 // This retry is a regression test for https://github.com/dart-lang/test/issues/2006
 @Retry(2)
 library;