Skip to content

Commit be4822e

Browse files
authored
Do not require --enable-test-discovery anymore on Linux (#3579)
We have made the flag default a while ago, so we can assume that it'll be passed as default.
1 parent b95aa03 commit be4822e

File tree

5 files changed

+3
-6
lines changed

5 files changed

+3
-6
lines changed

IntegrationTests/Tests/LinuxMain.swift

Lines changed: 0 additions & 1 deletion
This file was deleted.

Tests/LinuxMain.swift

Lines changed: 0 additions & 1 deletion
This file was deleted.

Utilities/Docker/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ services:
4848

4949
test:
5050
<<: *common
51-
command: /bin/bash -cl "swift test --enable-test-discovery --parallel"
51+
command: /bin/bash -cl "swift test --parallel"
5252

5353
bootstrap-clean:
5454
<<: *common

Utilities/bootstrap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ def test(args):
335335
note("Testing")
336336
parse_test_args(args)
337337
cmd = [os.path.join(args.bin_dir, "swift-test")]
338-
cmd.append("--enable-test-discovery")
339338
if args.parallel:
340339
cmd.append("--parallel")
341340
for arg in args.filter:

Utilities/build-using-self

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ set -x
1515
# Perform package update in order to get the latest commits for the dependencies.
1616
swift package update
1717
swift build -c $CONFIGURATION
18-
swift test -c $CONFIGURATION --parallel --enable-test-discovery
18+
swift test -c $CONFIGURATION --parallel
1919

2020
# Run the integration tests with just built SwiftPM.
2121
export SWIFTPM_BIN_DIR=$(swift build -c $CONFIGURATION --show-bin-path)
2222
cd IntegrationTests
23-
$SWIFTPM_BIN_DIR/swift-test --parallel --enable-test-discovery
23+
$SWIFTPM_BIN_DIR/swift-test --parallel

0 commit comments

Comments
 (0)