Google Git
Sign in
dart/co19/refs/heads/master^!/.
commit
949eef23885c3eb8ca5ca5ef09bae9cb6ba0d4a9
[log]
author
Nate Biggs <biggs0125@gmail.com>
Mon Jun 15 14:31:47 2026 -0400
committer
GitHub <noreply@github.com>
Mon Jun 15 14:31:47 2026 -0400
tree
abb12b8e954e0501b982b470c9ccdc54d8e85301
parent
8dbe985c3765e1946cafa7fc76a7c640e1054bbe [diff]
Update VM tests to match fixed AOT-compatible framework setup. (#3858)

Co-authored-by: Nate Biggs <natebiggs@google.com>
diff --git a/VM/digit_separators_t01.dart b/VM/digit_separators_t01.dart
index fab60b9..6468357 100644
--- a/VM/digit_separators_t01.dart
+++ b/VM/digit_separators_t01.dart

@@ -13,6 +13,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'digit_separators_t01_lib.dart' as testee_lib;
 
 void main([args = const <String>[]]) =>
     IsolateTestHarness('digit_separators_t01_lib.dart', args)
@@ -42,4 +43,4 @@
           ) as InstanceRef;
           Expect.equals(0x40000123.toRadixString(10), response.valueAsString);
         })
-        .run(pauseOnExit: true);
+        .run(pauseOnExit: true, testeeMain: testee_lib.main);

diff --git a/VM/digit_separators_t01_lib.dart b/VM/digit_separators_t01_lib.dart
index f40568b..ad6dcd9 100644
--- a/VM/digit_separators_t01_lib.dart
+++ b/VM/digit_separators_t01_lib.dart

@@ -11,6 +11,5 @@
   debugger();
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/primary_constructors_t01.dart b/VM/primary_constructors_t01.dart
index 402fd79..8b25cc3 100644
--- a/VM/primary_constructors_t01.dart
+++ b/VM/primary_constructors_t01.dart

