[vm/ffi] Reformat generated tests

`clang-format` has decided to format things slightly differently.
To prevent a huge diff on CLs touching
runtime/bin/ffi_test/ffi_test_functions_generated.cc, run a reformat
eagerly.

The generation script now explicitly uses the the clang-format from
the buildtools/ dir. (It was likely using the one on PATH.)

Also, clean up Dart imports to use single quotes, and generate an
ignore to prevent warnings.

TEST=tests/ffi

Change-Id: I54e24d62fe742770fb041bba73110c5285250fb4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/362763
Reviewed-by: Hossein Yousefi <yousefi@google.com>
Commit-Queue: Hossein Yousefi <yousefi@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Auto-Submit: Daco Harkes <dacoharkes@google.com>
This commit is contained in:
Daco Harkes 2024-04-15 10:55:46 +00:00 committed by Commit Queue
parent 102f6c7f33
commit 51a67b8176
24 changed files with 2941 additions and 3476 deletions

File diff suppressed because it is too large Load diff

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'callback_tests_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'callback_tests_utils.dart';

View file

@ -13,7 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'callback_tests_utils.dart';

View file

@ -13,7 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'callback_tests_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -13,8 +13,9 @@
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';

View file

@ -2,6 +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.
import 'dart:ffi';
import 'dart:io';
import 'c_types.dart';
@ -1049,8 +1050,9 @@ ${headerCommon(copyrightYear: copyrightYear, generatorPath: generatorPath)}
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'dylib_utils.dart';
@ -1139,8 +1141,9 @@ ${headerCommon(copyrightYear: copyrightYear, generatorPath: generatorPath)}
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'callback_tests_utils.dart';
@ -1217,8 +1220,9 @@ ${headerCommon(copyrightYear: 2023, generatorPath: generatorPath)}
import 'dart:async';
import 'dart:ffi';
import "package:expect/expect.dart";
import "package:ffi/ffi.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'async_callback_tests_utils.dart';
@ -1284,13 +1288,28 @@ Future<void> writeC() async {
buffer.write(footerC);
await File(ccPath).writeAsString(buffer.toString());
await runProcess("clang-format", ["-i", ccPath]);
await runProcess(clangFormatPath, ["-i", ccPath]);
}
final ccPath = Platform.script
.resolve("../../../runtime/bin/ffi_test/ffi_test_functions_generated.cc")
final sdkRoot = Platform.script.resolve("../../../");
final ccPath = sdkRoot
.resolve("runtime/bin/ffi_test/ffi_test_functions_generated.cc")
.toFilePath();
final clangFormatPath = sdkRoot
.resolve(
'buildtools/${buildToolsSubdir[Abi.current()]!}/clang/bin/clang-format')
.toFilePath();
const buildToolsSubdir = {
Abi.linuxArm64: 'linux-arm64',
Abi.linuxX64: 'linux-x64',
Abi.macosArm64: 'mac-arm64',
Abi.macosX64: 'mac-x64',
Abi.windowsX64: 'win-x64',
};
void printUsage() {
print("""
Generates structs by value tests.

View file

@ -14,7 +14,9 @@
import 'dart:async';
import 'dart:ffi';
import "package:expect/expect.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'async_callback_tests_utils.dart';

View file

@ -14,7 +14,9 @@
import 'dart:async';
import 'dart:ffi';
import "package:expect/expect.dart";
import 'package:expect/expect.dart';
// ignore: unused_import
import 'package:ffi/ffi.dart';
import 'async_callback_tests_utils.dart';