Skip to content

Commit 25a8655

Browse files
committed
Delete swift-syntax-test and Syntax Unit Tests
1 parent c2d67cf commit 25a8655

File tree

6 files changed

+7
-1081
lines changed

6 files changed

+7
-1081
lines changed

test/lit.cfg

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ config.sil_passpipeline_dumper = inferSwiftBinary('sil-passpipeline-dumper')
315315
config.lldb_moduleimport_test = inferSwiftBinary('lldb-moduleimport-test')
316316
config.swift_ide_test = inferSwiftBinary('swift-ide-test')
317317
config.swift_dependency_tool = inferSwiftBinary('swift-dependency-tool')
318-
config.swift_syntax_test = inferSwiftBinary('swift-syntax-test')
319318
config.swift_reflection_dump = inferSwiftBinary('swift-reflection-dump')
320319
config.swift_remoteast_test = inferSwiftBinary('swift-remoteast-test')
321320
config.swift_indent = inferSwiftBinary('swift-indent')
@@ -467,7 +466,6 @@ shutil.rmtree(completion_cache_path, ignore_errors=True)
467466
ccp_opt = "-completion-cache-path %r" % completion_cache_path
468467
lit_config.note("Using code completion cache: " + completion_cache_path)
469468

470-
config.substitutions.append( ('%validate-incrparse', '%{python} %utils/incrparse/validate_parse.py --temp-dir %t --swift-syntax-test %swift-syntax-test') )
471469
config.substitutions.append( ('%llvm_obj_root', config.llvm_obj_root) )
472470
config.substitutions.append( ('%swift-lib-dir', config.swift_lib_dir) )
473471
config.substitutions.append( ('%llvm_src_root', config.llvm_src_root) )
@@ -505,7 +503,6 @@ config.substitutions.append( ('%swift-dump-pcm', "%r -dump-pcm" % config.swiftc)
505503
config.substitutions.append( ('%swift-ide-test_plain', config.swift_ide_test) )
506504
config.substitutions.append( ('%swift-ide-test', "%r %s %s -swift-version %s %s" % (config.swift_ide_test, mcp_opt, ccp_opt, swift_version, config.resource_dir_opt)) )
507505
config.substitutions.append( ('%swift-dependency-tool', config.swift_dependency_tool) )
508-
config.substitutions.append( ('%swift-syntax-test', config.swift_syntax_test) )
509506
config.substitutions.append( ('%swift-indent', config.swift_indent) )
510507
config.substitutions.append( ('%llvm-link', config.llvm_link) )
511508
config.substitutions.append( ('%swift-llvm-opt', config.swift_llvm_opt) )
@@ -2316,14 +2313,14 @@ config.substitutions.append(('%target-swift-typecheck-module-from-interface\(([^
23162313
config.substitutions.append(('%target-typecheck-verify-swift', config.target_parse_verify_swift))
23172314

23182315
config.substitutions.append(('%target-swift-emit-silgen\(mock-sdk:([^)]+)\)',
2319-
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-silgen -verify-syntax-tree')))
2320-
config.substitutions.append(('%target-swift-emit-silgen', '%target-swift-frontend -emit-silgen -verify-syntax-tree'))
2316+
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-silgen')))
2317+
config.substitutions.append(('%target-swift-emit-silgen', '%target-swift-frontend -emit-silgen'))
23212318
config.substitutions.append(('%target-swift-emit-sil\(mock-sdk:([^)]+)\)',
2322-
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-sil -verify-syntax-tree')))
2323-
config.substitutions.append(('%target-swift-emit-sil', '%target-swift-frontend -emit-sil -verify-syntax-tree'))
2319+
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-sil')))
2320+
config.substitutions.append(('%target-swift-emit-sil', '%target-swift-frontend -emit-sil'))
23242321
config.substitutions.append(('%target-swift-emit-ir\(mock-sdk:([^)]+)\)',
2325-
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-ir -verify-syntax-tree')))
2326-
config.substitutions.append(('%target-swift-emit-ir', '%target-swift-frontend -emit-ir -verify-syntax-tree'))
2322+
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-ir')))
2323+
config.substitutions.append(('%target-swift-emit-ir', '%target-swift-frontend -emit-ir'))
23272324
config.substitutions.append(('%target-swift-frontend\(mock-sdk:([^)]+)\)',
23282325
SubstituteCaptures(r'%s \1 %s' % (
23292326
escape_for_substitute_captures(subst_target_swift_frontend_mock_sdk),

tools/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ option(BUILD_SOURCEKIT_XPC_SERVICE
1111
"Whether or not the SourceKit XPC service should be built"
1212
${BUILD_SOURCEKIT_XPC_SERVICE_default})
1313

14-
# Add generated libSyntax headers to global dependencies.
15-
list(APPEND LLVM_COMMON_DEPENDS swift-syntax-generated-headers)
14+
# Add generated SourceKit UID header to global dependencies.
1615
if(SWIFT_BUILD_SOURCEKIT)
1716
list(APPEND LLVM_COMMON_DEPENDS generated_sourcekit_uids)
1817
endif()
@@ -38,7 +37,6 @@ if(SWIFT_INCLUDE_TESTS OR SWIFT_INCLUDE_TEST_BINARIES)
3837
add_swift_tool_subdirectory(swift-ide-test)
3938
add_swift_tool_subdirectory(swift-remoteast-test)
4039
add_swift_tool_subdirectory(lldb-moduleimport-test)
41-
add_swift_tool_subdirectory(swift-syntax-test)
4240
endif()
4341

4442
if(LLVM_USE_SANITIZE_COVERAGE)

tools/swift-syntax-test/CMakeLists.txt

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

0 commit comments

Comments
 (0)