@@ -17,6 +17,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'primary_constructors_t01_lib.dart' as testee_lib;
 
 void main([
   args = const <String>[],
@@ -55,8 +56,12 @@
     ) async {
       final isolateId = isolateRef.id!;
       final isolate = await service.getIsolate(isolateId);
-      final lib =
-          (await service.getObject(isolateId, isolate.rootLib!.id!)) as Library;
+      final lib = (await service.getObject(
+        isolateId,
+        isolate.libraries!.firstWhere(
+          (l) => l.uri!.contains('primary_constructors_t01_lib'),
+        ).id!,
+      )) as Library;
       final scriptId = lib.scripts!.first.id!;
 
       var breakpoint = await service.addBreakpoint(
@@ -100,4 +105,5 @@
     .run(
       pauseOnExit: true,
       extraArgs: ['--enable-experiment=primary-constructors'],
+      testeeMain: testee_lib.main,
     );

diff --git a/VM/primary_constructors_t01_lib.dart b/VM/primary_constructors_t01_lib.dart
index 5e6eea7..6fb464f 100644
--- a/VM/primary_constructors_t01_lib.dart
+++ b/VM/primary_constructors_t01_lib.dart

@@ -29,6 +29,5 @@
   var c3 = C3(5, 6); // LINE_G
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/primary_constructors_t02.dart b/VM/primary_constructors_t02.dart
index 6cd2ab3..fb9d571 100644
--- a/VM/primary_constructors_t02.dart
+++ b/VM/primary_constructors_t02.dart

@@ -19,6 +19,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'primary_constructors_t02_lib.dart' as testee_lib;
 
 void main([args = const <String>[]]) =>
     IsolateTestHarness('primary_constructors_t02_lib.dart', args)
@@ -48,4 +49,5 @@
         .run(
           pauseOnExit: true,
           extraArgs: ['--enable-experiment=primary-constructors'],
+          testeeMain: testee_lib.main,
         );

diff --git a/VM/primary_constructors_t02_lib.dart b/VM/primary_constructors_t02_lib.dart
index 002b08f..2d02b4c 100644
--- a/VM/primary_constructors_t02_lib.dart
+++ b/VM/primary_constructors_t02_lib.dart

@@ -16,6 +16,5 @@
   C1('xxx'); // LINE_C
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/primary_constructors_t03.dart b/VM/primary_constructors_t03.dart
index 3edebb1..f648ddf 100644
--- a/VM/primary_constructors_t03.dart
+++ b/VM/primary_constructors_t03.dart

@@ -19,6 +19,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'primary_constructors_t03_lib.dart' as testee_lib;
 
 void main([
   args = const <String>[],
@@ -124,4 +125,5 @@
     .run(
       pauseOnExit: true,
       extraArgs: ['--enable-experiment=primary-constructors'],
+      testeeMain: testee_lib.main,
     );

diff --git a/VM/primary_constructors_t03_lib.dart b/VM/primary_constructors_t03_lib.dart
index 5455305..a669be2 100644
--- a/VM/primary_constructors_t03_lib.dart
+++ b/VM/primary_constructors_t03_lib.dart

@@ -38,6 +38,5 @@
   C3('xxx'); // LINE_M
 } // LINE_N
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/primary_constructors_t04.dart b/VM/primary_constructors_t04.dart
index 56b34f3..7f38bf1 100644
--- a/VM/primary_constructors_t04.dart
+++ b/VM/primary_constructors_t04.dart

@@ -18,6 +18,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'primary_constructors_t04_lib.dart' as testee_lib;
 
 void main([
   args = const <String>[],
@@ -82,4 +83,5 @@
     .run(
       pauseOnExit: true,
       extraArgs: ['--enable-experiment=primary-constructors'],
+      testeeMain: testee_lib.main,
     );

diff --git a/VM/primary_constructors_t04_lib.dart b/VM/primary_constructors_t04_lib.dart
index 03e9828..2554de7 100644
--- a/VM/primary_constructors_t04_lib.dart
+++ b/VM/primary_constructors_t04_lib.dart

@@ -29,6 +29,5 @@
   var c3 = C3(5, 6);
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/primary_constructors_t05.dart b/VM/primary_constructors_t05.dart
index 6d7718f..2e36859 100644
--- a/VM/primary_constructors_t05.dart
+++ b/VM/primary_constructors_t05.dart

@@ -19,6 +19,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'primary_constructors_t05_lib.dart' as testee_lib;
 
 void main([
   args = const <String>[],
@@ -112,4 +113,5 @@
     .run(
       pauseOnExit: true,
       extraArgs: ['--enable-experiment=primary-constructors'],
+      testeeMain: testee_lib.main,
     );

diff --git a/VM/primary_constructors_t05_lib.dart b/VM/primary_constructors_t05_lib.dart
index aacb81b..cc3d11c 100644
--- a/VM/primary_constructors_t05_lib.dart
+++ b/VM/primary_constructors_t05_lib.dart

@@ -34,6 +34,5 @@
   ET3(3); // LINE_M
 } // LINE_N
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/primary_constructors_t06.dart b/VM/primary_constructors_t06.dart
index 15619ea..467915f 100644
--- a/VM/primary_constructors_t06.dart
+++ b/VM/primary_constructors_t06.dart

@@ -19,6 +19,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'primary_constructors_t06_lib.dart' as testee_lib;
 
 void main([
   args = const <String>[],
@@ -64,4 +65,5 @@
     .run(
       pauseOnExit: true,
       extraArgs: ['--enable-experiment=primary-constructors'],
+      testeeMain: testee_lib.main,
     );

diff --git a/VM/primary_constructors_t06_lib.dart b/VM/primary_constructors_t06_lib.dart
index 5ac95e9..a28fc6f 100644
--- a/VM/primary_constructors_t06_lib.dart
+++ b/VM/primary_constructors_t06_lib.dart

@@ -23,6 +23,5 @@
   ET2(2);
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/primary_constructors_t07.dart b/VM/primary_constructors_t07.dart
index 39ecbb6..8f9a35f 100644
--- a/VM/primary_constructors_t07.dart
+++ b/VM/primary_constructors_t07.dart

@@ -18,6 +18,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'primary_constructors_t07_lib.dart' as testee_lib;
 
 void main([args = const <String>[]]) =>
     IsolateTestHarness('primary_constructors_t07_lib.dart', args)
@@ -46,4 +47,5 @@
         .run(
           pauseOnExit: true,
           extraArgs: ['--enable-experiment=primary-constructors'],
+          testeeMain: testee_lib.main,
         );

diff --git a/VM/primary_constructors_t07_lib.dart b/VM/primary_constructors_t07_lib.dart
index 1834930..69ed852 100644
--- a/VM/primary_constructors_t07_lib.dart
+++ b/VM/primary_constructors_t07_lib.dart

@@ -18,6 +18,5 @@
   C1('c1'); // LINE_C
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/private_named_parameters_t01.dart b/VM/private_named_parameters_t01.dart
index 7eef5d8..63f4ced 100644
--- a/VM/private_named_parameters_t01.dart
+++ b/VM/private_named_parameters_t01.dart

@@ -17,6 +17,7 @@
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../../../../pkg/vm_service/test/common/test_helper.dart';
 import '../Utils/expect.dart';
+import 'private_named_parameters_t01_lib.dart' as testee_lib;
 
 void main([
   args = const <String>[],
@@ -152,4 +153,5 @@
         '--enable-experiment=primary-constructors',
         '--enable-experiment=private-named-parameters',
       ],
+      testeeMain: testee_lib.main,
     );

diff --git a/VM/private_named_parameters_t01_lib.dart b/VM/private_named_parameters_t01_lib.dart
index ca422b2..448a0ff 100644
--- a/VM/private_named_parameters_t01_lib.dart
+++ b/VM/private_named_parameters_t01_lib.dart

@@ -26,6 +26,5 @@
   C3(x: 1); // LINE_G
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/private_named_parameters_t02.dart b/VM/private_named_parameters_t02.dart
index 178b901..ee1ca43 100644
--- a/VM/private_named_parameters_t02.dart
+++ b/VM/private_named_parameters_t02.dart

@@ -18,6 +18,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'private_named_parameters_t02_lib.dart' as testee_lib;
 
 void main([
   args = const <String>[],
@@ -55,4 +56,5 @@
         '--enable-experiment=primary-constructors',
         '--enable-experiment=private-named-parameters',
       ],
+      testeeMain: testee_lib.main,
     );

diff --git a/VM/private_named_parameters_t02_lib.dart b/VM/private_named_parameters_t02_lib.dart
index e9ad7b4..3f7bc51 100644
--- a/VM/private_named_parameters_t02_lib.dart
+++ b/VM/private_named_parameters_t02_lib.dart

@@ -20,6 +20,5 @@
   debugger();
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/static_extensions_t01.dart b/VM/static_extensions_t01.dart
index 304bd84..1210f9a 100644
--- a/VM/static_extensions_t01.dart
+++ b/VM/static_extensions_t01.dart

@@ -21,6 +21,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'static_extensions_t01_lib.dart' as testee_lib;
 
 void main([args = const <String>[]]) =>
     IsolateTestHarness('static_extensions_t01_lib.dart', args)
@@ -39,4 +40,5 @@
         .run(
           pauseOnExit: true,
           extraArgs: ['--enable-experiment=static-extensions'],
+          testeeMain: testee_lib.main,
         );

diff --git a/VM/static_extensions_t01_lib.dart b/VM/static_extensions_t01_lib.dart
index 9feac25..a5ce39b 100644
--- a/VM/static_extensions_t01_lib.dart
+++ b/VM/static_extensions_t01_lib.dart

@@ -17,6 +17,5 @@
   debugger();
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);

diff --git a/VM/static_extensions_t02.dart b/VM/static_extensions_t02.dart
index 0d54046..7edc99b 100644
--- a/VM/static_extensions_t02.dart
+++ b/VM/static_extensions_t02.dart

@@ -21,6 +21,7 @@
 
 import '../../../../pkg/vm_service/test/common/service_test_common.dart';
 import '../Utils/expect.dart';
+import 'static_extensions_t02_lib.dart' as testee_lib;
 
 void main([args = const <String>[]]) =>
     IsolateTestHarness('static_extensions_t02_lib.dart', args)
@@ -33,4 +34,5 @@
         .run(
           pauseOnExit: true,
           extraArgs: ['--enable-experiment=static-extensions'],
+          testeeMain: testee_lib.main,
         );

diff --git a/VM/static_extensions_t02_lib.dart b/VM/static_extensions_t02_lib.dart
index 495031b..8dc16a4 100644
--- a/VM/static_extensions_t02_lib.dart
+++ b/VM/static_extensions_t02_lib.dart

@@ -18,6 +18,5 @@
   C.foo(); // LINE_C
 }
 
-void main() {
-  startServiceTest(testeeConcurrent: testeeMain);
-}
+Future<void> main([args = const <String>[]]) =>
+    startServiceTest(testeeConcurrent: testeeMain);