Bug 962676 - Reset expected assertion counts for Android crashtests; r=blassey
authorGeoff Brown <gbrown@mozilla.com>
Wed, 09 Apr 2014 08:38:44 -0600
changeset 177841 817929e9eb0053e25eb3d4056ed0f6e7d3c1cf5c
parent 177840 3d9dec188074b89551076af56a90f74c54b621c5
child 177842 34ee2b8302aacbd2130388d124a54601f1dd6c89
push idunknown
push userunknown
push dateunknown
reviewersblassey
bugs962676
milestone31.0a1
Bug 962676 - Reset expected assertion counts for Android crashtests; r=blassey
docshell/base/crashtests/crashtests.list
dom/base/crashtests/crashtests.list
dom/xbl/crashtests/crashtests.list
editor/composer/src/crashtests/crashtests.list
layout/base/crashtests/crashtests.list
layout/forms/crashtests/crashtests.list
layout/generic/crashtests/crashtests.list
layout/xul/tree/crashtests/crashtests.list
parser/htmlparser/tests/crashtests/crashtests.list
testing/crashtest/sanity/crashtests.list
--- a/docshell/base/crashtests/crashtests.list
+++ b/docshell/base/crashtests/crashtests.list
@@ -1,14 +1,14 @@
 load 40929-1.html
 load 369126-1.html
 load 403574-1.xhtml
 load 430124-1.html
 load 430628-1.html
 load 432114-1.html
 load 432114-2.html
-asserts-if(Android,2) load 436900-1.html
+load 436900-1.html
 asserts(0-3) load 436900-2.html # bug 566159
 load 500328-1.html
 load 514779-1.xhtml
 load 614499-1.html
 load 678872-1.html
 skip-if(Android||B2G||browserIsRemote) pref(dom.disable_open_during_load,false) load 914521.html
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -1,9 +1,9 @@
-asserts-if(Android,1) load 90613-1.html
+load 90613-1.html
 load 244933-1.html
 load 275912-1.html
 load 327571-1.html
 load 327695-1.html
 load 329481-1.xhtml
 load 338674-1.xhtml
 load 346381-1.html
 load 359432-1.xhtml
--- a/dom/xbl/crashtests/crashtests.list
+++ b/dom/xbl/crashtests/crashtests.list
@@ -26,15 +26,15 @@ load 421997-1.xhtml
 load 432813-1.xhtml
 load 454820-1.html
 load 460665-1.xhtml
 load 463511-1.xhtml
 load 464863-1.xhtml
 load 472260-1.xhtml
 load 477878-1.html
 load 492978-1.xul
-asserts-if(Android,2) load 493123-1.xhtml
+load 493123-1.xhtml
 load 495354-1.xhtml
 load 507628-1.xhtml
 load 507991-1.xhtml
 load set-field-bad-this.xhtml
 load 830614-1.xul
 load 895805-1.xhtml
--- a/editor/composer/src/crashtests/crashtests.list
+++ b/editor/composer/src/crashtests/crashtests.list
@@ -1,6 +1,6 @@
-asserts-if(Android,2) load 351236-1.html
+load 351236-1.html
 load 407062-1.html
 load 419563-1.xhtml
 skip-if(winWidget) load 428844-1.html # bug 471185
 load 461049-1.html
 asserts(0-1) asserts-if(winWidget||Android,0-2) load removing-editable-xslt.html # bug 500847
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -283,19 +283,19 @@ load 468645-1.xhtml
 load 468645-2.xhtml
 load 468645-3.xhtml
 load 469861-1.xhtml
 load 469861-2.xhtml
 load 471594-1.xhtml
 asserts(0-1) load 474075.html # bug 847368
 load 479114-1.html
 load 477333-1.xhtml
-asserts-if(Android,6) load 477731-1.html
+load 477731-1.html
 load 479360-1.xhtml
-asserts-if(Android,6) load 480686-1.html
+load 480686-1.html
 load 481806-1.html
 load 483604-1.xhtml
 load 485501-1.html
 load 487544-1.html
 load 488390-1.xhtml
 load 489691.html
 load 490376-1.xhtml
 load 490559-1.html
