[utils/incrparse] Introduce testWithParserLib() helper function

This is to allow swift-syntax to run its lit tests without needing to execute swift-syntax-test
for incremental reparsing.

Author: akyrtzi

utils/incrparse/incr_transfer_round_trip.py

@@ -8,7 +8,62 @@
 import sys
 
 from test_util import TestFailedError, run_command, \
-    serializeIncrParseMarkupFile
+    serializeIncrParseMarkupFile, prepareForIncrParse
+
+
+def testWithParserLib(test_file, test_case, pre_edit_file, post_edit_file,
+                      after_roundtrip_file, swiftsyntax_lit_test_helper):
+    # =========================================================================
+    # First generate the pre-edit and post-edit Swift file and gather the edits
+    # and expected reparse regions. This is the parser for the special edit
+    # markup for testing incremental parsing
+    # =========================================================================
+
+    # Gather command line arguments for swift-syntax-test specifiying the
+    # performed edits in this list
+    incremental_edit_args = []
+    reparse_args = []
+    try:
+        prepareForIncrParse(test_file=test_file, test_case=test_case,
+                            pre_edit_file=pre_edit_file,
+                            post_edit_file=post_edit_file,
+                            incremental_edit_args=incremental_edit_args,
+                            reparse_args=reparse_args)
+    except TestFailedError as e:
+        print('Test case "%s" of %s FAILed' % (test_case, test_file),
+              file=sys.stderr)
+        print(e.message, file=sys.stderr)
+        sys.exit(1)
+
+    try:
+        run_command([swiftsyntax_lit_test_helper, '-parse-incremental'] +
+                    ['-old-source-file', pre_edit_file] +
+                    ['-source-file', post_edit_file] +
+                    incremental_edit_args + reparse_args +
+                    ['-out', after_roundtrip_file])
+    except subprocess.CalledProcessError as e:
+        print('Test case "%s" of %s FAILed' % (test_case, test_file),
+              file=sys.stderr)
+        print('Parsing the swift file failed:\n', file=sys.stderr)
+        print(e.output, file=sys.stderr)
+        sys.exit(1)
+
+    # Check if the two syntax trees are the same
+    try:
+        run_command(
+            [
+                'diff', '-u',
+                post_edit_file,
+                after_roundtrip_file
+            ])
+    except subprocess.CalledProcessError as e:
+        print('Test case "%s" of %s FAILed' % (test_case, test_file),
+              file=sys.stderr)
+        print('Source file after incrementally parsing '
+              'does not match post-edit source file:\n\n',
+              file=sys.stderr)
+        print(e.output, file=sys.stderr)
+        sys.exit(1)
 
 
 def main():
@@ -43,7 +98,7 @@ def main():
         help='A temporary directory where pre-edit and post-edit files can be \
               saved')
     parser.add_argument(
-        '--swift-syntax-test', required=True,
+        '--swift-syntax-test', required=False,
         help='The path to swift-syntax-test')
     parser.add_argument(
         '--swiftsyntax-lit-test-helper', required=True,
@@ -67,6 +122,21 @@ def main():
     if not os.path.exists(temp_dir):
         os.makedirs(temp_dir)
 
+    if not swift_syntax_test:
+        pre_edit_file = temp_dir + '/' + test_file_name + '.' + test_case + \
+            '.pre.swift'
+        post_edit_file = temp_dir + '/' + test_file_name + '.' + test_case + \
+            '.post.swift'
+        after_roundtrip_file = temp_dir + '/' + test_file_name + '.' \
+            + test_case + '.post_after_roundtrip.swift'
+        return testWithParserLib(test_file=test_file,
+                                 test_case=test_case,
+                                 pre_edit_file=pre_edit_file,
+                                 post_edit_file=post_edit_file,
+                                 after_roundtrip_file=after_roundtrip_file,
+                    swiftsyntax_lit_test_helper=swiftsyntax_lit_test_helper)
+
+
     treeFileExtension = serialization_format
 
     pre_edit_tree_file = temp_dir + '/' + test_file_name + '.' \

utils/incrparse/test_util.py

@@ -105,33 +105,12 @@ def parseLine(line, line_no, test_case, incremental_edit_args, reparse_args,
     return (pre_edit_line, post_edit_line, current_reparse_start)
 
 
-def serializeIncrParseMarkupFile(test_file, test_case, mode,
-                                 serialization_mode, serialization_format,
-                                 omit_node_ids, output_file, temp_dir,
-                                 swift_syntax_test, print_visual_reuse_info):
-    test_file_name = os.path.basename(test_file)
-    pre_edit_file = temp_dir + '/' + test_file_name + '.' + test_case + \
-        '.pre.swift'
-    post_edit_file = temp_dir + '/' + test_file_name + '.' + test_case + \
-        '.post.swift'
-
-    if not os.path.exists(temp_dir):
-        os.makedirs(temp_dir)
-
-    # =========================================================================
-    # First generate the pre-edit and post-edit Swift file and gather the edits
-    # and expected reparse regions. This is the parser for the special edit
-    # markup for testing incremental parsing
-    # =========================================================================
-
+def prepareForIncrParse(test_file, test_case, pre_edit_file, post_edit_file,
+                        incremental_edit_args, reparse_args):
     with open(test_file, mode='r') as test_file_handle, \
             open(pre_edit_file, mode='w+') as pre_edit_file_handle, \
             open(post_edit_file, mode='w+') as post_edit_file_handle:
 
-        # Gather command line arguments for swift-syntax-test specifiying the
-        # performed edits in this list
-        incremental_edit_args = []
-        reparse_args = []
         current_reparse_start = None
 
         line_no = 1
@@ -151,6 +130,33 @@ def serializeIncrParseMarkupFile(test_file, test_case, mode,
             raise TestFailedError('Unclosed reparse tag for test case %s' %
                                   test_case)
 
+
+def serializeIncrParseMarkupFile(test_file, test_case, mode,
+                                 serialization_mode, serialization_format,
+                                 omit_node_ids, output_file, temp_dir,
+                                 swift_syntax_test, print_visual_reuse_info):
+    test_file_name = os.path.basename(test_file)
+    pre_edit_file = temp_dir + '/' + test_file_name + '.' + test_case + \
+        '.pre.swift'
+    post_edit_file = temp_dir + '/' + test_file_name + '.' + test_case + \
+        '.post.swift'
+
+    if not os.path.exists(temp_dir):
+        os.makedirs(temp_dir)
+
+    # =========================================================================
+    # First generate the pre-edit and post-edit Swift file and gather the edits
+    # and expected reparse regions. This is the parser for the special edit
+    # markup for testing incremental parsing
+    # =========================================================================
+
+    # Gather command line arguments for swift-syntax-test specifiying the
+    # performed edits in this list
+    incremental_edit_args = []
+    reparse_args = []
+    prepareForIncrParse(test_file, test_case, pre_edit_file, post_edit_file,
+                        incremental_edit_args, reparse_args)
+
     # =========================================================================
     # Now generate the requested serialized file
     # =========================================================================