Skip to content

Install swift-help for integration tests. Suppress .noDriver options from being emitted by swift-help. #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cltnschlosser merged 4 commits into from
Nov 15, 2020
Merged

Install swift-help for integration tests. Suppress .noDriver options from being emitted by swift-help. #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a12a18e
Install swift-help for integration tests. Suppress .noDriver options …
cltnschlosser Nov 11, 2020
c761312
Move check to isAccepted(by:)
cltnschlosser Nov 13, 2020
7426a74
Match C++ logic for unknown arguments
cltnschlosser Nov 15, 2020
3c99ffc
Remove code using .noDriver arguments
cltnschlosser Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Sources/SwiftDriver/Driver/Driver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ extension Driver {
// Some output flags affect the compiler mode.
if let outputOption = parsedOptions.getLast(in: .modes) {
switch outputOption.option {
case .emitPch, .emitImportedModules:
case .emitImportedModules:
return .singleCompile

case .repl, .lldbRepl:
Expand Down Expand Up @@ -1090,8 +1090,6 @@ extension Driver {
parsedOptions.eraseArgument(.indexFile)
parsedOptions.eraseArgument(.indexFilePath)
parsedOptions.eraseArgument(.indexStorePath)
parsedOptions.eraseArgument(.indexIgnoreStdlib)
parsedOptions.eraseArgument(.indexSystemModules)
parsedOptions.eraseArgument(.indexIgnoreSystemModules)
return .standardCompile
}
Expand Down Expand Up @@ -1231,9 +1229,6 @@ extension Driver {
case .dumpAst:
compilerOutputType = .ast

case .emitPch:
compilerOutputType = .pch

case .emitPcm:
compilerOutputType = .pcm

Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftOptions/Option.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ extension Option {
public func isAccepted(by driverKind: DriverKind) -> Bool {
switch driverKind {
case .batch:
return !attributes.contains(.noBatch)
return attributes.isDisjoint(with: [.noDriver, .noBatch])
case .interactive:
return !attributes.contains(.noInteractive)
return attributes.isDisjoint(with: [.noDriver, .noInteractive])
}
}
}
3 changes: 2 additions & 1 deletion Sources/SwiftOptions/OptionParsing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ extension OptionTable {
public func parse(_ arguments: [String],
for driverKind: DriverKind) throws -> ParsedOptions {
var trie = PrefixTrie<Option>()
for opt in options {
// Add all options, ignoring the .noDriver ones
for opt in options where !opt.attributes.contains(.noDriver) {
trie[opt.spelling] = opt
}

Expand Down
10 changes: 7 additions & 3 deletions Tests/SwiftDriverTests/IntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,21 @@ func makeDriverSymlinks(
try makeDirectories(tempBinDir)

let swift = tempBinDir.appending(component: "swift")
try createSymlink(swift, pointingAt: driver, relative: false)
try localFileSystem.createSymbolicLink(swift, pointingAt: driver, relative: false)

let swiftc = tempBinDir.appending(components: "swiftc")
try createSymlink(swiftc, pointingAt: driver, relative: false)
try localFileSystem.createSymbolicLink(swiftc, pointingAt: driver, relative: false)

let swiftHelp = binDir.appending(component: "swift-help")
let swiftHelpSimlink = tempBinDir.appending(component: "swift-help")
try localFileSystem.createSymbolicLink(swiftHelpSimlink, pointingAt: swiftHelp, relative: false)

// If we've been given a build dir, link in its lib folder so we can find its
// resource directory.
if let swiftBuildDir = swiftBuildDir {
let libDir = swiftBuildDir.appending(component: "lib")
let tempLibDir = tempDir.appending(component: "lib" )
try createSymlink(tempLibDir, pointingAt: libDir, relative: false)
try localFileSystem.createSymbolicLink(tempLibDir, pointingAt: libDir, relative: false)
}

return (swift: swift, swiftc: swiftc)
Expand Down
16 changes: 3 additions & 13 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,7 @@ final class SwiftDriverTests: XCTestCase {

func testMergeModulesOnly() throws {
do {
var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module", "-disable-bridging-pch", "-import-objc-header", "TestInputHeader.h", "-emit-dependencies", "-emit-module-doc-path", "/foo/bar/Test.swiftdoc", "-emit-module-source-info-path", "/foo/bar/Test.swiftsourceinfo"])
var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module", "-disable-bridging-pch", "-import-objc-header", "TestInputHeader.h", "-emit-dependencies", "-emit-module-source-info-path", "/foo/bar/Test.swiftsourceinfo"])
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 3)
XCTAssertEqual(plannedJobs[0].outputs.count, 4)
Expand All @@ -1578,7 +1578,7 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertTrue(plannedJobs[2].tool.name.contains("swift"))
XCTAssertEqual(plannedJobs[2].outputs.count, 3)
XCTAssertEqual(plannedJobs[2].outputs[0].file, .relative(RelativePath("Test.swiftmodule")))
XCTAssertEqual(plannedJobs[2].outputs[1].file, .absolute(AbsolutePath("/foo/bar/Test.swiftdoc")))
XCTAssertEqual(plannedJobs[2].outputs[1].file, .relative(RelativePath("Test.swiftdoc")))
XCTAssertEqual(plannedJobs[2].outputs[2].file, .absolute(AbsolutePath("/foo/bar/Test.swiftsourceinfo")))
XCTAssert(plannedJobs[2].commandLine.contains(.flag("-import-objc-header")))
}
Expand Down Expand Up @@ -1608,7 +1608,7 @@ final class SwiftDriverTests: XCTestCase {

do {
// Make sure the swiftdoc path is correct for an inferred module
var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module-doc", "-emit-module"])
var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module"])
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 3)
XCTAssertTrue(plannedJobs[2].tool.name.contains("swift"))
Expand Down Expand Up @@ -2714,7 +2714,6 @@ final class SwiftDriverTests: XCTestCase {
"foo.swift",
"-index-file-path", "foo.swift",
"-index-store-path", "store/path",
"-index-ignore-stdlib", "-index-system-modules",
"-index-ignore-system-modules"]) {
$1.expect(.warning("ignoring '-index-file' because '-dump-ast' was also specified"))
let jobs = try $0.planBuild()
Expand Down Expand Up @@ -3805,15 +3804,6 @@ final class SwiftDriverTests: XCTestCase {
}

func testSourceInfoFileEmitOption() throws {
do {
var driver = try Driver(args: ["swiftc", "-emit-module-source-info", "foo.swift"])
let plannedJobs = try driver.planBuild()
let compileJob = plannedJobs[0]
XCTAssertTrue(compileJob.commandLine.contains(.flag("-emit-module-source-info-path")))
XCTAssertEqual(compileJob.outputs.count, 2)
XCTAssertEqual(compileJob.outputs[0].file, .temporary(RelativePath("foo.o")))
XCTAssertEqual(compileJob.outputs[1].file, .temporary(RelativePath("foo.swiftsourceinfo")))
}
// implicit
do {
var driver = try Driver(args: ["swiftc", "-emit-module", "foo.swift"])
Expand Down