From 223730a5227532b9590f412230a774a68b123a6c Mon Sep 17 00:00:00 2001
From: Johannes Weiss <johannesweiss@apple.com>
Date: Tue, 16 May 2023 09:48:24 +0100
Subject: [PATCH] try TSan

---
 docker/docker-compose.2004.56.yaml   | 2 +-
 docker/docker-compose.2204.57.yaml   | 2 +-
 docker/docker-compose.2204.58.yaml   | 2 +-
 docker/docker-compose.2204.59.yaml   | 2 +-
 docker/docker-compose.2204.main.yaml | 2 +-
 docker/docker-compose.yaml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/docker-compose.2004.56.yaml b/docker/docker-compose.2004.56.yaml
index 3dd42379a2..55223052b9 100644
--- a/docker/docker-compose.2004.56.yaml
+++ b/docker/docker-compose.2004.56.yaml
@@ -70,7 +70,7 @@ services:
       - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=161050
       - FORCE_TEST_DISCOVERY=--enable-test-discovery
       - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
-      # - SANITIZER_ARG=--sanitize=thread # TSan broken still
+      - SANITIZER_ARG=--sanitize=thread
 
   performance-test:
     image: swift-nio:20.04-5.6
diff --git a/docker/docker-compose.2204.57.yaml b/docker/docker-compose.2204.57.yaml
index 39b15068af..55c2c72aec 100644
--- a/docker/docker-compose.2204.57.yaml
+++ b/docker/docker-compose.2204.57.yaml
@@ -70,7 +70,7 @@ services:
       - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=167050
       - FORCE_TEST_DISCOVERY=--enable-test-discovery
       - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
-      # - SANITIZER_ARG=--sanitize=thread # TSan broken still
+      - SANITIZER_ARG=--sanitize=thread
 
   performance-test:
     image: swift-nio:22.04-5.7
diff --git a/docker/docker-compose.2204.58.yaml b/docker/docker-compose.2204.58.yaml
index 3ae00f8b3a..f3c8bd723e 100644
--- a/docker/docker-compose.2204.58.yaml
+++ b/docker/docker-compose.2204.58.yaml
@@ -71,7 +71,7 @@ services:
       - FORCE_TEST_DISCOVERY=--enable-test-discovery
       - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
       - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
-      # - SANITIZER_ARG=--sanitize=thread # TSan broken still
+      - SANITIZER_ARG=--sanitize=thread
 
   performance-test:
     image: swift-nio:22.04-5.8
diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml
index ab8605d029..e9513dc16d 100644
--- a/docker/docker-compose.2204.59.yaml
+++ b/docker/docker-compose.2204.59.yaml
@@ -70,7 +70,7 @@ services:
       - FORCE_TEST_DISCOVERY=--enable-test-discovery
       - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
       - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
-      # - SANITIZER_ARG=--sanitize=thread # TSan broken still
+      - SANITIZER_ARG=--sanitize=thread
 
   performance-test:
     image: swift-nio:22.04-5.9
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
index eb1a805ac9..94abbf6b1a 100644
--- a/docker/docker-compose.2204.main.yaml
+++ b/docker/docker-compose.2204.main.yaml
@@ -70,7 +70,7 @@ services:
       - FORCE_TEST_DISCOVERY=--enable-test-discovery
       - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
       - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
-      # - SANITIZER_ARG=--sanitize=thread # TSan broken still
+      - SANITIZER_ARG=--sanitize=thread
 
   performance-test:
     image: swift-nio:22.04-main
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 2430ae0324..8bf9b4adb6 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -40,7 +40,7 @@ services:
 
   test:
     <<: *common
-    command: /bin/bash -xcl "swift $${SWIFT_TEST_VERB-test} $${FORCE_TEST_DISCOVERY-} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && ./scripts/integration_tests.sh $${INTEGRATION_TESTS_ARG-}"
+    command: /bin/bash -xcl "uname -a && swift -version && swift $${SWIFT_TEST_VERB-test} $${FORCE_TEST_DISCOVERY-} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && ./scripts/integration_tests.sh $${INTEGRATION_TESTS_ARG-}"
 
   performance-test:
     <<: *common