Skip to content

Commit 2e67414

Browse files
committed
mir_2_15: Apply patch to skip known-flaky tests
Not sure why this is getting hit consistently on my end now. Maybe due to wlcs bump?
1 parent cc5a26b commit 2e67414

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

pkgs/servers/mir/default.nix

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,24 @@ in
3737
hash = "sha256-QuVZBcHSn/DK+xbjM36Y89+w22vk7NRV4MkbjgvS28A=";
3838
})
3939

40+
# Exclude known-flaky tests
41+
# Remove when version > 2.15.0
42+
(fetchpatch {
43+
name = "0004-mir-exclude-tests-surfaces_with_exclusive_zone_set_to_negative_one_do_not_respect_other_exclusive_zones-1.patch";
44+
url = "https://github.com/canonical/mir/commit/967d872daab50d845adce389c0672edfd18b90c9.patch";
45+
hash = "sha256-XfTWQj+fmPpC1hIqt7ELGU6Yq2wJSO+FQ8bsikI5h0I=";
46+
})
47+
(fetchpatch {
48+
name = "0005-mir-exclude-tests-surfaces_with_exclusive_zone_set_to_negative_one_do_not_respect_other_exclusive_zones-2.patch";
49+
url = "https://github.com/canonical/mir/commit/932d8744852bca9830668018474890bce0c5f6d6.patch";
50+
hash = "sha256-+udEt6pF5VLSBtRgo9r1YdVsinARWLAL4AeEG01DV68=";
51+
})
52+
(fetchpatch {
53+
name = "0006-mir-exclude-tests-surfaces_with_exclusive_zone_set_to_negative_one_do_not_respect_other_exclusive_zones-3.patch";
54+
url = "https://github.com/canonical/mir/commit/fbad5e50be02992f6cf1f41f928950532f3f62c5.patch";
55+
hash = "sha256-J0YEhXf8sAWEHHxU7QKSJjOoHiXsYqotBfgGm79X6GA=";
56+
})
57+
4058
# Fix ignored return value of std::lock_guard
4159
# Remove when version > 2.15.0
4260
# Was changed as part of the big platform API change, no individual upstream commit with this fix

0 commit comments

Comments
 (0)