From bd6ee3c71c64586babdbfc9938f3d96257af502b Mon Sep 17 00:00:00 2001
From: Michelle Goossens <michelle@masterwayz.nl>
Date: Tue, 9 Nov 2021 12:55:22 +0000
Subject: [PATCH] Bug 1727943 - Re-enable Windows 10 x64 2004 CCov tests that
 were forgotten r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D130715
---
 .../test/reftest/color_quads/reftest.list     |  2 +-
 gfx/layers/apz/test/reftest/reftest.list      |  4 ++--
 layout/reftests/bugs/reftest.list             | 12 ++++++------
 taskcluster/ci/test/mochitest.yml             |  1 +
 taskcluster/ci/test/test-platforms.yml        |  3 +++
 taskcluster/ci/test/test-sets.yml             | 19 -------------------
 6 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/dom/media/test/reftest/color_quads/reftest.list b/dom/media/test/reftest/color_quads/reftest.list
index 2c12b7705098..9979d92aeb9e 100644
--- a/dom/media/test/reftest/color_quads/reftest.list
+++ b/dom/media/test/reftest/color_quads/reftest.list
@@ -17,7 +17,7 @@ defaults pref(media.av1.enabled,true)
 fuzzy(16-50,5234-5622) fuzzy-if(swgl,32-38,1600-91746) fuzzy-if(useDrawSnapshot,16-16,11600-11600) fuzzy-if(OSX,16-73,5212-5622) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm ../reftest_img.html?src=color_quads/720p.png
 fuzzy-if(Android,254-255,273680-273807) fuzzy-if(appleSilicon,30-48,1760-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.vp9.webm  ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm
 == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.mp4   ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm
-fuzzy(0-2,75-225) fuzzy-if(Android,254-255,273680-273807) fuzzy-if(OSX,30-32,187326-187407) fuzzy-if(appleSilicon,30-48,1835-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.h264.mp4 ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm
+skip-if(winWidget&&isCoverageBuild) fuzzy(0-2,75-225) fuzzy-if(Android,254-255,273680-273807) fuzzy-if(OSX,30-32,187326-187407) fuzzy-if(appleSilicon,30-48,1835-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.h264.mp4 ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm
 fuzzy(0-1,0-75) fuzzy-if(Android,254-255,273680-273807) fuzzy-if(appleSilicon,30-48,1760-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.vp9.mp4   ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm
 
 skip-if(Android) fuzzy(16-48,8349-8818) fuzzy-if(winWidget&&swgl,31-38,8240-184080) fuzzy-if(appleSilicon,33-38,8819-11705) fuzzy-if(useDrawSnapshot,20-20,187200-187200) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.pc.yuv420p.av1.webm ../reftest_img.html?src=color_quads/720p.png
diff --git a/gfx/layers/apz/test/reftest/reftest.list b/gfx/layers/apz/test/reftest/reftest.list
index 9165fac797ac..91c7be97159b 100644
--- a/gfx/layers/apz/test/reftest/reftest.list
+++ b/gfx/layers/apz/test/reftest/reftest.list
@@ -32,8 +32,8 @@ skip-if(!asyncPan) == frame-reconstruction-scroll-clamping.html frame-reconstruc
 
 # Test that position:fixed and position:sticky elements are attached to the
 # layout viewport.
-fuzzy-if(winWidget&&isCoverageBuild,1-1,24-24) pref(apz.allow_zooming,true) == pinch-zoom-position-fixed.html pinch-zoom-position-fixed-ref.html
-fuzzy-if(winWidget&&isCoverageBuild,1-1,24-24) pref(apz.allow_zooming,true) == pinch-zoom-position-sticky.html pinch-zoom-position-sticky-ref.html
+skip-if(winWidget&&isCoverageBuild) pref(apz.allow_zooming,true) == pinch-zoom-position-fixed.html pinch-zoom-position-fixed-ref.html
+skip-if(winWidget&&isCoverageBuild) pref(apz.allow_zooming,true) == pinch-zoom-position-sticky.html pinch-zoom-position-sticky-ref.html
 
 pref(apz.allow_zooming,true) == iframe-zoomed.html iframe-zoomed-ref.html
 pref(apz.allow_zooming,true) == scaled-iframe-zoomed.html scaled-iframe-zoomed-ref.html
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index cb1b5e7095ed..d4925e1b0537 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1143,13 +1143,13 @@ random == 445004-1.html 445004-1-ref.html # bug 472268
 == 445142-1c.html 445142-1-ref.html
 == 445142-2a.html 445142-2-ref.html
 == 445142-2b.html 445142-2-ref.html
-fuzzy-if(winWidget&&isCoverageBuild,87-87,73-73) fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1a.html about:blank
+skip-if(winWidget&&isCoverageBuild) fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1a.html about:blank
 fuzzy-if(winWidget&&isCoverageBuild,178-178,127-127) fails-if(Android) fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1b.html about:blank
-fuzzy-if(winWidget&&isCoverageBuild,172-172,192-192) fails-if(Android) fails-if(usesRepeatResampling) fails-if(!winWidget) fails-if(useDrawSnapshot) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1c.html about:blank
-fuzzy-if(winWidget&&isCoverageBuild,112-112,212-212) fails-if(usesRepeatResampling) fails-if(!winWidget) fails-if(useDrawSnapshot) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1d.html about:blank
-fuzzy-if(winWidget&&isCoverageBuild,32-32,35-35) fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1e.html about:blank
+skip-if(winWidget&&isCoverageBuild) fails-if(useDrawSnapshot) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1c.html about:blank
+skip-if(winWidget&&isCoverageBuild) fails-if(usesRepeatResampling) fails-if(!winWidget) fails-if(useDrawSnapshot) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1d.html about:blank
+skip-if(winWidget&&isCoverageBuild) fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1e.html about:blank
 == 446100-1f.html about:blank
-fuzzy-if(winWidget&&isCoverageBuild,141-141,19-19) fails-if(usesRepeatResampling) fails-if(Android) fails-if(!useDrawSnapshot&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1g.html about:blank
+fails-if(winWidget&&isCoverageBuild) fails-if(usesRepeatResampling) fails-if(Android) fails-if(!useDrawSnapshot&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 446100-1g.html about:blank
 == 446100-1h.html about:blank
 == 447749-1.html 447749-1-ref.html
 fuzzy(0-127,0-2) == 448193.html 448193-ref.html
@@ -2027,7 +2027,7 @@ fuzzy(0-255,0-4054) == 1415987-1.html 1415987-1-ref.html # this is a large fuzz,
 == 1419820-1.html 1419820-1-ref.html
 == 1420946-1.html 1420946-1-ref.html
 == 1422393.html 1422393-ref.html
-fuzzy-if(winWidget&&isCoverageBuild,1-1,4-4) == 1424177.html 1424177-ref.html
+skip-if(winWidget&&isCoverageBuild) == 1424177.html 1424177-ref.html
 == 1424680.html 1424680-ref.html
 == 1424798-1.html 1424798-ref.html
 == 1425243-1.html 1425243-1-ref.html
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index e237d66d30ea..07c71b4392e2 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -966,6 +966,7 @@ mochitest-webgl2-core:
                     default: []
             default:
                 by-test-platform:
+                    windows10-64-2004-ccov.*/.*: []  # Bug 1727943 / Bug 1740155
                     .*-tsan-qr/opt: ['trunk']
                     android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
                     android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 65a907c2680e..e914605818dd 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -203,7 +203,10 @@ windows10-64-shippable-qr/opt:
 windows10-64-2004-ccov-qr/opt:
     build-platform: win64-ccov/opt
     test-sets:
+        - desktop-screenshot-capture
+        - ccov-code-coverage-tests
         - windows10-64-2004-ccov-tests
+        - windows10-2004-tests
 
 windows10-64-2004-qr/debug:
     build-platform: win64/debug
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 3f0032e308a2..f5df2ee78fc7 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -205,12 +205,6 @@ windows32-2004-tests:
     - test-verify-gpu
     - test-verify-wpt
 
-windows-ccov-tests:
-    # jittest run on regular windows builds is redundant with SM(p), so we omit
-    # it from the windows-tests set. But, we still want to run it on ccov builds,
-    # so we have this set that has it and which runs on ccov builds.
-    - jittest
-
 windows10-2004-tests:
     - cppunit
     - crashtest
@@ -241,26 +235,13 @@ windows10-2004-tests:
     - xpcshell
 
 windows10-64-2004-ccov-tests:
-    - cppunit
-    - crashtest
-    - gtest
     - jittest
-    - jsreftest
-    - marionette
-    - mochitest-browser-chrome
-    - mochitest-devtools-chrome
-    - mochitest-plain
-    - mochitest-remote
-    - reftest
     - test-coverage
-    - test-verify
-    - test-verify-gpu
     - web-platform-tests
     - web-platform-tests-crashtest
     - web-platform-tests-print-reftest
     - web-platform-tests-reftest
     - web-platform-tests-wdspec
-    - xpcshell
 
 windows10-64-2004-failure-tests:
     - mochitest-browser-chrome-failures