Skip to content

Commit 49cbf97

Browse files
committed
Rename swiftdt to swift-inspect
1 parent b8b9fc7 commit 49cbf97

20 files changed

+30
-30
lines changed

tools/swiftdt/Package.swift tools/swift-inspect/Package.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
import PackageDescription
55

66
let package = Package(
7-
name: "swiftdt",
7+
name: "swift-inspect",
88
dependencies: [
99
.package(url: "https://github.com/apple/swift-argument-parser", from: "0.0.1"),
1010
],
1111
targets: [
1212
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
1313
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
1414
.target(
15-
name: "swiftdt",
15+
name: "swift-inspect",
1616
dependencies: [
1717
"SymbolicationShims",
1818
.product(name: "ArgumentParser", package: "swift-argument-parser"),
1919
]),
2020
.testTarget(
21-
name: "swiftdtTests",
22-
dependencies: ["swiftdt"]),
21+
name: "swiftInspectTests",
22+
dependencies: ["swift-inspect"]),
2323
.systemLibrary(
2424
name: "SymbolicationShims")
2525
]
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# swiftdt
1+
# swift-inspect
22

33
A description of this package.

tools/swiftdt/Sources/swiftdt/main.swift tools/swift-inspect/Sources/swift-inspect/main.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func withReflectionContext(
8282
try body(context)
8383
}
8484

