Skip to content

[benchmark] Fix the swiftpm based benchmark build. #20117

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.

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

Conversation

gottesmm
Copy link
Contributor

This does a few things:

  1. We were not updated for libProc's addition. I bumped the swiftpm version
    number to get the systemLibrary functionality (thanks Ankit).

  2. I split up a bunch of lines to help the typechecker out a little bit.

This does a few things:

1. We were not updated for libProc's addition. I bumped the swiftpm version
number to get the systemLibrary functionality (thanks Ankit).

2. I split up a bunch of lines to help the typechecker out a little bit.
@gottesmm gottesmm requested a review from aciidgh October 28, 2018 22:51
@gottesmm
Copy link
Contributor Author

This is NFC since this is only used for offline development in Xcode right now (hopefully we just switch to using this in general).

@gottesmm
Copy link
Contributor Author

@swift-ci smoke test

Copy link
Contributor

@aciidgh aciidgh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be further simplified but as you said one step at a time 😀

publicHeadersPath: "."),
] + singleSourceLibraries.map { x in
dependencies: [
.target(name: "TestsUtils"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use the shorthand and just use "TestsUtils" string directly. SwiftPM can figure out that you're referring to a target.

products.append(.library(name: "TestsUtils", type: .static, targets: ["TestsUtils"]))
products.append(.library(name: "DriverUtils", type: .static, targets: ["DriverUtils"]))
products.append(.library(name: "ObjectiveCTests", type: .static, targets: ["ObjectiveCTests"]))
products.append(.executable(name: "SwiftBench", targets: ["SwiftBench"]))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only need this product, rest can be discarded.

@gottesmm gottesmm merged commit 150ba13 into swiftlang:master Oct 29, 2018
@gottesmm gottesmm deleted the pr-7f73c70f7905834a15de56e075391e6b6ccaf491 branch October 29, 2018 05:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants