From be4822efc184b61c526d46d4972c87f769f91e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Boris=20B=C3=BCgling?= <bbuegling@apple.com>
Date: Wed, 30 Jun 2021 09:51:04 -0700
Subject: [PATCH] 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.
---
 IntegrationTests/Tests/LinuxMain.swift | 1 -
 Tests/LinuxMain.swift                  | 1 -
 Utilities/Docker/docker-compose.yaml   | 2 +-
 Utilities/bootstrap                    | 1 -
 Utilities/build-using-self             | 4 ++--
 5 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 IntegrationTests/Tests/LinuxMain.swift
 delete mode 100644 Tests/LinuxMain.swift

diff --git a/IntegrationTests/Tests/LinuxMain.swift b/IntegrationTests/Tests/LinuxMain.swift
deleted file mode 100644
index a1e3520f52f..00000000000
--- a/IntegrationTests/Tests/LinuxMain.swift
+++ /dev/null
@@ -1 +0,0 @@
-fatalError("Use `swift test --enable-test-discovery` to run tests")
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
deleted file mode 100644
index a1e3520f52f..00000000000
--- a/Tests/LinuxMain.swift
+++ /dev/null
@@ -1 +0,0 @@
-fatalError("Use `swift test --enable-test-discovery` to run tests")
diff --git a/Utilities/Docker/docker-compose.yaml b/Utilities/Docker/docker-compose.yaml
index 139da3fc371..e70fb344767 100644
--- a/Utilities/Docker/docker-compose.yaml
+++ b/Utilities/Docker/docker-compose.yaml
@@ -48,7 +48,7 @@ services:
 
   test:
     <<: *common
-    command: /bin/bash -cl "swift test --enable-test-discovery --parallel"
+    command: /bin/bash -cl "swift test --parallel"
 
   bootstrap-clean:
     <<: *common
diff --git a/Utilities/bootstrap b/Utilities/bootstrap
index 68b2aa371a7..5d593a434dd 100755
--- a/Utilities/bootstrap
+++ b/Utilities/bootstrap
@@ -335,7 +335,6 @@ def test(args):
     note("Testing")
     parse_test_args(args)
     cmd = [os.path.join(args.bin_dir, "swift-test")]
-    cmd.append("--enable-test-discovery")
     if args.parallel:
         cmd.append("--parallel")
     for arg in args.filter:
diff --git a/Utilities/build-using-self b/Utilities/build-using-self
index 2d22685f9f8..5b8f57bf460 100755
--- a/Utilities/build-using-self
+++ b/Utilities/build-using-self
@@ -15,9 +15,9 @@ set -x
 # Perform package update in order to get the latest commits for the dependencies.
 swift package update
 swift build -c $CONFIGURATION
-swift test -c $CONFIGURATION --parallel --enable-test-discovery
+swift test -c $CONFIGURATION --parallel
 
 # Run the integration tests with just built SwiftPM.
 export SWIFTPM_BIN_DIR=$(swift build -c $CONFIGURATION --show-bin-path)
 cd IntegrationTests
-$SWIFTPM_BIN_DIR/swift-test --parallel --enable-test-discovery
+$SWIFTPM_BIN_DIR/swift-test --parallel