Skip to content

Commit 8567c87

Browse files
committed
[Commands] Fix sorting in LinuxMain.swift generation
1 parent 6b45ad4 commit 8567c87

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

Sources/Commands/GenerateLinuxMain.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ final class LinuxMainGenerator {
4343
for suite in testSuites {
4444
modulesBuilder.add(suite.tests)
4545
}
46-
let modules = modulesBuilder.build()
46+
let modules = modulesBuilder.build().sorted(by: { $0.name < $1.name })
4747

4848
// Generate manifest file for each test module we got from XCTest discovery.
49-
for module in modules.lazy.sorted(by: { $0.name < $1.name }) {
49+
for module in modules {
5050
guard let target = graph.reachableTargets.first(where: { $0.c99name == module.name }) else {
5151
print("warning: did not find target '\(module.name)'")
5252
continue

Tests/LinuxMain.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
import XCTest
22

3-
import UtilityTests
43
import BasicTests
54
import BuildTests
65
import CommandsTests
76
import FunctionalTests
8-
import PackageGraphTests
97
import POSIXTests
10-
import XcodeprojTests
11-
import SourceControlTests
12-
import WorkspaceTests
138
import PackageDescription4Tests
9+
import PackageGraphTests
1410
import PackageLoadingTests
1511
import PackageModelTests
12+
import SourceControlTests
1613
import TestSupportTests
14+
import UtilityTests
15+
import WorkspaceTests
16+
import XcodeprojTests
1717

1818
var tests = [XCTestCaseEntry]()
19-
tests += UtilityTests.__allTests()
2019
tests += BasicTests.__allTests()
2120
tests += BuildTests.__allTests()
2221
tests += CommandsTests.__allTests()
2322
tests += FunctionalTests.__allTests()
24-
tests += PackageGraphTests.__allTests()
2523
tests += POSIXTests.__allTests()
26-
tests += XcodeprojTests.__allTests()
27-
tests += SourceControlTests.__allTests()
28-
tests += WorkspaceTests.__allTests()
2924
tests += PackageDescription4Tests.__allTests()
25+
tests += PackageGraphTests.__allTests()
3026
tests += PackageLoadingTests.__allTests()
3127
tests += PackageModelTests.__allTests()
28+
tests += SourceControlTests.__allTests()
3229
tests += TestSupportTests.__allTests()
30+
tests += UtilityTests.__allTests()
31+
tests += WorkspaceTests.__allTests()
32+
tests += XcodeprojTests.__allTests()
3333

3434
XCTMain(tests)

0 commit comments

Comments
 (0)