Skip to content

Commit 1076504

Browse files
authored
Merge pull request #1807 from StevenWong12/delete_lit_incr_parse_test
Delete incremental parse related `lit`-based tests
2 parents 3f9b07a + f2c0ad0 commit 1076504

14 files changed

+0
-1158
lines changed

Sources/lit-test-helper/main.swift

Lines changed: 0 additions & 348 deletions
Large diffs are not rendered by default.

build-script.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
LLVM_DIR = os.path.join(WORKSPACE_DIR, "llvm-project", "llvm")
3232
SWIFT_DIR = os.path.join(WORKSPACE_DIR, "swift")
3333

34-
INCR_TRANSFER_ROUNDTRIP_EXEC = os.path.join(
35-
PACKAGE_DIR, "utils", "incrparse", "incr_transfer_round_trip.py"
36-
)
37-
3834
LIT_EXEC = os.path.join(LLVM_DIR, "utils", "lit", "lit.py")
3935

4036
GROUP_INFO_PATH = os.path.join(PACKAGE_DIR, "utils", "group.json")
@@ -337,19 +333,6 @@ def check_lit_exec() -> None:
337333
)
338334

339335

340-
def check_incr_transfer_roundtrip_exec() -> None:
341-
if not os.path.exists(INCR_TRANSFER_ROUNDTRIP_EXEC):
342-
fatal_error(
343-
"""
344-
Error: Could not find incr_transfer_round_trip.py.
345-
346-
Make sure you have the main swift repo checked out next to the swift-syntax
347-
repo.
348-
Refer to README.md for more information.
349-
"""
350-
)
351-
352-
353336
def find_swiftpm_bin_path(
354337
package_dir: str, toolchain: str, build_dir: Optional[str], release: bool
355338
) -> str:
@@ -384,7 +367,6 @@ def run_lit_tests(toolchain: str, build_dir: Optional[str], release: bool,
384367
print("** Running lit-based tests **")
385368

386369
check_lit_exec()
387-
check_incr_transfer_roundtrip_exec()
388370

389371
product_bin_path = find_product_bin_path(
390372
toolchain=toolchain, build_dir=build_dir, release=release)
@@ -400,9 +382,6 @@ def run_lit_tests(toolchain: str, build_dir: Optional[str], release: bool,
400382
lit_call.extend(["--param", "FILECHECK=" + filecheck_exec])
401383
if lit_test_helper_exec:
402384
lit_call.extend(["--param", "LIT_TEST_HELPER=" + lit_test_helper_exec])
403-
lit_call.extend(
404-
["--param", "INCR_TRANSFER_ROUND_TRIP.PY=" + INCR_TRANSFER_ROUNDTRIP_EXEC]
405-
)
406385
lit_call.extend(["--param", "EXAMPLES_BIN_PATH=" + examples_bin_path])
407386
lit_call.extend(["--param", "TOOLCHAIN=" + toolchain])
408387

lit_tests/incrParse/add-else-to-ifconfig.swift

Lines changed: 0 additions & 7 deletions
This file was deleted.

lit_tests/incrParse/add-space-at-missing-brace.swift

Lines changed: 0 additions & 10 deletions
This file was deleted.

lit_tests/incrParse/funcs.swift

Lines changed: 0 additions & 40 deletions
This file was deleted.

lit_tests/incrParse/inserted_text_starts_identifier.swift

Lines changed: 0 additions & 6 deletions
This file was deleted.

lit_tests/incrParse/invalid.swift

Lines changed: 0 additions & 17 deletions
This file was deleted.

lit_tests/incrParse/multi-edit-mapping.swift

Lines changed: 0 additions & 7 deletions
This file was deleted.

lit_tests/incrParse/reuse.swift

Lines changed: 0 additions & 49 deletions
This file was deleted.

lit_tests/incrParse/simple.swift

Lines changed: 0 additions & 60 deletions
This file was deleted.

lit_tests/lit.cfg

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ config.test_exec_root = tempfile.gettempdir()
6161

6262
config.examples_bin_path = lit_config.params.get("EXAMPLES_BIN_PATH")
6363
config.filecheck = inferSwiftBinary("FileCheck")
64-
config.incr_transfer_round_trip = inferSwiftBinary("incr_transfer_round_trip.py")
6564
config.lit_test_helper = inferSwiftBinary("lit-test-helper")
6665
config.swift = inferSwiftBinary("swift")
6766
config.swiftc = inferSwiftBinary("swiftc")
@@ -78,13 +77,6 @@ config.substitutions.append(
7877
("%empty-directory\(([^)]+)\)", 'rm -rf "\\1" && mkdir -p "\\1"')
7978
)
8079
config.substitutions.append(("%FileCheck", config.filecheck))
81-
config.substitutions.append(
82-
(
83-
"%validate-incrparse",
84-
"%s --temp-dir %%t --swiftsyntax-lit-test-helper %s"
85-
% (config.incr_transfer_round_trip, config.lit_test_helper),
86-
)
87-
)
8880
config.substitutions.append(("%lit-test-helper", config.lit_test_helper))
8981
config.substitutions.append(("%swiftc", config.swiftc))
9082
config.substitutions.append(("%swift", config.swift))

utils/incrparse/incr_transfer_round_trip.py

Lines changed: 0 additions & 118 deletions
This file was deleted.

0 commit comments

Comments
 (0)