Skip to content

Commit 5e027e0

Browse files
committed
some changes, including executing tests sequentially
1 parent 562eb67 commit 5e027e0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Sources/_InternalTestSupport/misc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Foundation
14-
import XCTest
1514
import Basics
1615
import struct Foundation.URL
1716
#if os(macOS)
@@ -30,6 +29,7 @@ import struct SPMBuildCore.BuildParameters
3029
import TSCTestSupport
3130
import Workspace
3231
import func XCTest.XCTFail
32+
import func XCTest.XCTSkip
3333

3434
import struct TSCBasic.ByteString
3535
import struct Basics.AsyncProcessResult

Utilities/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Here are some steps the worked running on Windows.
66
2. Launch a `Powershell.exe` session
77
3. Run the following in power shell to start a container running the nightly toolchain
88
```
9-
docker run --rm --interactive --tty swiftlang/swift:nightly-main-windowsservercore-1809 powershell.exe
9+
docker run --pull always --rm --interactive --tty swiftlang/swift:nightly-main-windowsservercore-1809 powershell.exe
1010
```
1111
4. When the container start, clone the "merged" PR to `C:\source`
1212
```
@@ -20,5 +20,5 @@ Here are some steps the worked running on Windows.
2020
```
2121
5. Run the CI pipeline script
2222
```
23-
python C:\source\Utilities\build-using-self
23+
python C:\source\Utilities\build-using-self --enable-swift-testing --enable-xctest
2424
```

Utilities/build-using-self

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def main() -> None:
157157
swift_testing_arg= "--enable-swift-testing" if args.enable_swift_testing else ""
158158
xctest_arg= "--enable-xctest" if args.enable_swift_testing else ""
159159
call(
160-
shlex.split(f"swift test --configuration {args.config} --parallel {swift_testing_arg} {xctest_arg}"),
160+
shlex.split(f"swift test --configuration {args.config} {swift_testing_arg} {xctest_arg}"),
161161
)
162162

163163
with change_directory(REPO_ROOT_PATH / "IntegrationTests"):
@@ -166,7 +166,7 @@ def main() -> None:
166166
)
167167
call(
168168
shlex.split(
169-
f"{swiftpm_bin_dir / 'swift-test'} --parallel",
169+
f"{swiftpm_bin_dir / 'swift-test'}",
170170
posix=(os.name == "posix"), # must be set correctly, otherwhsie shlex.split("C:\\Foo\\bar") become ['CFoobar']
171171
),
172172
)

0 commit comments

Comments
 (0)