dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[pkg/vm_service] Standardize stop printing in checkRecordedStops.

Browse Source 
If debugPrintFile and debugPrintLine are provided, provide the stop
lines to the failure expect in the same format as the recorded stops are
printed when debugPrint is true.

Add additional debug output that lists which stops were matched and
which recorded stops were skipped, and add a reason to the failure
expect that includes the expected and recorded stop indices.

TEST=ci

Change-Id: If6974a23de72a1922d64937303816c96f646199c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/457380
Commit-Queue: Tess Strickland <sstrickl@google.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>
This commit is contained in:
Tess Strickland
2025-10-24 07:43:29 -07:00
committed by Commit Queue
parent 945f32dfc7
commit 26b3a60b49
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/vm_service/test/common/service_test_common.dart
+33 -18
View File
@@ -550,26 +550,30 @@ IsolateTest checkRecordedStops(
String? debugPrintFile,
int? debugPrintLine,
}) {
String formatLine(String line) {
String output = line;
if (debugPrintFile != null && debugPrintLine != null) {
final int firstColon = line.indexOf(':');
final int lastColon = line.lastIndexOf(':');
if (firstColon > 0 && lastColon > 0) {
final int lineNumber =
int.parse(line.substring(firstColon + 1, lastColon));
final int relativeLineNumber = lineNumber - debugPrintLine;
final columnNumber = line.substring(lastColon + 1);
final file = line.substring(0, firstColon);
if (file == debugPrintFile) {
output = '\$file:\${LINE+$relativeLineNumber}:$columnNumber';
}
}
}
return output;
}
return (VmService service, IsolateRef isolate) async {
if (debugPrint) {
for (int i = 0; i < recordStops.length; i++) {
final String line = recordStops[i];
String output = line;
final int firstColon = line.indexOf(':');
final int lastColon = line.lastIndexOf(':');
if (debugPrintFile != null &&
debugPrintLine != null &&
firstColon > 0 &&
lastColon > 0) {
final int lineNumber =
int.parse(line.substring(firstColon + 1, lastColon));
final int relativeLineNumber = lineNumber - debugPrintLine;
final columnNumber = line.substring(lastColon + 1);
final file = line.substring(0, firstColon);
if (file == debugPrintFile) {
output = '\$file:\${LINE+$relativeLineNumber}:$columnNumber';
}
}
final line = recordStops[i];
final output = formatLine(line);
final String comma = i == recordStops.length - 1 ? '' : ',';
print("'$output'$comma");
}
@@ -592,12 +596,23 @@ IsolateTest checkRecordedStops(
}
if (k < recordStops.length) {
// Allow and ignore extra recorded stops from i to k-1.
if (debugPrint) {
print('Skipping recorded stops [$i, $k)');
}
i = k;
} else {
// This will report an error.
expect(recordStops[i], expectedStops[j]);
expect(
formatLine(recordStops[i]),
formatLine(expectedStops[j]),
reason: 'Recorded stop $i does not match expected stop $j.',
);
}
}
if (debugPrint) {
print('Recorded stop $i matches expected stop $j: '
'${formatLine(recordStops[i])}');
}
i++;
j++;
}