From d1bffecec545da69ab90b523c3c98a5940a5db07 Mon Sep 17 00:00:00 2001
From: Daco Harkes <dacoharkes@google.com>
Date: Thu, 27 Feb 2025 11:10:44 -0800
Subject: [PATCH] [vm/ffi] Cleanup some legacy multi-tests

Bug: https://github.com/dart-lang/sdk/issues/60212
Change-Id: Icb6272b38b48b5445beaab8be528c4c5698b74fb
Cq-Include-Trybots: dart/try:vm-aot-linux-debug-x64-try,vm-aot-mac-release-arm64-try,vm-reload-linux-debug-x64-try,vm-win-debug-x64-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412240
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Reviewed-by: Michael Goderbauer <goderbauer@google.com>
---
 tests/ffi/unaligned_test.dart                        | 10 +++++-----
 .../ffi/vmspecific_function_callbacks_exit_test.dart |  6 +++---
 tests/ffi/vmspecific_highmem_32bit_test.dart         | 12 ++++++------
 tests/ffi/vmspecific_leaf_call_test.dart             |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/ffi/unaligned_test.dart b/tests/ffi/unaligned_test.dart
index 9c95eba4d25..537a0fef835 100644
--- a/tests/ffi/unaligned_test.dart
+++ b/tests/ffi/unaligned_test.dart
@@ -40,12 +40,12 @@ final bool isUnalignedFloatingPointAccessSupported = switch (Abi.current()) {
 
 void main() {
   print("hello");
-  testUnalignedInt16(); //# 01: ok
-  testUnalignedInt32(); //# 02: ok
-  testUnalignedInt64(); //# 03: ok
+  testUnalignedInt16();
+  testUnalignedInt32();
+  testUnalignedInt64();
   if (isUnalignedFloatingPointAccessSupported) {
-    testUnalignedFloat(); //# 04: ok
-    testUnalignedDouble(); //# 05: ok
+    testUnalignedFloat();
+    testUnalignedDouble();
   }
   _freeAll();
 }
diff --git a/tests/ffi/vmspecific_function_callbacks_exit_test.dart b/tests/ffi/vmspecific_function_callbacks_exit_test.dart
index 93974ea3395..d1e66b30db7 100644
--- a/tests/ffi/vmspecific_function_callbacks_exit_test.dart
+++ b/tests/ffi/vmspecific_function_callbacks_exit_test.dart
@@ -60,8 +60,8 @@ void main() async {
   //
   // Since they use signal handlers they only run on Linux.
   if (Platform.isLinux && !const bool.fromEnvironment("dart.vm.product")) {
-    testCallbackWrongThread(); //# 01: ok
-    testCallbackOutsideIsolate(); //# 02: ok
-    await testCallbackWrongIsolate(); //# 03: ok
+    testCallbackWrongThread();
+    testCallbackOutsideIsolate();
+    await testCallbackWrongIsolate();
   }
 }
diff --git a/tests/ffi/vmspecific_highmem_32bit_test.dart b/tests/ffi/vmspecific_highmem_32bit_test.dart
index b722ce5b921..7b47d0863ac 100644
--- a/tests/ffi/vmspecific_highmem_32bit_test.dart
+++ b/tests/ffi/vmspecific_highmem_32bit_test.dart
@@ -81,12 +81,12 @@ void testOnHighOrLowMemory(Pointer<Uint8> memory, int indexOffset) {
   testLoadsAndStores(indexOffset, memory.offsetBy(kIgnoreBytesPositive - 5));
   testLoadsAndStores(indexOffset, memory.offsetBy(kIgnoreBytesNegative - 5));
   final m2 = Pointer<Uint8>.fromAddress(kIgnoreBytesPositive + memory.address);
-  Expect.equals(memory, m2); //# 01: ok
-  Expect.equals(memory.address, m2.address); //# 01: ok
+  Expect.equals(memory, m2);
+  Expect.equals(memory.address, m2.address);
   testLoadsAndStores(indexOffset, m2);
   final m3 = Pointer<Uint8>.fromAddress(kIgnoreBytesNegative + memory.address);
-  Expect.equals(memory, m3); //# 01: ok
-  Expect.equals(memory.address, m3.address); //# 01: ok
+  Expect.equals(memory, m3);
+  Expect.equals(memory.address, m3.address);
   testLoadsAndStores(indexOffset, m3);
 }
 
@@ -99,8 +99,8 @@ withMMapedAddress(
   if (result.address == kMapFailed) {
     throw 'Could not mmap @0x${fixedAddress.address.toRadixString(16)}!';
   }
-  Expect.equals(fixedAddress, result); //# 01: ok
-  Expect.equals(fixedAddress.address, result.address); //# 01: ok
+  Expect.equals(fixedAddress, result);
+  Expect.equals(fixedAddress.address, result.address);
   try {
     fun(result);
   } finally {
diff --git a/tests/ffi/vmspecific_leaf_call_test.dart b/tests/ffi/vmspecific_leaf_call_test.dart
index 34d6fca4634..ea8a392c47b 100644
--- a/tests/ffi/vmspecific_leaf_call_test.dart
+++ b/tests/ffi/vmspecific_leaf_call_test.dart
@@ -53,13 +53,13 @@ testCallbackLeaf() {
 }
 
 main() {
-  testLeafCall(); //# 01: ok
+  testLeafCall();
   // These tests terminate the process after successful completion, so we have
   // to run them separately.
   //
   // Since they use signal handlers they only run on Linux.
   if (Platform.isLinux && !const bool.fromEnvironment("dart.vm.product")) {
-    testLeafCallApi(); //# 02: ok
-    testCallbackLeaf(); //# 03: ok
+    testLeafCallApi();
+    testCallbackLeaf();
   }
 }