Skip to content

Commit

Permalink
Bug 1724718 - skip some XUL-y tests on android, r=emilio,agi
Browse files Browse the repository at this point in the history
Depends on D122663

Differential Revision: https://phabricator.services.mozilla.com/D122664
  • Loading branch information
gijsk committed Aug 19, 2021
1 parent 5824c28 commit d90c0bb
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 36 deletions.
2 changes: 1 addition & 1 deletion accessible/tests/crashtests/crashtests.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load 448064.xhtml # This test instantiates a11y, so be careful about adding tests before it
load chrome://reftest/content/crashtests/accessible/tests/crashtests/471493.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/accessible/tests/crashtests/471493.xhtml
asserts-if(!browserIsRemote,2) load 884202.html
load 1572811.html
load 1578282.html
Expand Down
4 changes: 2 additions & 2 deletions dom/base/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -261,5 +261,5 @@ load 1656925.html
skip-if(Android) load 1665792.html # Print preview on android doesn't fly
skip-if(ThreadSanitizer) load 1681729.html
skip-if(ThreadSanitizer) load 1693049.html
skip-if(ThreadSanitizer) load 1697525.html
skip-if(ThreadSanitizer) load 1712198.html # Mysterious failure that should be investigated (bug 1712866).
skip-if(ThreadSanitizer||Android) load 1697525.html
skip-if(ThreadSanitizer||Android) load 1712198.html # Mysterious failure that should be investigated (bug 1712866).
2 changes: 1 addition & 1 deletion dom/xul/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ load 329982-1.xhtml
load 336096-1.xhtml
load chrome://reftest/content/crashtests/dom/xul/crashtests/344215-1.xhtml
load 354611-1.html
load chrome://reftest/content/crashtests/dom/xul/crashtests/363791-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/dom/xul/crashtests/363791-1.xhtml
load 384877-1.html
load 386914-1.html
load chrome://reftest/content/crashtests/dom/xul/crashtests/425821-1.xhtml
Expand Down
4 changes: 2 additions & 2 deletions editor/reftests/reftest.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# include the XUL reftests
include xul/reftest.list
# include the XUL reftests, except on Android which doesn't have XUL.
skip-if(Android) include xul/reftest.list

!= newline-1.html newline-ref.html
== newline-2.html newline-ref.html
Expand Down
20 changes: 10 additions & 10 deletions layout/base/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ load 317934-1.html
load 320459-1.html
load chrome://reftest/content/crashtests/layout/base/crashtests/321058-1.xhtml
load chrome://reftest/content/crashtests/layout/base/crashtests/321058-2.xhtml
load chrome://reftest/content/crashtests/layout/base/crashtests/321077-1.xhtml
load chrome://reftest/content/crashtests/layout/base/crashtests/321077-2.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/321077-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/321077-2.xhtml
load 322436-1.html
load 322678.html
load 325024.html
Expand All @@ -88,14 +88,14 @@ load 331679-3.xml
load 331883-1.html
load 335140-1.html
load 336291-1.html
load chrome://reftest/content/crashtests/layout/base/crashtests/336999-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/336999-1.xhtml
load 337066-1.xhtml
load 337268-1.html
load 337419-1.html
load chrome://reftest/content/crashtests/layout/base/crashtests/337476-1.xhtml
load 338703-1.html
load 339651-1.html
load chrome://reftest/content/crashtests/layout/base/crashtests/340093-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/340093-1.xhtml
load 341382-1.html
load 341382-2.html
load 341858-1.html
Expand All @@ -121,8 +121,8 @@ load 355989-1.xhtml
load 355993-1.xhtml
load chrome://reftest/content/crashtests/layout/base/crashtests/356325-1.xhtml
load 358729-1.xhtml
load chrome://reftest/content/crashtests/layout/base/crashtests/360339-1.xhtml
load chrome://reftest/content/crashtests/layout/base/crashtests/360339-2.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/360339-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/360339-2.xhtml
load 363729-1.html
load 363729-2.html
load 363729-3.html
Expand Down Expand Up @@ -241,13 +241,13 @@ load 448543-2.html
load 448543-3.html
load 450319-1.xhtml
asserts(1) asserts-if(Android,1-2) load 453894-1.xhtml # Bug 398043
load chrome://reftest/content/crashtests/layout/base/crashtests/454751-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/454751-1.xhtml
load 455063-1.html
load 455063-2.html
load 455063-3.html
load 455171-4.html
load 455623-1.html
load 457362-1.xhtml
skip-if(Android) load 457362-1.xhtml
load 457514.html
asserts(0-1) load 460389-1.html # bug 780985
load 462392.html
Expand Down Expand Up @@ -301,15 +301,15 @@ load 534768-1.html
load 534768-2.html
load 535721-1.xhtml
load 535911-1.xhtml
load chrome://reftest/content/crashtests/layout/base/crashtests/536720.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/536720.xhtml
load 537562-1.xhtml
load 537624-1.html
load 537631-1.html
load chrome://reftest/content/crashtests/layout/base/crashtests/538082-1.xhtml
load 538207-1.xhtml
load 538210-1.html
load 538267-1.html
load chrome://reftest/content/crashtests/layout/base/crashtests/540760.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/base/crashtests/540760.xhtml
load 540771-1.xhtml
load 541869-1.xhtml
load 541869-2.html
Expand Down
2 changes: 1 addition & 1 deletion layout/printing/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ load 509839-1.html
load 509839-2.html
load 576878.xhtml
asserts-if(Android,0-1) load 793844.html
load 1662259.html
skip-if(Android) load 1662259.html
skip-if(Android) load 1671503.html
5 changes: 4 additions & 1 deletion layout/reftests/bidi/reftest.list
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 712600-3.html 712600-3-r
== 817406-3.html 817406-1-ref.html
== 817406-4.html 817406-1-ref.html
== 847242-1.html 847242-1-ref.html
fuzzy(0-92,0-350) fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-11) == chrome://reftest/content/bidi/869833-1.xhtml chrome://reftest/content/bidi/869833-1-ref.xhtml

