[cfe] Move macro tests to common subfolder

Change-Id: I3c327744e6e76d99efa7fc44644542ea92e5a0d8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/235225
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/analysis_options_no_lints.yaml

@@ -12,8 +12,8 @@ analyzer:
     - 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/**

pkg/front_end/test/macro_application/data/tests/marker.options

@@ -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/"
     }
   ]
 }

pkg/front_end/test/macro_application/data/package_config.json renamed to pkg/front_end/test/macros/application/data/package_config.json

@@ -0,0 +1 @@
+cfe=pkg/front_end/test/macros/application/macro_application_test.dart

pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro.dart renamed to pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro.dart

@@ -31,7 +31,7 @@ import 'package:kernel/target/targets.dart';
 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');

pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro1.dart renamed to pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro1.dart

@@ -11,7 +11,7 @@
     },
     {
       "name": "_fe_analyzer_shared",
-      "rootUri": "../../../../_fe_analyzer_shared/lib/"
+      "rootUri": "../../../../../_fe_analyzer_shared/lib/"
     }
   ]
 }

pkg/front_end/test/macro_application/data/pkgs/macro/lib/macro2.dart renamed to pkg/front_end/test/macros/application/data/pkgs/macro/lib/macro2.dart

@@ -0,0 +1 @@
+cfe=pkg/front_end/test/macros/declaration/macro_declaration_test.dart

pkg/front_end/test/macro_application/data/tests/declarations.dart renamed to pkg/front_end/test/macros/application/data/tests/declarations.dart

@@ -28,7 +28,7 @@ Future<void> main(List<String> args) async {
     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 @@ Future<void> main(List<String> args) async {
 
     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);

pkg/front_end/test/macro_application/data/tests/declarations.dart.expect renamed to pkg/front_end/test/macros/application/data/tests/declarations.dart.expect

@@ -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/",