Skip to content

Commit

Permalink
Bump toolchain, use --enable-test-discovery (#130)
Browse files Browse the repository at this point in the history
In the latest 5.3 toolchain all known issues with IndexStoreDB and SwiftPM support were resolved.

Resolves the second point of #42.

Thanks to this you no longer need to maintain `LinuxMain.swift` and `XCTestManifests.swift` files in your test suites, so these are deleted from the test app `Tests` directory.
  • Loading branch information
MaxDesiatov authored Oct 20, 2020
1 parent fc14c28 commit 703078d
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
{
"package": "swift-argument-parser",
"repositoryURL": "https://github.com/apple/swift-argument-parser",
"repositoryURL": "https://github.com/apple/swift-argument-parser.git",
"state": {
"branch": null,
"revision": "92646c0cdbaca076c8d3d0207891785b3379cbff",
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.1.1"),
.package(
url: "https://github.com/apple/swift-argument-parser",
url: "https://github.com/apple/swift-argument-parser.git",
.upToNextMinor(from: "0.3.0")
),
.package(
Expand Down
2 changes: 1 addition & 1 deletion Sources/CartonHelpers/DefaultToolchain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
// See the License for the specific language governing permissions and
// limitations under the License.

public let defaultToolchainVersion = "wasm-5.3-SNAPSHOT-2020-10-13-a"
public let defaultToolchainVersion = "wasm-5.3-SNAPSHOT-2020-10-15-a"
2 changes: 1 addition & 1 deletion Sources/SwiftToolchain/Toolchain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public final class Toolchain {

let builderArguments = try [
swiftPath.pathString, "build", "-c", isRelease ? "release" : "debug", "--build-tests",
"--destination", inferDestinationPath().pathString,
"--enable-test-discovery", "--destination", inferDestinationPath().pathString,
"-Xswiftc", "-color-diagnostics",
]

Expand Down
8 changes: 0 additions & 8 deletions TestApp/Tests/LinuxMain.swift

This file was deleted.

18 changes: 0 additions & 18 deletions TestApp/Tests/Tests/XCTestManifests.swift

This file was deleted.

0 comments on commit 703078d

Please sign in to comment.