--- a/layout/forms/crashtests/crashtests.list
+++ b/layout/forms/crashtests/crashtests.list
@@ -22,17 +22,17 @@ load 370940-1.html
 load 370967.html
 load 373586-1.xhtml
 load 375299.html
 load 378369.html
 asserts(5-10) load 378413-1.xhtml # bug 424225, bug 402850?
 load 380116-1.xhtml
 load 382212-1.xhtml
 load 382610-1.html
-asserts-if(Android,1) load 383887-1.html # bug 576434
+load 383887-1.html # bug 576434
 load 386554-1.html
 load 388374-1.xhtml
 load 388374-2.html
 load 393656-1.xhtml
 load 393656-2.xhtml
 load 402852-1.html
 load 403148-1.html
 load 404118-1.html
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -158,17 +158,17 @@ load 393906-1.html
 load 393923-1.html
 load 393956-1.html
 load 393956-2.html
 load 393956-3.html
 load 393956-4.html
 load 394237-1.html
 load 394820-1.html
 load 394818-1.html
-asserts-if(Android,1) load 394818-2.html
+load 394818-2.html
 load 395316-1.html
 load 395450-1.xhtml
 load 397007-1.html
 load 397187-1.html
 load 397844-1.xhtml
 load 397844-2.xhtml
 load 397852-1.xhtml
 load 398181-1.html
@@ -228,17 +228,17 @@ load 413048-1.html
 load 413079-1.xhtml
 load 413079-2.xhtml
 load 413079-3.xhtml
 load 413085-1.html
 load 413085-2.html
 load 413582-1.xhtml
 load 413582-2.html
 load 413712-1.xhtml
-asserts-if(Android,6) load 414061-1.html
+load 414061-1.html
 load 414180-1.xul
 load 414719-1.html
 load 415685-1.html
 load 416165.html
 load 416264-1.html
 load 416476-1.html
 load 417109-1.xhtml
 load 417902-1.html
@@ -443,17 +443,17 @@ load 660416.html
 load 665853.html
 load text-overflow-form-elements.html
 load text-overflow-iframe.html
 load text-overflow-bug666751-1.html
 load text-overflow-bug666751-2.html
 asserts(0-1) load text-overflow-bug670564.xhtml
 load text-overflow-bug671796.xhtml
 load 667025.html
-asserts-if(Android,8) load 673770.html # bug 569193 and bug 459597
+load 673770.html # bug 569193 and bug 459597
 load 679933-1.html
 load 682649-1.html
 load 683702-1.xhtml
 load 688996-1.html
 load 688996-2.html
 load 683712.html
 load 691210.html
 load text-overflow-bug713610.html
--- a/layout/xul/tree/crashtests/crashtests.list
+++ b/layout/xul/tree/crashtests/crashtests.list
@@ -1,12 +1,12 @@
 load 307298-1.xul
 load 309732-1.xul
 load 309732-2.xul
-asserts-if(Android,3) load 366583-1.xul
+load 366583-1.xul
 asserts-if(winWidget,0-4) load 380217-1.xul # bug 616710
 load 382444-1.html
 load 391178-1.xhtml
 load 391178-2.xul
 load 393665-1.xul
 load 399227-1.xul
 load 399227-2.xul
 load 399692-1.xhtml
--- a/parser/htmlparser/tests/crashtests/crashtests.list
+++ b/parser/htmlparser/tests/crashtests/crashtests.list
@@ -25,17 +25,17 @@ load 188474-1.html
 load 194329-1.html
 load 197052-1.html
 load 220542-1.html
 load 253979-1.html
 load 269095-1.html
 load 286733-1.html
 load 286733-2.html
 load 299036-1.html
-asserts-if(Android,1) skip-if((OSX==10.7||OSX==10.8)&&browserIsRemote) load 328751-1.html # Bug 849747
+skip-if((OSX==10.7||OSX==10.8)&&browserIsRemote) load 328751-1.html # Bug 849747
 load 408939-1.html
 load 423373-1.html
 load 445171-1.html
 load 468538-1.xhtml
 load 502103.html
 load 502869.html
 load 515278-1.html
 load 515533-1.html
--- a/testing/crashtest/sanity/crashtests.list
+++ b/testing/crashtest/sanity/crashtests.list
@@ -1,2 +1,2 @@
-asserts-if(Android,8-10) load data:text/html,
+load data:text/html,
 load data:text/html,PASS