# Skip on Android because this is a <tree> test and we don't have the requisite XUL on Android.
skip-if(Android) fuzzy(0-92,0-350) fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-11) == chrome://reftest/content/bidi/869833-1.xhtml chrome://reftest/content/bidi/869833-1-ref.xhtml

== 922530-1.html 922530-1-ref.html
random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 922550-1.html 922550-1-ref.html # Bug 1392106
== 989994-1.html 989994-1-ref.html
Expand Down
8 changes: 4 additions & 4 deletions layout/reftests/bugs/reftest.list
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ random-if(d2d) fuzzy(0-1,0-16) fuzzy-if(Android,0-8,0-1439) fuzzy-if(webrender,0
== 299136-1.html 299136-1-ref.html
== 299837-1.html 299837-1-ref.html
== chrome://reftest/content/bugs/299837-2.xhtml chrome://reftest/content/bugs/299837-2-ref.xhtml
random-if(d2d) == chrome://reftest/content/bugs/299837-3.xhtml chrome://reftest/content/bugs/299837-3-ref.xhtml # bug 587631
skip-if(Android) random-if(d2d) == chrome://reftest/content/bugs/299837-3.xhtml chrome://reftest/content/bugs/299837-3-ref.xhtml # bug 587631
== 300691-1a.html 300691-1-ref.html
== 300691-1b.html 300691-1-ref.html
== 300691-1c.html 300691-1-ref.html
Expand Down Expand Up @@ -1257,7 +1257,7 @@ fuzzy-if(skiaContent,0-1,0-5) == 474472-1.html 474472-1-ref.html
== 476598-1b.html 476598-1-ref2.html
!= 476598-1-ref.html about:blank
== 476856-1.html 476856-1-ref.html
random-if(d2d) == chrome://reftest/content/bugs/478377-1.xhtml chrome://reftest/content/bugs/478377-1-ref.xhtml
skip-if(Android) random-if(d2d) == chrome://reftest/content/bugs/478377-1.xhtml chrome://reftest/content/bugs/478377-1-ref.xhtml
== 478614-1.html 478614-1-ref.html
== 478614-2.html 478614-1-ref.html
== 478614-3.html 478614-3-ref.html
Expand Down Expand Up @@ -1644,11 +1644,11 @@ fuzzy-if(skiaContent,0-1,0-65536) == 654950-1.html 654950-1-ref.html # Quartz al
!= 656875.html about:blank
== 658952.html 658952-ref.html
fuzzy-if(skiaContent,0-10,0-919) fuzzy-if(webrender&&cocoaWidget,2-2,4-23) == 660682-1.html 660682-1-ref.html
fuzzy-if(d2d,0-1,0-256) fuzzy-if(skiaContent,0-1,0-68000) == chrome://reftest/content/bugs/664127-1.xhtml chrome://reftest/content/bugs/664127-1-ref.xhtml
skip-if(Android) fuzzy-if(d2d,0-1,0-256) fuzzy-if(skiaContent,0-1,0-68000) == chrome://reftest/content/bugs/664127-1.xhtml chrome://reftest/content/bugs/664127-1-ref.xhtml
== 665597-1.html 665597-1-ref.html
!= 665597-2.html 665597-2-ref.html
== 667079-1.html 667079-1-ref.html
== chrome://reftest/content/bugs/668319-1.xhtml about:blank
skip-if(Android) == chrome://reftest/content/bugs/668319-1.xhtml about:blank
!= chrome://reftest/content/bugs/669015-1.xhtml chrome://reftest/content/bugs/669015-1-notref.xhtml
skip-if(azureSkiaGL) == 670442-1.html 670442-1-ref.html
== 670467-1.html 670467-1-ref.html
Expand Down
2 changes: 1 addition & 1 deletion layout/style/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ load 404470-1.html
load 411603-1.html
load 412588-1.html
load 413274-1.xhtml
load chrome://reftest/content/crashtests/layout/style/crashtests/416461-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/style/crashtests/416461-1.xhtml
load 418007-1.xhtml
load chrome://reftest/content/crashtests/layout/style/crashtests/431705-1.xhtml
load 432561-1.html
Expand Down
2 changes: 1 addition & 1 deletion layout/svg/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,6 @@ load 1600855.html
load 1601824.html
load 1605223-1.html
load 1609663.html
load 1671950.html
skip-if(Android) load 1671950.html # No print-preview support on android
load 1678947.html
load 1693032.html
20 changes: 10 additions & 10 deletions layout/xul/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ load 140218-1.xml
load chrome://reftest/content/crashtests/layout/xul/crashtests/151826-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/168724-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/189814-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/289410-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/289410-1.xhtml
load 290743.html
load chrome://reftest/content/crashtests/layout/xul/crashtests/291702-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/291702-2.xhtml
Expand All @@ -13,19 +13,19 @@ load chrome://reftest/content/crashtests/layout/xul/crashtests/294371-1.xhtml
load 311457-1.html
load 321056-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/322786-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/325377.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/326879-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/329327-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/325377.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/326879-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/329327-1.xhtml
load 329407-1.xml
load chrome://reftest/content/crashtests/layout/xul/crashtests/336962-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/344228-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/344228-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/350460.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/365151.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/365151.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/366112-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/366203-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/366203-1.xhtml
load 367185-1.xhtml
load 369942-1.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/374102-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/374102-1.xhtml
load 376137-1.html
load 376137-2.html
load 377592-1.svg
Expand All @@ -40,7 +40,7 @@ load 384871-1.html
load chrome://reftest/content/crashtests/layout/xul/crashtests/386642.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/387080-1.xhtml
load 391974-1.html
load chrome://reftest/content/crashtests/layout/xul/crashtests/399013.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/399013.xhtml
load 402912-1.xhtml
load 404192.xhtml
load chrome://reftest/content/crashtests/layout/xul/crashtests/408904-1.xhtml
Expand All @@ -50,7 +50,7 @@ load 430356-1.xhtml
asserts(0-1) load 464407-1.xhtml # Bugs 450974, 1267054, 718883
load 470063-1.html
load 470272.html
load chrome://reftest/content/crashtests/layout/xul/crashtests/538308-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/layout/xul/crashtests/538308-1.xhtml
load 557174-1.xml
load chrome://reftest/content/crashtests/layout/xul/crashtests/564705-1.xhtml
load 583957-1.html
Expand Down
2 changes: 1 addition & 1 deletion testing/crashtest/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ include ../../layout/style/crashtests/crashtests.list
include ../../layout/svg/crashtests/crashtests.list
include ../../layout/tables/crashtests/crashtests.list
include ../../layout/xul/crashtests/crashtests.list
include ../../layout/xul/tree/crashtests/crashtests.list
skip-if(Android) include ../../layout/xul/tree/crashtests/crashtests.list

include ../../media/libpng/crashtests/crashtests.list

Expand Down
2 changes: 1 addition & 1 deletion view/crashtests/crashtests.list
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load chrome://reftest/content/crashtests/view/crashtests/38589-1.xhtml
load 64049-1.html
load 281743-1.html
load 323497-1.html
load chrome://reftest/content/crashtests/view/crashtests/382756-1.xhtml
skip-if(Android) load chrome://reftest/content/crashtests/view/crashtests/382756-1.xhtml # No <tree> support on Android
load 387745-1.svg
load 399852.html
load 429315-1.html
Expand Down

0 comments on commit d90c0bb

Please sign in to comment.