Skip to content

Commit b651738

Browse files
author
Šimon Javora
committed
Added explicit target to SWIFTC_MAXIMUM_DETERMINISM diagnostic test to make it pass on Linux. Fixed inconsistent indentation.
1 parent 61700b5 commit b651738

File tree

1 file changed

+30
-27
lines changed

1 file changed

+30
-27
lines changed

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -150,48 +150,51 @@ final class SwiftDriverTests: XCTestCase {
150150

151151
func testMultithreading() throws {
152152

153-
XCTAssertEqual(try Driver(args: ["swiftc"]).numThreads, 0)
153+
XCTAssertEqual(try Driver(args: ["swiftc"]).numThreads, 0)
154154

155-
XCTAssertEqual(try Driver(args: ["swiftc", "-num-threads", "4"]).numThreads, 4)
155+
XCTAssertEqual(try Driver(args: ["swiftc", "-num-threads", "4"]).numThreads, 4)
156156

157-
XCTAssertEqual(try Driver(args: ["swiftc", "-num-threads", "0"]).numThreads, 0)
157+
XCTAssertEqual(try Driver(args: ["swiftc", "-num-threads", "0"]).numThreads, 0)
158158

159-
XCTAssertEqual(try Driver(args: ["swiftc", "-num-threads", "-1"]).numThreads, 0)
159+
XCTAssertEqual(try Driver(args: ["swiftc", "-num-threads", "-1"]).numThreads, 0)
160160

161-
XCTAssertEqual(try Driver(args: ["swiftc", "-enable-batch-mode", "-num-threads", "4"]).numThreads, 0)
161+
XCTAssertEqual(try Driver(args: ["swiftc", "-enable-batch-mode", "-num-threads", "4"]).numThreads, 0)
162162

163-
XCTAssertNil(try Driver(args: ["swiftc"]).numParallelJobs)
163+
XCTAssertNil(try Driver(args: ["swiftc"]).numParallelJobs)
164164

165-
XCTAssertEqual(try Driver(args: ["swiftc", "-j", "4"]).numParallelJobs, 4)
165+
XCTAssertEqual(try Driver(args: ["swiftc", "-j", "4"]).numParallelJobs, 4)
166166

167-
XCTAssertNil(try Driver(args: ["swiftc", "-j", "0"]).numParallelJobs)
167+
XCTAssertNil(try Driver(args: ["swiftc", "-j", "0"]).numParallelJobs)
168168

169-
XCTAssertEqual(
170-
try Driver(
171-
args: ["swiftc", "-j", "4", "-target", "x86_64-apple-macosx10.15"],
172-
env: ["SWIFTC_MAXIMUM_DETERMINISM": "1"]
173-
).numParallelJobs,
174-
1
175-
)
169+
XCTAssertEqual(
170+
try Driver(
171+
args: ["swiftc", "-j", "4", "-target", "x86_64-apple-macosx10.15"],
172+
env: ["SWIFTC_MAXIMUM_DETERMINISM": "1"]
173+
).numParallelJobs,
174+
1
175+
)
176176
}
177177

178178
func testMultithreadingDiagnostics() throws {
179179

180-
try assertDriverDiagnostics(args: "swift", "-num-threads", "-1") {
181-
$1.expect(.error_invalid_arg_value(arg: .numThreads, value: "-1"))
182-
}
180+
try assertDriverDiagnostics(args: "swift", "-num-threads", "-1") {
181+
$1.expect(.error_invalid_arg_value(arg: .numThreads, value: "-1"))
182+
}
183183

184-
try assertDriverDiagnostics(args: "swiftc", "-enable-batch-mode", "-num-threads", "4") {
185-
$1.expect(.warning("ignoring -num-threads argument; cannot multithread batch mode"))
186-
}
184+
try assertDriverDiagnostics(args: "swiftc", "-enable-batch-mode", "-num-threads", "4") {
185+
$1.expect(.warning("ignoring -num-threads argument; cannot multithread batch mode"))
186+
}
187187

188-
try assertDriverDiagnostics(args: "swiftc", "-j", "0") {
189-
$1.expect(.error_invalid_arg_value(arg: .j, value: "0"))
190-
}
188+
try assertDriverDiagnostics(args: "swiftc", "-j", "0") {
189+
$1.expect(.error_invalid_arg_value(arg: .j, value: "0"))
190+
}
191191

192-
try assertDriverDiagnostics(args: "swiftc", "-j", "8", env: ["SWIFTC_MAXIMUM_DETERMINISM": "1"]) {
193-
$1.expect(.remark("SWIFTC_MAXIMUM_DETERMINISM overriding -j"))
194-
}
192+
try assertDriverDiagnostics(
193+
args: "swiftc", "-j", "8", "-target", "x86_64-apple-macosx10.15",
194+
env: ["SWIFTC_MAXIMUM_DETERMINISM": "1"]
195+
) {
196+
$1.expect(.remark("SWIFTC_MAXIMUM_DETERMINISM overriding -j"))
197+
}
195198
}
196199

197200
func testDebugSettings() throws {

0 commit comments

Comments
 (0)