From 7e8754f52400af3abd02d9a9fbfc305ac82b2727 Mon Sep 17 00:00:00 2001 From: Timothy Nikkel Date: Sun, 21 Apr 2024 21:37:49 +0000 Subject: [PATCH] Bug 1864255. Move crashtests that leave window(s) open to the very end. r=dholbert,frontend-codestyle-reviewers Differential Revision: https://phabricator.services.mozilla.com/D193654 --- .eslintignore | 1 + .stylelintignore | 1 + dom/base/crashtests/1419902.html | 24 +--------- dom/base/crashtests/crashtests.list | 2 +- layout/generic/crashtests/crashtests.list | 2 +- layout/printing/crashtests/1758199-1.html | 55 +--------------------- layout/printing/crashtests/crashtests.list | 2 +- testing/crashtest/crashtests.list | 3 ++ testing/crashtest/final/1419902.html | 34 +++++++++++++ testing/crashtest/final/1758199-1.html | 54 +++++++++++++++++++++ testing/crashtest/final/crashtests.list | 8 ++++ 11 files changed, 106 insertions(+), 80 deletions(-) create mode 100644 testing/crashtest/final/1419902.html create mode 100644 testing/crashtest/final/1758199-1.html create mode 100644 testing/crashtest/final/crashtests.list diff --git a/.eslintignore b/.eslintignore index e862d501e869..a6b0d12e645b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -20,6 +20,7 @@ # Always ignore crashtests - specially crafted files that originally caused a # crash. +**/crashtest/ **/crashtests/ # Also ignore reftest - specially crafted to produce expected output. **/reftest/ diff --git a/.stylelintignore b/.stylelintignore index 16ab9fea77bf..8a950c61a1c0 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -14,6 +14,7 @@ # Always ignore crashtests - specially crafted files that originally caused a # crash. +**/crashtest/ **/crashtests/ # Also ignore reftest - specially crafted to produce expected output. **/reftest/ diff --git a/dom/base/crashtests/1419902.html b/dom/base/crashtests/1419902.html index b0742b5be012..a0aa1b0698f2 100644 --- a/dom/base/crashtests/1419902.html +++ b/dom/base/crashtests/1419902.html @@ -1,23 +1 @@ - - - - - + diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list index 22aaf50e6b30..f86d7224d0d9 100644 --- a/dom/base/crashtests/crashtests.list +++ b/dom/base/crashtests/crashtests.list @@ -220,7 +220,7 @@ load 1406109-1.html load 1411473.html load 1413815.html load 1419799.html -skip-if(geckoview) skip-if(geckoview&&isDebugBuild) skip-if(AddressSanitizer) skip-if(ThreadSanitizer) pref(dom.disable_open_during_load,false) load 1419902.html # skip Bug 1419902. Bug 1563013 for GV+WR. Bug 1524493 GV+debug. Bug 1573281 asan +# load 1419902.html # this test is run at the very end in testing/crashtest/final/crashtests.list load 1422883.html load 1428053.html load 1441029.html diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 2aea090a6fff..f1e49a624dcc 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -394,7 +394,7 @@ load 571618-1.svg asserts(0-1) load 571975-1.html # bug 574889 load 571995.xhtml load 574958.xhtml -asserts(0-6) load 578977.html # bug 757305 +asserts(0-8) load 578977.html # bug 757305 load 580504-1.xhtml load 582793-1.html load 585598-1.xhtml diff --git a/layout/printing/crashtests/1758199-1.html b/layout/printing/crashtests/1758199-1.html index 3f7c9227a48a..67ee0a73a2a0 100644 --- a/layout/printing/crashtests/1758199-1.html +++ b/layout/printing/crashtests/1758199-1.html @@ -1,54 +1 @@ - - - - - - + diff --git a/layout/printing/crashtests/crashtests.list b/layout/printing/crashtests/crashtests.list index e2c57b282cf8..ec64509ddb1e 100644 --- a/layout/printing/crashtests/crashtests.list +++ b/layout/printing/crashtests/crashtests.list @@ -6,7 +6,7 @@ skip-if(Android) load 1662259.html skip-if(Android) pref(dom.window.sizeToContent.enabled,true) load 1663722.html skip-if(Android) load 1671503.html load 1748277.html # Bug 1751260 -skip-if(Android) load 1758199-1.html # printPreview doesn't work on android +# load 1758199-1.html # this test is run at the very end in testing/crashtest/final/crashtests.list load 1804571.html load 1804798.html load 1804794.html diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list index a7c539daca4a..30d6bb8f8fac 100644 --- a/testing/crashtest/crashtests.list +++ b/testing/crashtest/crashtests.list @@ -83,3 +83,6 @@ include ../../widget/crashtests/crashtests.list include ../../widget/gtk/crashtests/crashtests.list include ../../xpcom/string/crashtests/crashtests.list + +# Tests that must be run at the very end of all other crashtests. +include final/crashtests.list diff --git a/testing/crashtest/final/1419902.html b/testing/crashtest/final/1419902.html new file mode 100644 index 000000000000..9fa9149564fb --- /dev/null +++ b/testing/crashtest/final/1419902.html @@ -0,0 +1,34 @@ + + + + + diff --git a/testing/crashtest/final/1758199-1.html b/testing/crashtest/final/1758199-1.html new file mode 100644 index 000000000000..3f7c9227a48a --- /dev/null +++ b/testing/crashtest/final/1758199-1.html @@ -0,0 +1,54 @@ + + + + + + diff --git a/testing/crashtest/final/crashtests.list b/testing/crashtest/final/crashtests.list new file mode 100644 index 000000000000..d56eb5a984f7 --- /dev/null +++ b/testing/crashtest/final/crashtests.list @@ -0,0 +1,8 @@ +# These are tests that open windows and don't close them after the test +# finishes because there doesn't seem to be a way to close the windows. We run +# them here after all other crashtests so that the left open windows don't +# occlude the reftest window, and hence stop the compositor and refresh driver +# ticks from happening. + +skip-if(geckoview) skip-if(geckoview&&isDebugBuild) skip-if(AddressSanitizer) skip-if(ThreadSanitizer) pref(dom.disable_open_during_load,false) load 1419902.html # skip Bug 1419902. Bug 1563013 for GV+WR. Bug 1524493 GV+debug. Bug 1573281 asan # this comes from dom/base/crashtests/ +skip-if(Android) load 1758199-1.html # printPreview doesn't work on android # this comes from layout/printing/crashtests