Undo rename

dart-lang · Jul 26, 2024 · 95c67be · 95c67be
1 parent b631354
commit 95c67be
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 25 deletions.
diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart
@@ -20,7 +20,7 @@ void main() {
   test('build failure', () async {
     final tempUri = await tempDirForTest();
     final addCOriginalUri =
-        packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+        packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
     final addCUri = tempUri.resolve('add.c');
     final addCOriginalContents =
         await File.fromUri(addCOriginalUri).readAsString();

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart
@@ -105,7 +105,7 @@ Future<Uri> buildLib(
   int androidNdkApi,
   LinkMode linkMode,
 ) async {
-  final addCUri = packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+  final addCUri = packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
   const name = 'add';
 
   final buildConfig = BuildConfig.build(

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart
@@ -57,9 +57,9 @@ void main() {
               final tempUri = await tempDirForTest();
               final sourceUri = switch (language) {
                 Language.c =>
-                  packageUri.resolve('test/cbuilder/test_data/add/src/add.c'),
+                  packageUri.resolve('test/cbuilder/testfiles/add/src/add.c'),
                 Language.objectiveC => packageUri.resolve(
-                    'test/cbuilder/test_data/add_objective_c/src/add.m'),
+                    'test/cbuilder/testfiles/add_objective_c/src/add.m'),
                 Language() => throw UnimplementedError(),
               };
               final buildConfig = BuildConfig.build(
@@ -194,7 +194,7 @@ Future<Uri> buildLib(
   int targetIOSVersion,
   LinkMode linkMode,
 ) async {
-  final addCUri = packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+  final addCUri = packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
   const name = 'add';
 
   final buildConfig = BuildConfig.build(

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart
@@ -32,7 +32,7 @@ void main() {
       test('CBuilder $linkMode library $target', () async {
         final tempUri = await tempDirForTest();
         final addCUri =
-            packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+            packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
         const name = 'add';
 
         final buildConfig = BuildConfig.build(

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart
@@ -41,9 +41,9 @@ void main() {
           final tempUri = await tempDirForTest();
           final sourceUri = switch (language) {
             Language.c =>
-              packageUri.resolve('test/cbuilder/test_data/add/src/add.c'),
+              packageUri.resolve('test/cbuilder/testfiles/add/src/add.c'),
             Language.objectiveC => packageUri
-                .resolve('test/cbuilder/test_data/add_objective_c/src/add.m'),
+                .resolve('test/cbuilder/testfiles/add_objective_c/src/add.m'),
             Language() => throw UnimplementedError(),
           };
           const name = 'add';
@@ -124,7 +124,7 @@ Future<Uri> buildLib(
   int targetMacOSVersion,
   LinkMode linkMode,
 ) async {
-  final addCUri = packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+  final addCUri = packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
   const name = 'add';
 
   final buildConfig = BuildConfig.build(

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart
@@ -51,7 +51,7 @@ void main() {
       test('CBuilder $linkMode library $target', () async {
         final tempUri = await tempDirForTest();
         final addCUri =
-            packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+            packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
         const name = 'add';
 
         final buildConfig = BuildConfig.build(

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart
@@ -34,7 +34,7 @@ void main() {
       test('CBuilder executable$suffix', () async {
         final tempUri = await tempDirForTest();
         final helloWorldCUri = packageUri
-            .resolve('test/cbuilder/test_data/hello_world/src/hello_world.c');
+            .resolve('test/cbuilder/testfiles/hello_world/src/hello_world.c');
         if (!await File.fromUri(helloWorldCUri).exists()) {
           throw Exception('Run the test from the root directory.');
         }
@@ -109,7 +109,7 @@ void main() {
       test('CBuilder dylib$suffix', () async {
         final tempUri = await tempDirForTest();
         final addCUri =
-            packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+            packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
         const name = 'add';
 
         final logMessages = <String>[];
@@ -208,7 +208,7 @@ void main() {
   test('CBuilder flags', () async {
     final tempUri = await tempDirForTest();
     final definesCUri =
-        packageUri.resolve('test/cbuilder/test_data/defines/src/defines.c');
+        packageUri.resolve('test/cbuilder/testfiles/defines/src/defines.c');
     if (!await File.fromUri(definesCUri).exists()) {
       throw Exception('Run the test from the root directory.');
     }
@@ -269,11 +269,11 @@ void main() {
   test('CBuilder includes', () async {
     final tempUri = await tempDirForTest();
     final includeDirectoryUri =
-        packageUri.resolve('test/cbuilder/test_data/includes/include');
+        packageUri.resolve('test/cbuilder/testfiles/includes/include');
     final includesHUri = packageUri
-        .resolve('test/cbuilder/test_data/includes/include/includes.h');
+        .resolve('test/cbuilder/testfiles/includes/include/includes.h');
     final includesCUri =
-        packageUri.resolve('test/cbuilder/test_data/includes/src/includes.c');
+        packageUri.resolve('test/cbuilder/testfiles/includes/src/includes.c');
     const name = 'includes';
 
     final buildConfig = BuildConfig.build(
@@ -315,7 +315,7 @@ void main() {
 
   test('CBuilder std', () async {
     final tempUri = await tempDirForTest();
-    final addCUri = packageUri.resolve('test/cbuilder/test_data/add/src/add.c');
+    final addCUri = packageUri.resolve('test/cbuilder/testfiles/add/src/add.c');
     const name = 'add';
     const std = 'c99';
 
@@ -372,7 +372,7 @@ void main() {
   test('CBuilder compile c++', () async {
     final tempUri = await tempDirForTest();
     final helloWorldCppUri = packageUri.resolve(
-        'test/cbuilder/test_data/hello_world_cpp/src/hello_world_cpp.cc');
+        'test/cbuilder/testfiles/hello_world_cpp/src/hello_world_cpp.cc');
     if (!await File.fromUri(helloWorldCppUri).exists()) {
       throw Exception('Run the test from the root directory.');
     }
@@ -437,7 +437,7 @@ void main() {
   test('CBuilder cppLinkStdLib', () async {
     final tempUri = await tempDirForTest();
     final helloWorldCppUri = packageUri.resolve(
-        'test/cbuilder/test_data/hello_world_cpp/src/hello_world_cpp.cc');
+        'test/cbuilder/testfiles/hello_world_cpp/src/hello_world_cpp.cc');
     if (!await File.fromUri(helloWorldCppUri).exists()) {
       throw Exception('Run the test from the root directory.');
     }
@@ -512,7 +512,7 @@ Future<void> testDefines({
 }) async {
   final tempUri = await tempDirForTest();
   final definesCUri =
-      packageUri.resolve('test/cbuilder/test_data/defines/src/defines.c');
+      packageUri.resolve('test/cbuilder/testfiles/defines/src/defines.c');
   if (!await File.fromUri(definesCUri).exists()) {
     throw Exception('Run the test from the root directory.');
   }

diff --git a/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart b/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart
@@ -26,7 +26,7 @@ void main() {
   test('CBuilder compile objective c', () async {
     final tempUri = await tempDirForTest();
     final addMUri =
-        packageUri.resolve('test/cbuilder/test_data/add_objective_c/src/add.m');
+        packageUri.resolve('test/cbuilder/testfiles/add_objective_c/src/add.m');
     if (!await File.fromUri(addMUri).exists()) {
       throw Exception('Run the test from the root directory.');
     }

diff --git a/...n_c/test/cbuilder/test_data/add/src/add.c → ...n_c/test/cbuilder/testfiles/add/src/add.c b/...n_c/test/cbuilder/test_data/add/src/add.c → ...n_c/test/cbuilder/testfiles/add/src/add.c
diff --git a/...ilder/test_data/add_objective_c/src/add.m → ...ilder/testfiles/add_objective_c/src/add.m b/...ilder/test_data/add_objective_c/src/add.m → ...ilder/testfiles/add_objective_c/src/add.m
diff --git a/.../cbuilder/test_data/defines/src/defines.c → .../cbuilder/testfiles/defines/src/defines.c b/.../cbuilder/test_data/defines/src/defines.c → .../cbuilder/testfiles/defines/src/defines.c
diff --git a/...r/test_data/hello_world/src/hello_world.c → ...r/testfiles/hello_world/src/hello_world.c b/...r/test_data/hello_world/src/hello_world.c → ...r/testfiles/hello_world/src/hello_world.c
diff --git a/...ta/hello_world_cpp/src/hello_world_cpp.cc → ...es/hello_world_cpp/src/hello_world_cpp.cc b/...ta/hello_world_cpp/src/hello_world_cpp.cc → ...es/hello_world_cpp/src/hello_world_cpp.cc
diff --git a/...der/test_data/includes/include/includes.h → ...der/testfiles/includes/include/includes.h b/...der/test_data/includes/include/includes.h → ...der/testfiles/includes/include/includes.h
diff --git a/...builder/test_data/includes/src/includes.c → ...builder/testfiles/includes/src/includes.c b/...builder/test_data/includes/src/includes.c → ...builder/testfiles/includes/src/includes.c
diff --git a/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart b/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart
@@ -10,8 +10,8 @@ import 'package:native_toolchain_c/native_toolchain_c.dart';
 import '../helpers.dart';
 
 Future<Uri> buildTestArchive(Uri tempUri) async {
-  final test1Uri = packageUri.resolve('test/clinker/test_data/linker/test1.c');
-  final test2Uri = packageUri.resolve('test/clinker/test_data/linker/test2.c');
+  final test1Uri = packageUri.resolve('test/clinker/testfiles/linker/test1.c');
+  final test2Uri = packageUri.resolve('test/clinker/testfiles/linker/test2.c');
   if (!await File.fromUri(test1Uri).exists() ||
       !await File.fromUri(test2Uri).exists()) {
     throw Exception('Run the test from the root directory.');

diff --git a/...test/clinker/test_data/linker/symbols.lds → ...test/clinker/testfiles/linker/symbols.lds b/...test/clinker/test_data/linker/symbols.lds → ...test/clinker/testfiles/linker/symbols.lds
diff --git a/...n_c/test/clinker/test_data/linker/test1.c → ...n_c/test/clinker/testfiles/linker/test1.c b/...n_c/test/clinker/test_data/linker/test1.c → ...n_c/test/clinker/testfiles/linker/test1.c
diff --git a/...n_c/test/clinker/test_data/linker/test2.c → ...n_c/test/clinker/testfiles/linker/test2.c b/...n_c/test/clinker/test_data/linker/test2.c → ...n_c/test/clinker/testfiles/linker/test2.c
diff --git a/pkgs/native_toolchain_c/test/clinker/treeshake_test.dart b/pkgs/native_toolchain_c/test/clinker/treeshake_test.dart
@@ -28,7 +28,7 @@ Future<void> main() async {
         linkerOptions: LinkerOptions.manual(
           flags: ['--strip-debug', '-u', 'my_other_func'],
           gcSections: true,
-          linkerScript: Uri.file('test/clinker/test_data/linker/symbols.lds'),
+          linkerScript: Uri.file('test/clinker/testfiles/linker/symbols.lds'),
         ),
       );
   CLinker linkerAuto(List<String> sources) => CLinker.library(
@@ -45,10 +45,17 @@ Future<void> main() async {
       );
 
   const os = OS.linux;
+  const architectures = [
+    Architecture.arm,
+    Architecture.arm64,
+    Architecture.ia32,
+    Architecture.x64,
+    Architecture.riscv64,
+  ];
 
   late Map<String, int> sizes;
   sizes = <String, int>{};
-  for (final architecture in Architecture.values) {
+  for (final architecture in architectures) {
     for (final clinker in [
       (name: 'manual', linker: linkerManual),
       (name: 'auto', linker: linkerAuto),