Skip to content

Commit 6f95e63

Browse files
committed
[Commands] Fix a bad merge
1 parent 252fbcc commit 6f95e63

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Sources/Commands/GenerateLinuxMain.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,10 @@ final class LinuxMainGenerator {
6262
for klass in module.classes.lazy.sorted(by: { $0.name < $1.name }) {
6363
stream <<< "\n"
6464
stream <<< "extension " <<< klass.name <<< " {" <<< "\n"
65-
stream <<< indent(4) <<< "static let __allTests__\(klass.name) = [" <<< "\n"
6665
stream <<< indent(4) <<< "// DO NOT MODIFY: This is autogenerated, use: \n"
6766
stream <<< indent(4) <<< "// `swift test --generate-linuxmain`\n"
6867
stream <<< indent(4) <<< "// to regenerate.\n"
69-
stream <<< indent(4) <<< "static let __allTests = [" <<< "\n"
68+
stream <<< indent(4) <<< "static let __allTests__\(klass.name) = [" <<< "\n"
7069
for method in klass.methods {
7170
stream <<< indent(8) <<< "(\"\(method)\", \(method))," <<< "\n"
7271
}

Tests/FunctionalTests/MiscellaneousTests.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,21 +405,19 @@ class MiscellaneousTestCase: XCTestCase {
405405
import XCTest
406406
407407
extension ParallelTestsFailureTests {
408-
static let __allTests__ParallelTestsFailureTests = [
409408
// DO NOT MODIFY: This is autogenerated, use:
410409
// `swift test --generate-linuxmain`
411410
// to regenerate.
412-
static let __allTests = [
411+
static let __allTests__ParallelTestsFailureTests = [
413412
("testSureFailure", testSureFailure),
414413
]
415414
}
416415
417416
extension ParallelTestsTests {
418-
static let __allTests__ParallelTestsTests = [
419417
// DO NOT MODIFY: This is autogenerated, use:
420418
// `swift test --generate-linuxmain`
421419
// to regenerate.
422-
static let __allTests = [
420+
static let __allTests__ParallelTestsTests = [
423421
("testExample1", testExample1),
424422
("testExample2", testExample2),
425423
]

0 commit comments

Comments
 (0)