Skip to content

Commit b27dc34

Browse files
authored
fix a warning on linux (#3947)
motivation: less warngings, happier developers changes: * use package identity instead of deprecated manifest name
1 parent 739c587 commit b27dc34

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Sources/PackageLoading/PackageBuilder.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,13 +1167,13 @@ public final class PackageBuilder {
11671167
// Collect all test targets.
11681168
let testModules = targets.filter({ target in
11691169
guard target.type == .test else { return false }
1170-
#if os(Linux)
1170+
#if os(Linux)
11711171
// FIXME: Ignore C language test targets on linux for now.
11721172
if target is ClangTarget {
1173-
self.observabilityScope.emit(.unsupportedCTestTarget(package: manifest.name, target: target.name))
1173+
self.observabilityScope.emit(.unsupportedCTestTarget(package: self.identity.description, target: target.name))
11741174
return false
11751175
}
1176-
#endif
1176+
#endif
11771177
return true
11781178
})
11791179

Tests/PackageGraphTests/PubgrubTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2329,7 +2329,7 @@ class DependencyGraphBuilder {
23292329
}
23302330
for (product, filteredDependencies) in dependencies {
23312331
let packageDependencies: [MockContainer.Dependency] = filteredDependencies.map {
2332-
(container: reference(for: $0), requirement: $1.0, products: $1.1)
2332+
(container: reference(for: $0), requirement: $1.0, productFilter: $1.1)
23332333
}
23342334
container.dependencies[version.description, default: [:]][product, default: []] += packageDependencies
23352335
}

Tests/PackageLoadingTests/PackageBuilderTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,14 @@ class PackageBuilderTests: XCTestCase {
140140

141141
package.checkProduct("MyPackage") { _ in }
142142

143-
#if os(Linux)
143+
#if os(Linux)
144144
diagnostics.check(
145-
diagnostic: "ignoring target 'MyPackageTests' in package 'MyPackage'; C language in tests is not yet supported",
145+
diagnostic: "ignoring target 'MyPackageTests' in package '\(package.packageIdentity)'; C language in tests is not yet supported",
146146
severity: .warning
147147
)
148-
#elseif os(macOS) || os(Android)
148+
#elseif os(macOS) || os(Android)
149149
package.checkProduct("MyPackagePackageTests") { _ in }
150-
#endif
150+
#endif
151151
}
152152
}
153153

0 commit comments

Comments
 (0)