85-
struct Swiftdt: ParsableCommand {
85+
struct SwiftInspect: ParsableCommand {
8686
static let configuration = CommandConfiguration(
8787
abstract: "Swift runtime debug tool",
8888
subcommands: [
@@ -119,4 +119,4 @@ struct DumpMetadataAllocations: ParsableCommand {
119119
}
120120
}
121121

122-
Swiftdt.main()
122+
SwiftInspect.main()
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22

3-
import swiftdtTests
3+
import swiftInspectTests
44

55
var tests = [XCTestCaseEntry]()
6-
tests += swiftdtTests.allTests()
6+
tests += swiftInspectTests.allTests()
77
XCTMain(tests)

tools/swiftdt/Tests/swiftdtTests/XCTestManifests.swift tools/swift-inspect/Tests/swiftInspectTests/XCTestManifests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import XCTest
33
#if !canImport(ObjectiveC)
44
public func allTests() -> [XCTestCaseEntry] {
55
return [
6-
testCase(swiftdtTests.allTests),
6+
testCase(swiftInspectTests.allTests),
77
]
88
}
99
#endif

tools/swiftdt/Tests/swiftdtTests/swiftdtTests.swift tools/swift-inspect/Tests/swiftInspectTests/swiftInspectTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22
import class Foundation.Bundle
33

4-
final class swiftdtTests: XCTestCase {
4+
final class swiftInspectTests: XCTestCase {
55
func testExample() throws {
66
// This is an example of a functional test case.
77
// Use XCTAssert and related functions to verify your tests produce the correct
@@ -12,7 +12,7 @@ final class swiftdtTests: XCTestCase {
1212
return
1313
}
1414

15-
let fooBinary = productsDirectory.appendingPathComponent("swiftdt")
15+
let fooBinary = productsDirectory.appendingPathComponent("swift-inspect")
1616

1717
let process = Process()
1818
process.executableURL = fooBinary

utils/build-script

+3-3
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def validate_arguments(toolchain, args):
222222
'build_sourcekitlsp',
223223
'build_tensorflow_swift_apis',
224224
'build_toolchainbenchmarks',
225-
'build_swiftdt',
225+
'build_swift_inspect',
226226
'tsan_libdispatch_test',
227227
]
228228
has_target_needing_toolchain = \
@@ -840,8 +840,8 @@ class BuildScriptInvocation(object):
840840
product_classes.append(products.SourceKitLSP)
841841
if self.args.build_toolchainbenchmarks:
842842
product_classes.append(products.Benchmarks)
843-
if self.args.build_swiftdt:
844-
product_classes.append(products.SwiftDT)
843+
if self.args.build_swift_inspect:
844+
product_classes.append(products.SwiftInspect)
845845
if self.args.tsan_libdispatch_test:
846846
product_classes.append(products.TSanLibDispatch)
847847
return product_classes

utils/build_swift/build_swift/driver_arguments.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,9 @@ def create_argument_parser():
593593
toggle_true('build_toolchainbenchmarks'),
594594
help='build Swift Benchmarks using swiftpm against the just built '
595595
'toolchain')
596-
option(['--swiftdt'],
597-
toggle_true('build_swiftdt'),
598-
help='build SwiftDT using swiftpm against the just built '
596+
option(['--swift-inspect'],
597+
toggle_true('build_swift_inspect'),
598+
help='build SwiftInspect using swiftpm against the just built '
599599
'toolchain')
600600

601601
option('--xctest', toggle_true('build_xctest'),
@@ -1016,9 +1016,9 @@ def create_argument_parser():
10161016
option('--skip-test-toolchain-benchmarks',
10171017
toggle_false('test_toolchainbenchmarks'),
10181018
help='skip testing toolchain benchmarks')
1019-
option('--skip-test-swiftdt',
1020-
toggle_false('test_swiftdt'),
1021-
help='skip testing swiftdt')
1019+
option('--skip-test-swift-inspect',
1020+
toggle_false('test_swift_inspect'),
1021+
help='skip testing swift_inspect')
10221022

10231023
# -------------------------------------------------------------------------
10241024
in_group('Build settings specific for LLVM')

utils/build_swift/tests/expected_options.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ class BuildScriptImplOption(_BaseOption):
518518
EnableOption('--install-skstresstester', dest='install_skstresstester'),
519519
EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
520520
EnableOption('--toolchain-benchmarks', dest='build_toolchainbenchmarks'),
521-
EnableOption('--swiftdt', dest='build_swiftdt'),
521+
EnableOption('--swift-inspect', dest='build_swift_inspect'),
522522
EnableOption('--tsan-libdispatch-test'),
523523
EnableOption('--long-test'),
524524
EnableOption('--show-sdks'),
@@ -582,8 +582,8 @@ class BuildScriptImplOption(_BaseOption):
582582
DisableOption('--skip-test-swiftevolve', dest='test_swiftevolve'),
583583
DisableOption('--skip-test-toolchain-benchmarks',
584584
dest='test_toolchainbenchmarks'),
585-
DisableOption('--skip-test-swiftdt',
586-
dest='test_swiftdt'),
585+
DisableOption('--skip-test-swift-inspect',
586+
dest='test_swift_inspect'),
587587
DisableOption('--skip-build-clang-tools-extra',
588588
dest='build_clang_tools_extra'),
589589

utils/swift_build_support/swift_build_support/products/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from .skstresstester import SKStressTester
2727
from .sourcekitlsp import SourceKitLSP
2828
from .swift import Swift
29-
from .swiftdt import SwiftDT
29+
from .swiftinspect import SwiftInspect
3030
from .swiftevolve import SwiftEvolve
3131
from .swiftpm import SwiftPM
3232
from .swiftsyntax import SwiftSyntax
@@ -48,7 +48,7 @@
4848
'PlaygroundSupport',
4949
'PythonKit',
5050
'Swift',
51-
'SwiftDT',
51+
'SwiftInspect',
5252
'SwiftPM',
5353
'TensorFlowSwiftAPIs',
5454
'XCTest',

utils/swift_build_support/swift_build_support/products/swiftdt.py utils/swift_build_support/swift_build_support/products/swiftinspect.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# swift_build_support/products/swiftdt.py -----------------------*- python -*-
1+
# swift_build_support/products/swiftinspect.py --------------------*- python -*-
22
#
33
# This source file is part of the Swift.org open source project
44
#
@@ -19,7 +19,7 @@
1919

2020

2121
# Build against the current installed toolchain.
22-
class SwiftDT(product.Product):
22+
class SwiftInspect(product.Product):
2323
@classmethod
2424
def product_source_name(cls):
2525
return "swift-dt"
@@ -35,7 +35,7 @@ def build(self, host_target):
3535
run_build_script_helper(host_target, self, self.args)
3636

3737
def should_test(self, host_target):
38-
return self.args.test_swiftdt
38+
return self.args.test_swift_inspect
3939

4040
def test(self, host_target):
4141
"""Just run a single instance of the command for both .debug and
@@ -61,7 +61,7 @@ def run_build_script_helper(host_target, product, args):
6161
# the assumption that each product is in its own build directory. This
6262
# product is not like that and has its package/tools instead in
6363
# ./$SOURCE_ROOT/swift/benchmark.
64-
package_path = os.path.join(product.source_dir, '..', 'swift', 'tools', 'swiftdt')
64+
package_path = os.path.join(product.source_dir, '..', 'swift', 'tools', 'swift-inspect')
6565
package_path = os.path.abspath(package_path)
6666

6767
# We use a separate python helper to enable quicker iteration when working

0 commit comments

Comments
 (0)