Skip to content

Commit 543075e

Browse files
committed
Footest -> FooTestSuite for test module names
I'd prefer a more elaborate diagnostic here where we decide to camelcase or snake_case based on the module name. Then c99name should be the same smartness.
1 parent 66c9fb2 commit 543075e

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

Sources/PackageType/Module.swift

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public class Module {
3131
public var recursiveDependencies: [Module] {
3232
return PackageType.recursiveDependencies(dependencies)
3333
}
34+
35+
public var c99name: String {
36+
return PackageType.c99name(name: name)
37+
}
3438
}
3539

3640
extension Module: Hashable, Equatable {
@@ -73,11 +77,15 @@ public class CModule: Module {
7377
public class TestModule: SwiftModule {
7478

7579
public init(basename: String, sources: Sources) {
76-
super.init(name: "\(basename).test", sources: sources)
80+
super.init(name: "\(basename).testsuite", sources: sources)
7781
}
7882

7983
public var basename: String {
80-
return String(name.characters.dropLast(5))
84+
return String(name.characters.dropLast(10))
85+
}
86+
87+
override public var c99name: String {
88+
return PackageType.c99name(name: basename) + "TestSuite"
8189
}
8290
}
8391

Sources/PackageType/Module+c99name.swift renamed to Sources/PackageType/c99name().swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
See http://swift.org/CONTRIBUTORS.txt for Swift project authors
99
*/
1010

11-
extension Module {
1211
/**
1312
Removes characters from name that are invalid in C99 module-names.
1413
*/
15-
public var c99name: String {
14+
func c99name(name name: String) -> String {
1615
var mapped = name.unicodeScalars.filter {
1716
switch $0.value {
1817
case// a-z A-Z 0-9 _
@@ -206,4 +205,3 @@ public var c99name: String {
206205
// String(mapped) AND map(String.init) didn't work ¯\_(ツ)_/¯
207206
return mapped.reduce(""){ $0 + String($1) }
208207
}
209-
}

Sources/Xcodeproj/generate().swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public func generate(path path: String, package: Package, modules: [SwiftModule]
2727
}
2828

2929
////// the scheme acts like an aggregate target for all our targets
30-
/// it also allows has all tests associated
30+
/// it has all tests associated so CMD+U works
3131
try open(schemedir, "\(package.name).xcscheme") { fwrite in
3232
xcscheme(packageName: package.name, modules: modules, printer: fwrite)
3333
}

Tests/Functional/TestModuleMaps.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private let dylib = "so"
2222
class ModuleMapsTestCase: XCTestCase {
2323

2424
private func fixture(name name: String, CModuleName: String, rootpkg: String, body: (String, [String]) throws -> Void) {
25-
Functionaltest.fixture(name: name) { prefix in
25+
FunctionalTestSuite.fixture(name: name) { prefix in
2626
let input = Path.join(prefix, CModuleName, "C/foo.c")
2727
let outdir = try mkdir(prefix, rootpkg, ".build/debug")
2828
let output = Path.join(outdir, "libfoo.\(dylib)")

0 commit comments

Comments
 (0)