Merge pull request #1835 from ahoppen/ahoppen/validation-failures

Run ValidateSyntaxNodes tests in CI

Author: ahoppen

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -183,6 +183,10 @@ class ValidateSyntaxNodes: XCTestCase {
           node: .conventionWitnessMethodAttributeArguments,
           message: "child 'WitnessMethodLabel' has a single keyword as its only token choice and should thus be named 'Witness_methodKeyword'"
         ),
+        ValidationFailure(
+          node: .deinitEffectSpecifiers,
+          message: "child 'AsyncSpecifier' has a single keyword as its only token choice and should thus be named 'AsyncKeyword'"
+        ),
         ValidationFailure(
           node: .derivativeRegistrationAttributeArguments,
           message: "child 'OfLabel' has a single keyword as its only token choice and should thus be named 'OfKeyword'"
@@ -199,10 +203,6 @@ class ValidateSyntaxNodes: XCTestCase {
           node: .genericParameter,
           message: "child 'Each' has a single keyword as its only token choice and should thus be named 'EachKeyword'"
         ),
-        ValidationFailure(
-          node: .importDecl,
-          message: "child 'ImportTok' has a single keyword as its only token choice and should thus be named 'ImportKeyword'"
-        ),
         ValidationFailure(node: .isExpr, message: "child 'IsTok' has a single keyword as its only token choice and should thus be named 'IsKeyword'"),
         ValidationFailure(
           node: .originallyDefinedInArguments,
@@ -243,9 +243,6 @@ class ValidateSyntaxNodes: XCTestCase {
         ValidationFailure(node: .unresolvedAsExpr, message: "child 'AsTok' has a single keyword as its only token choice and should thus be named 'AsKeyword'"),
         ValidationFailure(node: .unresolvedIsExpr, message: "child 'IsTok' has a single keyword as its only token choice and should thus be named 'IsKeyword'"),
 
-        // MARK:
-        ValidationFailure(node: .arrayExpr, message: "child 'LeftSquare' has a token as its only token choice and should thus be named 'LeftSquareBracket'"),
-        ValidationFailure(node: .arrayExpr, message: "child 'RightSquare' has a token as its only token choice and should thus be named 'RightSquareBracket'"),
         ValidationFailure(node: .arrowExpr, message: "child 'ArrowToken' has a token as its only token choice and should thus be named 'Arrow'"),
         ValidationFailure(node: .assignmentExpr, message: "child 'AssignToken' has a token as its only token choice and should thus be named 'Equal'"),
         ValidationFailure(node: .attribute, message: "child 'AtSignToken' has a token as its only token choice and should thus be named 'AtSign'"),
@@ -256,26 +253,10 @@ class ValidateSyntaxNodes: XCTestCase {
           message: "child 'OperatorToken' has a token as its only token choice and should thus be named 'BinaryOperator'"
         ),
         ValidationFailure(node: .closureCaptureItem, message: "child 'AssignToken' has a token as its only token choice and should thus be named 'Equal'"),
-        ValidationFailure(
-          node: .closureCaptureSignature,
-          message: "child 'LeftSquare' has a token as its only token choice and should thus be named 'LeftSquareBracket'"
-        ),
-        ValidationFailure(
-          node: .closureCaptureSignature,
-          message: "child 'RightSquare' has a token as its only token choice and should thus be named 'RightSquareBracket'"
-        ),
         ValidationFailure(
           node: .designatedTypeElement,
           message: "child 'LeadingComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
         ),
-        ValidationFailure(
-          node: .dictionaryExpr,
-          message: "child 'LeftSquare' has a token as its only token choice and should thus be named 'LeftSquareBracket'"
-        ),
-        ValidationFailure(
-          node: .dictionaryExpr,
-          message: "child 'RightSquare' has a token as its only token choice and should thus be named 'RightSquareBracket'"
-        ),
         ValidationFailure(
           node: .differentiableAttributeArguments,
           message: "child 'DiffKindComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
@@ -313,11 +294,11 @@ class ValidateSyntaxNodes: XCTestCase {
         ValidationFailure(node: .integerLiteralExpr, message: "child 'Digits' has a token as its only token choice and should thus be named 'IntegerLiteral'"),
         ValidationFailure(
           node: .keyPathSubscriptComponent,
-          message: "child 'LeftBracket' has a token as its only token choice and should thus be named 'LeftSquareBracket'"
+          message: "child 'LeftBracket' has a token as its only token choice and should thus be named 'LeftSquare'"
         ),
         ValidationFailure(
           node: .keyPathSubscriptComponent,
-          message: "child 'RightBracket' has a token as its only token choice and should thus be named 'RightSquareBracket'"
+          message: "child 'RightBracket' has a token as its only token choice and should thus be named 'RightSquare'"
         ),
         ValidationFailure(node: .labeledStmt, message: "child 'LabelColon' has a token as its only token choice and should thus be named 'Colon'"),
         ValidationFailure(node: .layoutRequirement, message: "child 'Size' has a token as its only token choice and should thus be named 'IntegerLiteral'"),
@@ -395,11 +376,11 @@ class ValidateSyntaxNodes: XCTestCase {
         ValidationFailure(node: .stringSegment, message: "child 'Content' has a token as its only token choice and should thus be named 'StringSegment'"),
         ValidationFailure(
           node: .subscriptExpr,
-          message: "child 'LeftBracket' has a token as its only token choice and should thus be named 'LeftSquareBracket'"
+          message: "child 'LeftBracket' has a token as its only token choice and should thus be named 'LeftSquare'"
         ),
         ValidationFailure(
           node: .subscriptExpr,
-          message: "child 'RightBracket' has a token as its only token choice and should thus be named 'RightSquareBracket'"
+          message: "child 'RightBracket' has a token as its only token choice and should thus be named 'RightSquare'"
         ),
         ValidationFailure(
           node: .suppressedType,
@@ -501,10 +482,6 @@ class ValidateSyntaxNodes: XCTestCase {
           node: .precedenceGroupAssociativity,
           message: "child 'Value' only has keywords as its token choices and should thus and with 'Keyword'"
         ),
-        ValidationFailure(
-          node: .precedenceGroupRelation,
-          message: "child 'HigherThanOrLowerThan' only has keywords as its token choices and should thus and with 'Keyword'"
-        ),
       ]
     )
   }

build-script.py

@@ -283,6 +283,29 @@ def check_generated_files_match(self_generated_dir: str,
     check_call(command)
 
 
+def run_code_generation_tests(
+    toolchain: str,
+    verbose: bool
+) -> None:
+    print("** Running CodeGeneration tests **")
+
+    swift_exec = os.path.join(toolchain, "bin", "swift")
+
+    swiftpm_call = [
+        swift_exec, 'test',
+        "--package-path", CODE_GENERATION_DIR
+    ]
+    
+    if verbose:
+        swiftpm_call.extend(["--verbose"])
+
+    env = dict(os.environ)
+    env["SWIFT_BUILD_SCRIPT_ENVIRONMENT"] = "1"
+    env["SWIFTSYNTAX_ENABLE_RAWSYNTAX_VALIDATION"] = "1"
+    env["SWIFTCI_USE_LOCAL_DEPS"] = "1"
+    check_call(swiftpm_call, env=env, verbose=verbose)
+
+
 def run_tests(
     toolchain: str,
     build_dir: Optional[str],
@@ -306,6 +329,8 @@ def run_tests(
         )
 
     run_xctests(
+        package_dir=PACKAGE_DIR,
+        test_product="swift-syntaxPackageTests",
         toolchain=toolchain,
         build_dir=build_dir,
         multiroot_data_file=multiroot_data_file,
@@ -315,6 +340,11 @@ def run_tests(
         verbose=verbose,
     )
 
+    run_code_generation_tests(
+        toolchain=toolchain,
+        verbose=verbose,
+    )
+
 # -----------------------------------------------------------------------------
 # Lit Tests
 
@@ -398,6 +428,8 @@ def run_lit_tests(toolchain: str, build_dir: Optional[str], release: bool,
 
 
 def run_xctests(
+    package_dir: str,
+    test_product: str,
     toolchain: str, 
     build_dir: Optional[str],
     multiroot_data_file: Optional[str], 
@@ -410,7 +442,7 @@ def run_xctests(
     swiftpm_call = get_swiftpm_invocation(
         toolchain=toolchain,
         action="test",
-        package_dir=PACKAGE_DIR,
+        package_dir=package_dir,
         build_dir=build_dir,
         multiroot_data_file=multiroot_data_file,
         release=release,
@@ -419,7 +451,7 @@ def run_xctests(
     if verbose:
         swiftpm_call.extend(["--verbose"])
 
-    swiftpm_call.extend(["--test-product", "swift-syntaxPackageTests"])
+    swiftpm_call.extend(["--test-product", test_product])
 
     env = dict(os.environ)
     env["SWIFT_BUILD_SCRIPT_ENVIRONMENT"] = "1"