Bug 1805536 - Align TSAN scheduling more closely with ASAN and enable…

… more passing suites. r=webdriver-reviewers,jmaher Differential Revision: https://phabricator.services.mozilla.com/D164600
Brli · Dec 14, 2022 · 52594ff · 52594ff
1 parent b320782
commit 52594ff
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 25 deletions.
diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
@@ -42,7 +42,10 @@ cppunit:
     tier: default
     run-on-projects:
         by-variant:
-            1proc: built-projects
+            1proc:
+                by-test-platform:
+                    .*tsan.*: []
+                    default: built-projects
             default: []
 
 gtest:
@@ -56,6 +59,7 @@ gtest:
                 by-test-platform:
                     .*android.*: built-projects
                     .*-devedition.*/.*: []  # don't run on devedition
+                    .*tsan.*: []
                     linux1804-32-qr/opt: []  # try only, shippable on m-c
                     linux1804-32-qr/debug: ['mozilla-central']  # try and m-c
                     linux1804-32-shippable-qr/opt: ['mozilla-central']  # try and m-c

diff --git a/taskcluster/ci/test/marionette.yml b/taskcluster/ci/test/marionette.yml
@@ -36,7 +36,10 @@ job-defaults:
                 by-test-platform:
                     .*/debug: built-projects
                     default: []
-            default: built-projects
+            default:
+                by-test-platform:
+                    .*tsan.*: []
+                    default: built-projects
     virtualization: virtual
 
 marionette:

diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
@@ -321,7 +321,10 @@ mochitest-chrome:
                     android-em-7.0-x86_64-qr/debug: built-projects
                     linux.*64-qr/debug: built-projects
                     default: []
-            1proc: built-projects
+            1proc:
+                by-test-platform:
+                    .*-tsan-qr/opt: []
+                    default: built-projects
     chunks:
         by-test-platform:
             .*(-ccov|-qr).*/.*: 3
@@ -378,6 +381,7 @@ mochitest-devtools-chrome:
             default:
                 by-test-platform:
                     android.*: []
+                    .*-tsan-qr/opt: []
                     linux.*64-ccov-qr/opt: []
                     default: built-projects
     tier: default
@@ -670,6 +674,7 @@ mochitest-webgl1-core:
             webgl-ipc:
                 by-test-platform:
                     .*-ccov.*: []
+                    .*-tsan.*: []
                     linux.*-64.*: ["trunk"]
                     mac.*: ["trunk"]
                     win.*: ["trunk"]
@@ -697,6 +702,7 @@ mochitest-webgl1-core:
             default:
                 by-test-platform:
                     android.*: []
+                    .*-tsan.*: []
                     default: built-projects
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
     allow-software-gl-layers: false
@@ -729,6 +735,7 @@ mochitest-webgl1-ext:
             webgl-ipc:
                 by-test-platform:
                     .*-ccov.*: []
+                    .*-tsan.*: []
                     linux.*-64.*: built-projects
                     mac.*: ["trunk"]
                     windows10-64-2004.*: built-projects
@@ -756,6 +763,7 @@ mochitest-webgl1-ext:
             default:
                 by-test-platform:
                     android.*: []
+                    .*-tsan.*: []
                     default: built-projects
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
     allow-software-gl-layers: false
@@ -789,6 +797,7 @@ mochitest-webgl2-core:
             webgl-ipc:
                 by-test-platform:
                     .*-ccov.*/.*: []
+                    .*-tsan.*: []
                     android.*: []
                     linux.*-64.*: ["trunk"]
                     mac.*: ["trunk"]
@@ -817,6 +826,7 @@ mochitest-webgl2-core:
             default:
                 by-test-platform:
                     android.*: []
+                    .*-tsan.*: []
                     default: built-projects
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
     allow-software-gl-layers: false
@@ -840,6 +850,7 @@ mochitest-webgl2-ext:
             webgl-ipc:
                 by-test-platform:
                     .*ccov.*/.*: []
+                    .*-tsan.*: []
                     linux.*-64.*: ["trunk"]
                     mac.*: ["trunk"]
                     win.*: ["trunk"]
@@ -865,6 +876,7 @@ mochitest-webgl2-ext:
             default:
                 by-test-platform:
                     android.*: []
+                    .*-tsan.*: []
                     default: built-projects
     chunks: 4
     test-manifest-loader: null  # don't load tests in the taskgraph

diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml
@@ -119,6 +119,7 @@ jsreftest:
             linux1804-64-qr/opt: 4
             linux1804-64-qr/debug: 5
             linux1804-64/debug: 5
+            .*-tsan-qr/opt: 8
             macosx.*-64-ccov.*/.*: 5
             macosx.*-64(-shippable)?/opt: 2
             default: 3

diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
@@ -37,11 +37,6 @@ linux1804-32-shippable-qr/opt:
         - linux32-tests
         - linux32-gtest
 
-linux1804-64-tsan-qr/opt:
-    build-platform: linux64-tsan/opt
-    test-sets:
-        - linux-tsan-tests
-
 linux1804-64-qr/opt:
     build-platform: linux64/opt
     test-sets:
@@ -84,6 +79,13 @@ linux1804-64-asan-qr/opt:
         - mochitest-webgpu
         - web-platform-tests
 
+linux1804-64-tsan-qr/opt:
+    build-platform: linux64-tsan/opt
+    test-sets:
+        - linux1804-tests
+        - mochitest-webgpu
+        - web-platform-tests
+
 linux1804-64-ccov-qr/opt:
     build-platform: linux64-ccov/opt
     test-sets:

diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
@@ -425,16 +425,3 @@ android-hw-browsertime:
 
 android-hw-browsertime-profiling:
     - browsertime-tp6m-profiling
-
-linux-tsan-tests:
-    - crashtest
-    - mochitest-a11y
-    - mochitest-browser-a11y
-    - mochitest-browser-chrome
-    - mochitest-media
-    - mochitest-plain
-    - mochitest-webgpu
-    - reftest
-    - web-platform-tests
-    - web-platform-tests-reftest
-    - xpcshell
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
@@ -258,6 +258,7 @@ web-platform-tests-wdspec:
             headless:
                 by-test-platform:
                     android.*: []
+                    .*-tsan.*: []
                     default: built-projects
             no-fission:
                 by-test-platform:
@@ -268,6 +269,7 @@ web-platform-tests-wdspec:
             default:
                 by-test-platform:
                     android.*: []
+                    .*-tsan.*: []
                     default: built-projects
     tier: default
     fetches:

diff --git a/testing/firefox-ui/tests/functional/safebrowsing/manifest.ini b/testing/firefox-ui/tests/functional/safebrowsing/manifest.ini
@@ -1,8 +1,6 @@
 [test_initial_download.py]
 skip-if =
-  debug
-  asan
-  (cc_type == 'clang' && os == 'win')
-  (os == 'win' && bits == 64 && !debug && processor == 'x86_64') # the GAPI key isn't available in debug or asan builds, bug 1526450
+  (debug || asan || tsan) # The GAPI key isn't available in debug or sanitizer builds
+  (cc_type == 'clang' && os == 'win') # Bug 1565818
 [test_notification.py]
 [test_warning_pages.py]