From 769752be6f8228a5e4ec3d6afdde35ea11d9d2da Mon Sep 17 00:00:00 2001
From: Daco Harkes <dacoharkes@google.com>
Date: Fri, 6 Mar 2026 12:23:07 -0800
Subject: [PATCH] [dartdev] Fix resident compiler tests

Explicitly set `--resident-compiler-info-file`.

Closes: https://github.com/dart-lang/sdk/issues/62598
Closes: https://github.com/dart-lang/sdk/issues/62599

Change-Id: Iefd6ab479c2f5a4291156f453e2f3f4f5fc66fc3
Cq-Include-Trybots: luci.dart.try:pkg-linux-debug-try,pkg-linux-release-arm64-try,pkg-linux-release-try,pkg-mac-release-arm64-try,pkg-mac-release-try,pkg-win-release-arm64-try,pkg-win-release-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/486181
Commit-Queue: Ben Konyi <bkonyi@google.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>
Auto-Submit: Daco Harkes <dacoharkes@google.com>
---
 pkg/dartdev/test/commands/run_test.dart      |  7 ++++++-
 pkg/dartdev/test/native_assets/run_test.dart | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkg/dartdev/test/commands/run_test.dart b/pkg/dartdev/test/commands/run_test.dart
index 01b21942cf5..099a28b60bb 100644
--- a/pkg/dartdev/test/commands/run_test.dart
+++ b/pkg/dartdev/test/commands/run_test.dart
@@ -961,7 +961,12 @@ Future<void> main() async {
     expect(pubGetResult.stderr, isEmpty);
     expect(pubGetResult.exitCode, 0);
 
-    ProcessResult result = await p.run(['run', '--resident', 'bin/main.dart']);
+    ProcessResult result = await p.run([
+      'run',
+      '--resident',
+      '--$residentCompilerInfoFileOption=$serverInfoFile',
+      'bin/main.dart',
+    ]);
 
     expect(result.stdout, contains('file://'));
     expect(result.exitCode, 0);
diff --git a/pkg/dartdev/test/native_assets/run_test.dart b/pkg/dartdev/test/native_assets/run_test.dart
index 63a06ff5904..3c399c62fc2 100644
--- a/pkg/dartdev/test/native_assets/run_test.dart
+++ b/pkg/dartdev/test/native_assets/run_test.dart
@@ -43,8 +43,18 @@ void main([List<String> args = const []]) async {
     testModifier += verbose ? ' verbose' : '';
     test('dart run$testModifier', timeout: longTimeout, () async {
       await nativeAssetsTest('dart_app', (dartAppUri) async {
+        final serverInfoFile = File.fromUri(
+          dartAppUri.resolve('.resident-info'),
+        ).path;
         final result = await runDart(
-          arguments: ['run', if (residentCompiler) '-r', if (verbose) '-v'],
+          arguments: [
+            'run',
+            if (residentCompiler) ...[
+              '--resident',
+              '--resident-compiler-info-file=$serverInfoFile',
+            ],
+            if (verbose) '-v',
+          ],
           workingDirectory: dartAppUri,
           logger: logger,
         );