[cfe] Move macro tests to common subfolder
Change-Id: I3c327744e6e76d99efa7fc44644542ea92e5a0d8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/235225
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/front_end/analysis_options_no_lints.yaml b/pkg/front_end/analysis_options_no_lints.yaml
index c1cae63..810d473 100644
--- a/pkg/front_end/analysis_options_no_lints.yaml
+++ b/pkg/front_end/analysis_options_no_lints.yaml
@@ -12,8 +12,8 @@
- test/extensions/data/**
- test/id_testing/data/**
- test/language_versioning/data/**
- - test/macro_application/data/**
- - test/macros/data/**
+ - test/macros/application/data/**
+ - test/macros/declaration/data/**
- test/patching/data/**
- test/predicates/data/**
- test/static_types/data/**
diff --git a/pkg/front_end/test/macro_application/data/tests/marker.options b/pkg/front_end/test/macro_application/data/tests/marker.options
deleted file mode 100644
index 578e904..0000000
--- a/pkg/front_end/test/macro_application/data/tests/marker.options
+++ /dev/null
@@ -1 +0,0 @@
-cfe=pkg/front_end/test/macro_application/macro_application_test.dart
diff --git a/pkg/front_end/test/macro_application/data/package_config.json b/pkg/front_end/test/macros/application/data/package_config.json
similarity index 69%
rename from pkg/front_end/test/macro_application/data/package_config.json
rename to pkg/front_end/test/macros/application/data/package_config.json
index fbfd870..2e8365d 100644
--- a/pkg/front_end/test/macro_application/data/package_config.json
+++ b/pkg/front_end/test/macros/application/data/package_config.json
@@ -7,12 +7,12 @@
},
{
"name": "meta",
- "rootUri": "../../../../meta/",
+ "rootUri": "../../../../../meta/",
"packageUri": "lib/"
},
{
"name": "_fe_analyzer_shared",
- "rootUri": "../../../../_fe_analyzer_shared/lib/"
+ "rootUri": "../../../../../_fe_analyzer_shared/lib/"
}
]
}
\ No newline at end of file
diff --git a/pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro.dart b/pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro.dart
rename to pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro.dart
diff --git a/pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro1.dart b/pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro1.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro1.dart
rename to pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro1.dart
diff --git a/pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro2.dart b/pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro2.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro2.dart
rename to pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro2.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/declarations.dart b/pkg/front_end/test/macros/application/data/tests/declarations.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/declarations.dart
rename to pkg/front_end/test/macros/application/data/tests/declarations.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/declarations.dart.expect b/pkg/front_end/test/macros/application/data/tests/declarations.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/declarations.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/declarations.dart.expect
diff --git a/pkg/front_end/test/macro_application/data/tests/layers.dart b/pkg/front_end/test/macros/application/data/tests/layers.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/layers.dart
rename to pkg/front_end/test/macros/application/data/tests/layers.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/layers.dart.expect b/pkg/front_end/test/macros/application/data/tests/layers.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/layers.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/layers.dart.expect
diff --git a/pkg/front_end/test/macros/application/data/tests/marker.options b/pkg/front_end/test/macros/application/data/tests/marker.options
new file mode 100644
index 0000000..71e74a2
--- /dev/null
+++ b/pkg/front_end/test/macros/application/data/tests/marker.options
@@ -0,0 +1 @@
+cfe=pkg/front_end/test/macros/application/macro_application_test.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/parameters.dart b/pkg/front_end/test/macros/application/data/tests/parameters.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/parameters.dart
rename to pkg/front_end/test/macros/application/data/tests/parameters.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/parameters.dart.expect b/pkg/front_end/test/macros/application/data/tests/parameters.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/parameters.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/parameters.dart.expect
diff --git a/pkg/front_end/test/macro_application/data/tests/sequence.dart b/pkg/front_end/test/macros/application/data/tests/sequence.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/sequence.dart
rename to pkg/front_end/test/macros/application/data/tests/sequence.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/sequence.dart.expect b/pkg/front_end/test/macros/application/data/tests/sequence.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/sequence.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/sequence.dart.expect
diff --git a/pkg/front_end/test/macro_application/data/tests/subtypes.dart b/pkg/front_end/test/macros/application/data/tests/subtypes.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/subtypes.dart
rename to pkg/front_end/test/macros/application/data/tests/subtypes.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/subtypes.dart.expect b/pkg/front_end/test/macros/application/data/tests/subtypes.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/subtypes.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/subtypes.dart.expect
diff --git a/pkg/front_end/test/macro_application/data/tests/supertypes.dart b/pkg/front_end/test/macros/application/data/tests/supertypes.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/supertypes.dart
rename to pkg/front_end/test/macros/application/data/tests/supertypes.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/supertypes.dart.expect b/pkg/front_end/test/macros/application/data/tests/supertypes.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/supertypes.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/supertypes.dart.expect
diff --git a/pkg/front_end/test/macro_application/data/tests/to_string.dart b/pkg/front_end/test/macros/application/data/tests/to_string.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/to_string.dart
rename to pkg/front_end/test/macros/application/data/tests/to_string.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/to_string.dart.expect b/pkg/front_end/test/macros/application/data/tests/to_string.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/to_string.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/to_string.dart.expect
diff --git a/pkg/front_end/test/macro_application/data/tests/type_annotations.dart b/pkg/front_end/test/macros/application/data/tests/type_annotations.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/type_annotations.dart
rename to pkg/front_end/test/macros/application/data/tests/type_annotations.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/type_annotations.dart.expect b/pkg/front_end/test/macros/application/data/tests/type_annotations.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/type_annotations.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/type_annotations.dart.expect
diff --git a/pkg/front_end/test/macro_application/data/tests/types.dart b/pkg/front_end/test/macros/application/data/tests/types.dart
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/types.dart
rename to pkg/front_end/test/macros/application/data/tests/types.dart
diff --git a/pkg/front_end/test/macro_application/data/tests/types.dart.expect b/pkg/front_end/test/macros/application/data/tests/types.dart.expect
similarity index 100%
rename from pkg/front_end/test/macro_application/data/tests/types.dart.expect
rename to pkg/front_end/test/macros/application/data/tests/types.dart.expect
diff --git a/pkg/front_end/test/macro_application/macro_application_test.dart b/pkg/front_end/test/macros/application/macro_application_test.dart
similarity index 99%
rename from pkg/front_end/test/macro_application/macro_application_test.dart
rename to pkg/front_end/test/macros/application/macro_application_test.dart
index 3b988bb..ce74f2d 100644
--- a/pkg/front_end/test/macro_application/macro_application_test.dart
+++ b/pkg/front_end/test/macros/application/macro_application_test.dart
@@ -31,7 +31,7 @@
import 'package:kernel/text/ast_to_text.dart';
import 'package:vm/target/vm.dart';
-import '../utils/kernel_chain.dart';
+import '../../utils/kernel_chain.dart';
Future<void> main(List<String> args) async {
bool generateExpectations = args.contains('-g');
diff --git a/pkg/front_end/test/macros/data/tests/marker.options b/pkg/front_end/test/macros/data/tests/marker.options
deleted file mode 100644
index 8416ef5..0000000
--- a/pkg/front_end/test/macros/data/tests/marker.options
+++ /dev/null
@@ -1 +0,0 @@
-cfe=pkg/front_end/test/macros/macro_test.dart
diff --git a/pkg/front_end/test/macros/data/package_config.json b/pkg/front_end/test/macros/declaration/data/package_config.json
similarity index 81%
rename from pkg/front_end/test/macros/data/package_config.json
rename to pkg/front_end/test/macros/declaration/data/package_config.json
index f176d49..55ff011 100644
--- a/pkg/front_end/test/macros/data/package_config.json
+++ b/pkg/front_end/test/macros/declaration/data/package_config.json
@@ -11,7 +11,7 @@
},
{
"name": "_fe_analyzer_shared",
- "rootUri": "../../../../_fe_analyzer_shared/lib/"
+ "rootUri": "../../../../../_fe_analyzer_shared/lib/"
}
]
}
\ No newline at end of file
diff --git a/pkg/front_end/test/macros/data/pkgs/macro/lib/macro.dart b/pkg/front_end/test/macros/declaration/data/pkgs/macro/lib/macro.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/pkgs/macro/lib/macro.dart
rename to pkg/front_end/test/macros/declaration/data/pkgs/macro/lib/macro.dart
diff --git a/pkg/front_end/test/macros/data/pkgs/precompiled_macro/lib/precompiled_macro.dart b/pkg/front_end/test/macros/declaration/data/pkgs/precompiled_macro/lib/precompiled_macro.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/pkgs/precompiled_macro/lib/precompiled_macro.dart
rename to pkg/front_end/test/macros/declaration/data/pkgs/precompiled_macro/lib/precompiled_macro.dart
diff --git a/pkg/front_end/test/macros/data/pkgs/precompiled_macro/lib/src/macro_base.dart b/pkg/front_end/test/macros/declaration/data/pkgs/precompiled_macro/lib/src/macro_base.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/pkgs/precompiled_macro/lib/src/macro_base.dart
rename to pkg/front_end/test/macros/declaration/data/pkgs/precompiled_macro/lib/src/macro_base.dart
diff --git a/pkg/front_end/test/macros/data/tests/all_precompiled.dart b/pkg/front_end/test/macros/declaration/data/tests/all_precompiled.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/all_precompiled.dart
rename to pkg/front_end/test/macros/declaration/data/tests/all_precompiled.dart
diff --git a/pkg/front_end/test/macros/data/tests/applications.dart b/pkg/front_end/test/macros/declaration/data/tests/applications.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/applications.dart
rename to pkg/front_end/test/macros/declaration/data/tests/applications.dart
diff --git a/pkg/front_end/test/macros/data/tests/declare_macro.dart b/pkg/front_end/test/macros/declaration/data/tests/declare_macro.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/declare_macro.dart
rename to pkg/front_end/test/macros/declaration/data/tests/declare_macro.dart
diff --git a/pkg/front_end/test/macros/data/tests/declare_vs_apply/apply_lib.dart b/pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/apply_lib.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/declare_vs_apply/apply_lib.dart
rename to pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/apply_lib.dart
diff --git a/pkg/front_end/test/macros/data/tests/declare_vs_apply/apply_lib_dep.dart b/pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/apply_lib_dep.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/declare_vs_apply/apply_lib_dep.dart
rename to pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/apply_lib_dep.dart
diff --git a/pkg/front_end/test/macros/data/tests/declare_vs_apply/macro_lib.dart b/pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/macro_lib.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/declare_vs_apply/macro_lib.dart
rename to pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/macro_lib.dart
diff --git a/pkg/front_end/test/macros/data/tests/declare_vs_apply/macro_lib_dep.dart b/pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/macro_lib_dep.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/declare_vs_apply/macro_lib_dep.dart
rename to pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/macro_lib_dep.dart
diff --git a/pkg/front_end/test/macros/data/tests/declare_vs_apply/main.dart b/pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/main.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/declare_vs_apply/main.dart
rename to pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/main.dart
diff --git a/pkg/front_end/test/macros/data/tests/declare_vs_apply/main_lib_dep.dart b/pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/main_lib_dep.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/declare_vs_apply/main_lib_dep.dart
rename to pkg/front_end/test/macros/declaration/data/tests/declare_vs_apply/main_lib_dep.dart
diff --git a/pkg/front_end/test/macros/data/tests/direct_import.dart b/pkg/front_end/test/macros/declaration/data/tests/direct_import.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/direct_import.dart
rename to pkg/front_end/test/macros/declaration/data/tests/direct_import.dart
diff --git a/pkg/front_end/test/macros/data/tests/import_macro_builder.dart b/pkg/front_end/test/macros/declaration/data/tests/import_macro_builder.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/import_macro_builder.dart
rename to pkg/front_end/test/macros/declaration/data/tests/import_macro_builder.dart
diff --git a/pkg/front_end/test/macros/data/tests/import_macro_package.dart b/pkg/front_end/test/macros/declaration/data/tests/import_macro_package.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/import_macro_package.dart
rename to pkg/front_end/test/macros/declaration/data/tests/import_macro_package.dart
diff --git a/pkg/front_end/test/macros/data/tests/import_macro_source/macro_lib.dart b/pkg/front_end/test/macros/declaration/data/tests/import_macro_source/macro_lib.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/import_macro_source/macro_lib.dart
rename to pkg/front_end/test/macros/declaration/data/tests/import_macro_source/macro_lib.dart
diff --git a/pkg/front_end/test/macros/data/tests/import_macro_source/main.dart b/pkg/front_end/test/macros/declaration/data/tests/import_macro_source/main.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/import_macro_source/main.dart
rename to pkg/front_end/test/macros/declaration/data/tests/import_macro_source/main.dart
diff --git a/pkg/front_end/test/macros/data/tests/macro_declarations.dart b/pkg/front_end/test/macros/declaration/data/tests/macro_declarations.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/macro_declarations.dart
rename to pkg/front_end/test/macros/declaration/data/tests/macro_declarations.dart
diff --git a/pkg/front_end/test/macros/declaration/data/tests/marker.options b/pkg/front_end/test/macros/declaration/data/tests/marker.options
new file mode 100644
index 0000000..776355b
--- /dev/null
+++ b/pkg/front_end/test/macros/declaration/data/tests/marker.options
@@ -0,0 +1 @@
+cfe=pkg/front_end/test/macros/declaration/macro_declaration_test.dart
diff --git a/pkg/front_end/test/macros/data/tests/multiple_macros/macro_lib1.dart b/pkg/front_end/test/macros/declaration/data/tests/multiple_macros/macro_lib1.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/multiple_macros/macro_lib1.dart
rename to pkg/front_end/test/macros/declaration/data/tests/multiple_macros/macro_lib1.dart
diff --git a/pkg/front_end/test/macros/data/tests/multiple_macros/macro_lib2a.dart b/pkg/front_end/test/macros/declaration/data/tests/multiple_macros/macro_lib2a.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/multiple_macros/macro_lib2a.dart
rename to pkg/front_end/test/macros/declaration/data/tests/multiple_macros/macro_lib2a.dart
diff --git a/pkg/front_end/test/macros/data/tests/multiple_macros/macro_lib2b.dart b/pkg/front_end/test/macros/declaration/data/tests/multiple_macros/macro_lib2b.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/multiple_macros/macro_lib2b.dart
rename to pkg/front_end/test/macros/declaration/data/tests/multiple_macros/macro_lib2b.dart
diff --git a/pkg/front_end/test/macros/data/tests/multiple_macros/main.dart b/pkg/front_end/test/macros/declaration/data/tests/multiple_macros/main.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/multiple_macros/main.dart
rename to pkg/front_end/test/macros/declaration/data/tests/multiple_macros/main.dart
diff --git a/pkg/front_end/test/macros/data/tests/no_import.dart b/pkg/front_end/test/macros/declaration/data/tests/no_import.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/no_import.dart
rename to pkg/front_end/test/macros/declaration/data/tests/no_import.dart
diff --git a/pkg/front_end/test/macros/data/tests/precompiled.dart b/pkg/front_end/test/macros/declaration/data/tests/precompiled.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/precompiled.dart
rename to pkg/front_end/test/macros/declaration/data/tests/precompiled.dart
diff --git a/pkg/front_end/test/macros/data/tests/use_macro_package.dart b/pkg/front_end/test/macros/declaration/data/tests/use_macro_package.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/use_macro_package.dart
rename to pkg/front_end/test/macros/declaration/data/tests/use_macro_package.dart
diff --git a/pkg/front_end/test/macros/data/tests/use_macro_source/macro_lib.dart b/pkg/front_end/test/macros/declaration/data/tests/use_macro_source/macro_lib.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/use_macro_source/macro_lib.dart
rename to pkg/front_end/test/macros/declaration/data/tests/use_macro_source/macro_lib.dart
diff --git a/pkg/front_end/test/macros/data/tests/use_macro_source/main.dart b/pkg/front_end/test/macros/declaration/data/tests/use_macro_source/main.dart
similarity index 100%
rename from pkg/front_end/test/macros/data/tests/use_macro_source/main.dart
rename to pkg/front_end/test/macros/declaration/data/tests/use_macro_source/main.dart
diff --git a/pkg/front_end/test/macros/macro_test.dart b/pkg/front_end/test/macros/declaration/macro_declaration_test.dart
similarity index 100%
rename from pkg/front_end/test/macros/macro_test.dart
rename to pkg/front_end/test/macros/declaration/macro_declaration_test.dart
diff --git a/pkg/front_end/test/macro_api_test.dart b/pkg/front_end/test/macros/macro_api_test.dart
similarity index 92%
rename from pkg/front_end/test/macro_api_test.dart
rename to pkg/front_end/test/macros/macro_api_test.dart
index 70c3503..768d1d1 100644
--- a/pkg/front_end/test/macro_api_test.dart
+++ b/pkg/front_end/test/macros/macro_api_test.dart
@@ -28,7 +28,7 @@
options.environmentDefines = {};
options.explicitExperimentalFlags[ExperimentalFlag.macros] = true;
options.packagesFileUri = Platform.script.resolve(
- '../../_fe_analyzer_shared/test/macros/api/package_config.json');
+ '../../../_fe_analyzer_shared/test/macros/api/package_config.json');
options.macroExecutorProvider = () async {
return await isolatedExecutor.start(SerializationMode.byteDataServer);
};
@@ -38,7 +38,7 @@
InternalCompilerResult result = await kernelForProgramInternal(
Platform.script.resolve(
- '../../_fe_analyzer_shared/test/macros/api/api_test_data.dart'),
+ '../../../_fe_analyzer_shared/test/macros/api/api_test_data.dart'),
options,
retainDataForTesting: true) as InternalCompilerResult;
Expect.isFalse(result.kernelTargetForTesting!.loader.hasSeenError);
diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json
index c25a9d9..38037dc 100644
--- a/pkg/front_end/testing.json
+++ b/pkg/front_end/testing.json
@@ -466,8 +466,8 @@
"test/extensions/data/",
"test/id_testing/data/",
"test/language_versioning/data/",
- "test/macro_application/data/",
- "test/macros/data/",
+ "test/macros/application/data/",
+ "test/macros/declaration/data/",
"test/patching/data",
"test/predicates/data",
"test/static_types/data/",
