From b0ac8dc3336411ff00acf98b3f6644b1a2dbccc3 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Fri, 30 Jul 2010 16:48:57 -0700 Subject: [PATCH] Switch reftest manifests to new, shorter syntax for widget toolkit tests. (Bug 570329) a2.0=tests This patch was created by running the following sed commands: s/MOZ_WIDGET_TOOLKIT=="\(gtk2\|cocoa\|qt\|windows\)"/\1Widget/g s/MOZ_WIDGET_TOOLKIT!="\(gtk2\|cocoa\|qt\|windows\)"/!\1Widget/g on all *.list files in the tree. --- .../composer/src/crashtests/crashtests.list | 4 +-- gfx/tests/crashtests/crashtests.list | 2 +- layout/base/crashtests/crashtests.list | 2 +- layout/forms/crashtests/crashtests.list | 2 +- layout/generic/crashtests/crashtests.list | 8 ++--- layout/reftests/backgrounds/reftest.list | 2 +- layout/reftests/bidi/reftest.list | 16 +++++----- layout/reftests/bugs/reftest.list | 32 +++++++++---------- layout/reftests/canvas/reftest.list | 4 +-- layout/reftests/css-gradients/reftest.list | 4 +-- layout/reftests/first-letter/reftest.list | 2 +- layout/reftests/font-face/reftest.list | 24 +++++++------- layout/reftests/font-features/reftest.list | 20 ++++++------ layout/reftests/font-matching/reftest.list | 16 +++++----- layout/reftests/forms/reftest.list | 4 +-- layout/reftests/line-breaking/reftest.list | 8 ++--- layout/reftests/native-theme/reftest.list | 16 +++++----- layout/reftests/ogg-video/reftest.list | 6 ++-- layout/reftests/pixel-rounding/reftest.list | 2 +- layout/reftests/selection/reftest.list | 4 +-- layout/reftests/svg/reftest.list | 4 +-- .../reftests/svg/smil/container/reftest.list | 2 +- .../reftests/svg/smil/transform/reftest.list | 2 +- layout/reftests/table-background/reftest.list | 4 +-- .../table-bordercollapse/reftest.list | 2 +- layout/reftests/text/reftest.list | 12 +++---- layout/style/crashtests/crashtests.list | 2 +- .../test/reftest/icon/win/reftest.list | 4 +-- .../libpr0n/test/reftest/jpeg/reftest.list | 28 ++++++++-------- .../reftest/pngsuite-background/reftest.list | 16 +++++----- .../plugin/test/crashtests/crashtests.list | 2 +- .../themes/pinstripe/reftests/reftest.list | 10 +++--- view/crashtests/crashtests.list | 4 +-- widget/reftests/reftest.list | 2 +- 34 files changed, 136 insertions(+), 136 deletions(-) diff --git a/editor/composer/src/crashtests/crashtests.list b/editor/composer/src/crashtests/crashtests.list index 68885024edea..4a7ade806d00 100644 --- a/editor/composer/src/crashtests/crashtests.list +++ b/editor/composer/src/crashtests/crashtests.list @@ -1,5 +1,5 @@ load 351236-1.html load 407062-1.html -skip-if(MOZ_WIDGET_TOOLKIT=="windows") load 428844-1.html # bug 471185 +skip-if(windowsWidget) load 428844-1.html # bug 471185 load 461049-1.html -asserts(0-1) asserts-if(MOZ_WIDGET_TOOLKIT=="windows",0-2) load removing-editable-xslt.html # bug 500847 +asserts(0-1) asserts-if(windowsWidget,0-2) load removing-editable-xslt.html # bug 500847 diff --git a/gfx/tests/crashtests/crashtests.list b/gfx/tests/crashtests/crashtests.list index 9359887673c2..52c2c4ee1f8c 100644 --- a/gfx/tests/crashtests/crashtests.list +++ b/gfx/tests/crashtests/crashtests.list @@ -78,4 +78,4 @@ load 546870-1.html load balinese-letter-spacing.html load 580100-1.html load 580212-1.html -skip-if(MOZ_WIDGET_TOOLKIT=="gtk2") load 580233-1.html +skip-if(gtk2Widget) load 580233-1.html diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list index eb78484f5bc0..e4f8ad51ea52 100644 --- a/layout/base/crashtests/crashtests.list +++ b/layout/base/crashtests/crashtests.list @@ -38,7 +38,7 @@ load 265736-1.html load 265736-2.html load 265899-1.html load 265973-1.html -asserts(10) asserts-if(MOZ_WIDGET_TOOLKIT=="windows",8) load 265986-1.html # Bug 512405 +asserts(10) asserts-if(windowsWidget,8) load 265986-1.html # Bug 512405 load 265999-1.html load 266222-1.html asserts(7) load 266360-1.html # Bug 576358 diff --git a/layout/forms/crashtests/crashtests.list b/layout/forms/crashtests/crashtests.list index 380eca63f6d2..8cb09ead1812 100644 --- a/layout/forms/crashtests/crashtests.list +++ b/layout/forms/crashtests/crashtests.list @@ -24,7 +24,7 @@ asserts(8-10) load 378413-1.xhtml # bug 424225, bug 402850? load 380116-1.xhtml load 382212-1.xhtml load 382610-1.html -asserts-if(MOZ_WIDGET_TOOLKIT=="windows",1) load 383887-1.html # bug 576434 +asserts-if(windowsWidget,1) load 383887-1.html # bug 576434 load 386554-1.html load 388374-1.xhtml load 388374-2.html diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 4af1af52549a..f2db24342b59 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -14,7 +14,7 @@ load 310556-1.xhtml load 322780-1.xul load 323381-1.html load 323381-2.html -asserts(2) asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",12) load 323386-1.html # Bug 575011 +asserts(2) asserts-if(gtk2Widget,12) load 323386-1.html # Bug 575011 load 323389-1.html load 323389-2.html load 323493-1.html @@ -76,8 +76,8 @@ load 379917-1.xhtml load 380012-1.html load 381152-1.html load 381786-1.html -asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",0-2) load 382129-1.xhtml # Bug 540078 -asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",0-1) load 382131-1.html # Bug 540078 +asserts-if(gtk2Widget,0-2) load 382129-1.xhtml # Bug 540078 +asserts-if(gtk2Widget,0-1) load 382131-1.html # Bug 540078 load 382199-1.html load 382208-1.xhtml load 382262-1.html @@ -293,7 +293,7 @@ load 495875-1.html load 495875-2.html load 499862-1.html load 499857-1.html -asserts(15-80) asserts-if(MOZ_WIDGET_TOOLKIT=="windows",18-96) asserts-if(MOZ_WIDGET_TOOLKIT=="cocoa",10-40) load 499885-1.xhtml # nscoord_MAX assertions (bug 575011), plus bug 570436 on windows +asserts(15-80) asserts-if(windowsWidget,18-96) asserts-if(cocoaWidget,10-40) load 499885-1.xhtml # nscoord_MAX assertions (bug 575011), plus bug 570436 on windows load 501535-1.html load 503961-1.xhtml load 503961-2.html diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list index cf1ca68f202e..c8a831cf4c65 100644 --- a/layout/reftests/backgrounds/reftest.list +++ b/layout/reftests/backgrounds/reftest.list @@ -98,7 +98,7 @@ # the image aren't the issue, because they're being obscured to avoid sampling # algorithm dependencies (at least assuming the sampling algorithm in use # doesn't sample too far astray from the boundaries). -fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html +fails-if(!gtk2Widget) == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html # background-size affects images without intrinsic dimensions specially; we may # not support such image formats right now, but when we do, we want diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list index 7e56ed551840..d2cb53087168 100644 --- a/layout/reftests/bidi/reftest.list +++ b/layout/reftests/bidi/reftest.list @@ -15,15 +15,15 @@ # test for glyph mirroring in right-to-left text == mirroring-01.html mirroring-01-ref.html # quote marks are not supposed to mirror, but Unicode 5.0 said they should, so some systems do it -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == mirroring-02.html mirroring-02-ref.html +random-if(cocoaWidget) == mirroring-02.html mirroring-02-ref.html == mixedChartype-00.html mixedChartype-00-ref.html == mixedChartype-00-j.html mixedChartype-00-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == mixedChartype-01.html mixedChartype-01-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == mixedChartype-01-j.html mixedChartype-01-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") random-if(MOZ_WIDGET_TOOLKIT=="windows") == mixedChartype-02.html mixedChartype-02-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") random-if(MOZ_WIDGET_TOOLKIT=="windows") == mixedChartype-02-j.html mixedChartype-02-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == mixedChartype-03.html mixedChartype-03-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == mixedChartype-03-j.html mixedChartype-03-ref.html +random-if(gtk2Widget) == mixedChartype-01.html mixedChartype-01-ref.html +random-if(gtk2Widget) == mixedChartype-01-j.html mixedChartype-01-ref.html +random-if(gtk2Widget) random-if(windowsWidget) == mixedChartype-02.html mixedChartype-02-ref.html +random-if(gtk2Widget) random-if(windowsWidget) == mixedChartype-02-j.html mixedChartype-02-ref.html +random-if(gtk2Widget) == mixedChartype-03.html mixedChartype-03-ref.html +random-if(gtk2Widget) == mixedChartype-03-j.html mixedChartype-03-ref.html == with-first-letter-1a.html with-first-letter-1-ref.html == with-first-letter-1b.html with-first-letter-1-ref.html == with-first-letter-2a.html with-first-letter-2-ref.html @@ -38,7 +38,7 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == mixedChartype-03-j.html mixedChartype-0 == 332655-1.html 332655-1-ref.html == 332655-2.html 332655-2-ref.html == 381279-1.html 381279-1-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 386339.html 386339-ref.html +random-if(gtk2Widget) == 386339.html 386339-ref.html == 409375.html 409375-ref.html == 413542-1.html 413542-1-ref.html == 413542-2.html 413542-2-ref.html diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 6d24ac2dfc85..1a325dbba326 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -264,7 +264,7 @@ random == 99850-1b.html 99850-1-ref.html # bug 471629 == 283686-2.html 283686-2-ref.html == 283686-3.html about:blank == 289384-1.xhtml 289384-ref.xhtml -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 409329 for the non-Mac failures +fails-if(gtk2Widget) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 409329 for the non-Mac failures asserts(1) == 290129-1.html 290129-1-ref.html # bug 315549/460637 == 291078-1.html 291078-1-ref.html == 291078-2.html 291078-2-ref.html @@ -397,7 +397,7 @@ random == 328829-1.xhtml 328829-1-ref.xhtml # bug 369046 (intermittent) == 332360-width-ltr.html 332360-ltr-ref.html == 332557-1.html 332557-1-ref.html == 332975-1.html 332975-1-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 333970-1.html 333970-1-ref.html # bug 333970 +random-if(gtk2Widget) == 333970-1.html 333970-1-ref.html # bug 333970 == 334829-1a.xhtml 334829-1-ref.xhtml == 334829-1b.xhtml 334829-1-ref.xhtml == 335628-1.html 335628-1-ref.html @@ -449,7 +449,7 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 333970-1.html 333970-1-ref.html # bug 3 == 349695-1a.html 349695-1-ref.html == 349695-1b.html 349695-1-ref.html # fails with CoreText rendering due to clipping of one subpixel-antialiasing pixel at end of text -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 350506-1.html 350506-1-ref.html +random-if(cocoaWidget) == 350506-1.html 350506-1-ref.html == 351641-1a.html 351641-1-ref.html == 351641-1b.html 351641-1-ref.html == 351641-2a.html 351641-2-ref.html @@ -480,10 +480,10 @@ random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 350506-1.html 350506-1-ref.html == 352980-3f.html 352980-3-ref.html == 355548-1.xml 355548-1-ref.xml == 355548-2.xml 355548-2-ref.xml -asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",1) == 355548-3.xml 355548-3-ref.xml # bug 456899 +asserts-if(gtk2Widget,1) == 355548-3.xml 355548-3-ref.xml # bug 456899 == 355548-4.xml 355548-4-ref.xml == 355548-5.xml 355548-5-ref.xml -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 356774-1.html 356774-1-ref.html # probably bug 379317 +fails-if(cocoaWidget) == 356774-1.html 356774-1-ref.html # probably bug 379317 == 356775-1.html 356775-1-ref.html == 359903-1.html 359903-1-ref.html == 359869-1.html 359869-1-ref.html @@ -562,7 +562,7 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 356774-1.html 356774-1-ref.html # proba random == 368020-2.html 368020-2-ref.html # bug 403181 comment 52 explains why this test is disabled. fails == 368020-3.html 368020-3-ref.html # bug 368085 fails == 368020-4.html 368020-4-ref.html # bug 368085 -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 368020-5.html 368020-5-ref.html # bug 388591 +random-if(gtk2Widget) == 368020-5.html 368020-5-ref.html # bug 388591 == 368155-1.xhtml 368155-1-ref.xhtml asserts(4) == 368155-negative-margins-1.html 368155-negative-margins-1-ref.html # bug 387205 / bug 457397 # we can't test this because there's antialiasing involved, and our comparison @@ -645,7 +645,7 @@ fails == 374927-1.html 374927-1-ref.html # Was broken by patch for bug 368600; f == 379178-html.html 379178-html-ref.html == 379178-svg.svg 379178-svg-ref.svg == 379316-1.html 379316-1-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 379316-2.html 379316-2-ref.html # bug 379786 +random-if(cocoaWidget) == 379316-2.html 379316-2-ref.html # bug 379786 == 379328-1.html 379328-1-ref.html == 379349-1a.xhtml 379349-1-ref.xhtml == 379349-1b.xhtml 379349-1-ref.xhtml @@ -737,7 +737,7 @@ random == 387876-2.html 387876-2-ref.html # bug 471630 == 390318-1d.html 390318-1-ref.html == 390318-1e.html 390318-1-ref.html == 390318-1f.html 390318-1-ref.html -skip-if(MOZ_WIDGET_TOOLKIT!="windows") == 391045.html 391045-ref.html # windows-specific Uniscribe bug, trailing period is matched against different fonts on Mac/Linux (see 396137) +skip-if(!windowsWidget) == 391045.html 391045-ref.html # windows-specific Uniscribe bug, trailing period is matched against different fonts on Mac/Linux (see 396137) == 391140-1.html 391140-1-ref.html == 391412-1a.html 391412-1-ref.html == 391412-1b.html 391412-1-ref.html @@ -787,12 +787,12 @@ skip-if(MOZ_WIDGET_TOOLKIT!="windows") == 391045.html 391045-ref.html # windows- == 399209-2.html 399209-2-ref.html == 399258-1.html 399258-1-ref.html == 399384-1.html 399384-1-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 399636-standards-css.html 399636-standards-ref.html # bug 429022 -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 399636-standards-html.html 399636-standards-ref.html # bug 429022 -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 399636-quirks-css.html 399636-quirks-ref.html # bug 429022 +random-if(gtk2Widget) == 399636-standards-css.html 399636-standards-ref.html # bug 429022 +random-if(gtk2Widget) == 399636-standards-html.html 399636-standards-ref.html # bug 429022 +random-if(gtk2Widget) == 399636-quirks-css.html 399636-quirks-ref.html # bug 429022 # We can't rely on this test working on platforms other than Windows and # Mac because they need not have a font called "Symbol". -fails-if(MOZ_WIDGET_TOOLKIT=="windows") fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT!="cocoa"&&MOZ_WIDGET_TOOLKIT!="windows") != 399636-quirks-html.html 399636-quirks-ref.html # windows failure bug 429017, mac failure bug 429019 +fails-if(windowsWidget) fails-if(cocoaWidget) random-if(!cocoaWidget&&!windowsWidget) != 399636-quirks-html.html 399636-quirks-ref.html # windows failure bug 429017, mac failure bug 429019 == 400081-1.html about:blank == 400171-1a.html 400171-1-ref.html == 400171-1b.html 400171-1-ref.html @@ -924,7 +924,7 @@ fails == 413027-3.html 413027-3-ref.html == 413286-4b.html 413286-4-ref.html == 413286-5.html 413286-5-ref.html == 413286-6.html 413286-6-ref.html -skip-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 413292-1.html 413292-1-ref.html # disabling due to failure loading on some mac tinderboxes. See bug 432954 +skip-if(cocoaWidget) == 413292-1.html 413292-1-ref.html # disabling due to failure loading on some mac tinderboxes. See bug 432954 == 413361-1.html 413361-1-ref.html == 413840-background-unchanged.html 413840-background-unchanged-ref.html == 413840-ltr-offsets.html 413840-ltr-offsets-ref.html @@ -979,7 +979,7 @@ asserts(1) == 418574-2.html 418574-2-ref.html # bug 478135 fails == 423823-1.html 423823-1-ref.html # scrolling rowgroups were removed in bug 28800 == 424074-1.xul 424074-1-ref.xul != 424074-1.xul 424074-1-ref2.xul -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 424074-1-ref2.xul 424074-1-ref3.xul +random-if(gtk2Widget) == 424074-1-ref2.xul 424074-1-ref3.xul == 424236-1.html 424236-1-ref.html == 424236-2.html 424236-2-ref.html == 424236-3.html 424236-3-ref.html @@ -1146,7 +1146,7 @@ random == 445004-1.html 445004-1-ref.html # bug 472268 == 455171-5.html 455171-5-ref.html == 455280-1.xhtml 455280-1-ref.xhtml == 455826-1.html 455826-1-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 456147.xul 456147-ref.html # bug 458047 +fails-if(cocoaWidget) == 456147.xul 456147-ref.html # bug 458047 == 456219-1a.html 456219-1-ref.html == 456219-1b.html 456219-1-ref.html == 456219-1c.html 456219-1-ref.html @@ -1268,7 +1268,7 @@ fails == 472020-2.xul 472020-2-ref.xul == 481024-1e.html 481024-1-ref.html != 481948-1.html 481948-1-ref.html != 481948-2.html 481948-2-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="windows") fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364 +random-if(windowsWidget) fails-if(gtk2Widget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364 == 482398-1.html 482398-1-ref.html == 482592-1a.xhtml 482592-1-ref.html == 482592-1b.xhtml 482592-1-ref.html diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list index cd62a4636e2d..4f81486e9623 100644 --- a/layout/reftests/canvas/reftest.list +++ b/layout/reftests/canvas/reftest.list @@ -36,7 +36,7 @@ == text-not-in-doc-test.html text-not-in-doc-ref.html # weird pixel-rounding on mac prevents these tests from passing -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == text-bidi-ltr-test.html text-bidi-ltr-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == text-bidi-rtl-test.html text-bidi-rtl-ref.html +fails-if(cocoaWidget) == text-bidi-ltr-test.html text-bidi-ltr-ref.html +fails-if(cocoaWidget) == text-bidi-rtl-test.html text-bidi-rtl-ref.html != text-font-lang.html text-font-lang-notref.html diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list index fc7ccb6f18e3..34a811d98580 100644 --- a/layout/reftests/css-gradients/reftest.list +++ b/layout/reftests/css-gradients/reftest.list @@ -64,7 +64,7 @@ == twostops-1b.html twostops-1-ref.html fails == twostops-1c.html twostops-1-ref.html # bug 524173 == twostops-1d.html twostops-1-ref.html -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == twostops-1e.html twostops-1-ref.html # bug 524173 +fails-if(!cocoaWidget) == twostops-1e.html twostops-1-ref.html # bug 524173 # from http://www.xanthir.com/:4bhipd by way of http://a-ja.net/newgrad.html == aja-linear-1a.html aja-linear-1-ref.html @@ -86,5 +86,5 @@ fails == aja-linear-2d.html aja-linear-2-ref.html # bug 526694 fails-if(/Mac\x20OS\x20X\x2010\.5/.test(http.oscpu)) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 fails == aja-linear-6b.html aja-linear-6-ref.html # bug 522607 == height-dependence-1.html height-dependence-1-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == height-dependence-2.html height-dependence-2-ref.html # bug 535007 +fails-if(cocoaWidget) == height-dependence-2.html height-dependence-2-ref.html # bug 535007 == height-dependence-3.html height-dependence-3-ref.html diff --git a/layout/reftests/first-letter/reftest.list b/layout/reftests/first-letter/reftest.list index 66fd1102f220..823060d702b5 100644 --- a/layout/reftests/first-letter/reftest.list +++ b/layout/reftests/first-letter/reftest.list @@ -34,7 +34,7 @@ random == dynamic-3b.html dynamic-3-ref.html == 23605-6.html 23605-6-ref.html != 229764-1.html 229764-ref.html == 229764-2.html 229764-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 329069-1.html 329069-1-ref.html # failure is font-dependent, may be related to bug 404848 +random-if(gtk2Widget) == 329069-1.html 329069-1-ref.html # failure is font-dependent, may be related to bug 404848 fails == 329069-2.html 329069-2-ref.html # bug 553981 == 342120-1.xhtml 342120-1-ref.xhtml == 379799-1.html 379799-1-ref.html diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list index 4e343ce09e28..d73e96d2f775 100644 --- a/layout/reftests/font-face/reftest.list +++ b/layout/reftests/font-face/reftest.list @@ -5,7 +5,7 @@ HTTP(..) != download-1.html download-1-notref.html HTTP(..) == download-2.html download-2-ref.html HTTP(..) != download-2.html about:blank -random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == download-2-big.html download-2-big-otf.html # bug 470713 +random-if(windowsWidget) HTTP(..) == download-2-big.html download-2-big-otf.html # bug 470713 HTTP(..) != download-2-big-otf.html about:blank HTTP(..) != download-3-notref.html download-3.html HTTP(..) == download-3-ref.html download-3.html @@ -17,7 +17,7 @@ HTTP(..) == multiple-descriptor-1.html multiple-descriptor-1-ref.html HTTP(..) != multiple-descriptor-1.html multiple-descriptor-1-notref.html HTTP(..) == src-list-1.html src-list-1-ref.html HTTP(..) == src-list-2.html src-list-2-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == src-list-2-big-otf.html src-list-2-big-ref.html # bug 470713 +random-if(windowsWidget) HTTP(..) == src-list-2-big-otf.html src-list-2-big-ref.html # bug 470713 HTTP(..) == src-list-format-1.html src-list-format-1-ref.html HTTP(..) == src-list-format-2.html src-list-format-2-ref.html HTTP(..) == src-list-format-3.html src-list-format-3-ref.html @@ -25,8 +25,8 @@ HTTP(..) == src-list-format-4.html src-list-format-1-ref.html HTTP(..) == src-list-format-5.html src-list-format-2-ref.html HTTP(..) == src-list-format-6.html src-list-format-3-ref.html # assumes AAT fonts are only supported on MacOS -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") HTTP(..) == src-list-format-7.html src-list-format-2-ref.html -random-if(MOZ_WIDGET_TOOLKIT!="cocoa") HTTP(..) == src-list-format-7.html src-list-format-3-ref.html +random-if(cocoaWidget) HTTP(..) == src-list-format-7.html src-list-format-2-ref.html +random-if(!cocoaWidget) HTTP(..) == src-list-format-7.html src-list-format-3-ref.html == src-list-local-full.html src-list-local-full-ref.html == src-list-local-full-quotes.html src-list-local-full-ref.html HTTP(..) == src-list-local-fallback.html src-list-local-fallback-ref.html @@ -35,9 +35,9 @@ HTTP(..) == src-list-local-fallback.html src-list-local-fallback-ref.html skip HTTP(..) == src-list-local-localized.html src-list-local-localized-ref.html # 486787, 486497 # Postscript name lookup only supported on MacOS/Windows currently -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == src-list-local-ps.html src-list-local-full-ref.html +random-if(gtk2Widget) == src-list-local-ps.html src-list-local-full-ref.html # Mac-specific test of 100 weight faces -random-if(MOZ_WIDGET_TOOLKIT!="cocoa") == helveticaneue-ultra.html helveticaneue-ultra-ref.html +random-if(!cocoaWidget) == helveticaneue-ultra.html helveticaneue-ultra-ref.html # FIXME: The behavior here is neither mandated nor specified by the spec, but # it really ought to be. @@ -68,7 +68,7 @@ HTTP(..) == disable-sheet-1.html disable-sheet-1-ref.html HTTP(..) == disable-sheet-4.html disable-sheet-4-ref.html HTTP(..) == disable-sheet-5.html disable-sheet-4-ref.html HTTP(..) == sheet-set-base-1.html sheet-set-base-1-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") HTTP(..) == sheet-set-switch-1.html sheet-set-switch-1-ref.html # bug 468217 +random-if(cocoaWidget) HTTP(..) == sheet-set-switch-1.html sheet-set-switch-1-ref.html # bug 468217 HTTP(..) == insert-rule-1a.html insert-rule-1-ref.html HTTP(..) == insert-rule-1b.html insert-rule-1-ref.html HTTP(..) == delete-rule-1.html delete-rule-1-ref.html @@ -82,12 +82,12 @@ HTTP(..) == ex-unit-1-dynamic.html ex-unit-1-ref.html # bug 493976 - for some reason the Arabic tests below cause Tinderbox timeouts # Arabic support requires AAT fonts under Mac OS, OpenType otherwise -# random-if(MOZ_WIDGET_TOOLKIT!="cocoa") HTTP(..) == src-format-arabic.html src-format-arabic-aat-ref.html -# random-if(MOZ_WIDGET_TOOLKIT=="cocoa") HTTP(..) == src-format-arabic.html src-format-arabic-ot-ref.html +# random-if(!cocoaWidget) HTTP(..) == src-format-arabic.html src-format-arabic-aat-ref.html +# random-if(cocoaWidget) HTTP(..) == src-format-arabic.html src-format-arabic-ot-ref.html == local-1.html local-1-ref.html HTTP(..) == synthetic-weight-style.html synthetic-weight-style-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == synthetic-variations.html synthetic-variations-ref.html # bug 419962 +random-if(gtk2Widget) HTTP(..) == synthetic-variations.html synthetic-variations-ref.html # bug 419962 # Leak test HTTP(..) load 486974-1.html @@ -118,11 +118,11 @@ HTTP(..) != 507960-1-woff-bad-hint.html 507960-1-ref.html # Tests for bug 523717 HTTP(..) == underline-offset-change-1.html underline-offset-change-1-ref.html HTTP(..) == underline-offset-change-2.html underline-offset-change-2-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") fails-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) != underline-offset-change-1-ref.html underline-offset-change-2-ref.html # Bug 534132 +fails-if(cocoaWidget) fails-if(windowsWidget) HTTP(..) != underline-offset-change-1-ref.html underline-offset-change-2-ref.html # Bug 534132 HTTP(..) != 534352-1-extra-cmap-sentinel.html 534352-1-extra-cmap-sentinel-ref.html HTTP(..) == bug533251.html bug533251-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == ivs-1.html ivs-1-ref.html +random-if(gtk2Widget) HTTP(..) == ivs-1.html ivs-1-ref.html HTTP(..) == missing-names.html missing-names-ref.html diff --git a/layout/reftests/font-features/reftest.list b/layout/reftests/font-features/reftest.list index 02022ae598a9..ded9fc2c0357 100644 --- a/layout/reftests/font-features/reftest.list +++ b/layout/reftests/font-features/reftest.list @@ -7,21 +7,21 @@ # check that Turkish language causes a change in rendering (no fi ligature) # (also works via Pango) -fails-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) != font-features-turkish.html font-features-ref.html +fails-if(windowsWidget) HTTP(..) != font-features-turkish.html font-features-ref.html # check that disabling ligatures causes a change -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") HTTP(..) != font-features-noliga.html font-features-ref.html +fails-if(!cocoaWidget) HTTP(..) != font-features-noliga.html font-features-ref.html # check that enabling optional ligatures causes a change -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") HTTP(..) != font-features-hlig.html font-features-ref.html +fails-if(!cocoaWidget) HTTP(..) != font-features-hlig.html font-features-ref.html # compare Turkish rendering with reference using ZWNJ to break the ligature # (also works via Pango) -fails-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == font-features-turkish.html font-features-turkish-ref.html +fails-if(windowsWidget) HTTP(..) == font-features-turkish.html font-features-turkish-ref.html # compare Turkish rendering with explicitly disabled ligatures # (fails on Linux because Pango recognizes the Turkish lang but not the feature setting) -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == font-features-turkish.html font-features-noliga.html +fails-if(gtk2Widget) HTTP(..) == font-features-turkish.html font-features-noliga.html # The following should pass even if feature support isn't available, # because both testcase and reference will have the default rendering, @@ -35,11 +35,11 @@ HTTP(..) == font-features-hlig-3.html font-features-noliga.html # compare -moz-font-language-override rendering to lang-tagged rendering # these fail on Linux because the Pango backend recognizes lang=tr but not -moz-font-language-override -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == font-features-turkish-override-1.html font-features-turkish.html -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == font-features-turkish-override-2.html font-features-turkish.html +fails-if(gtk2Widget) HTTP(..) == font-features-turkish-override-1.html font-features-turkish.html +fails-if(gtk2Widget) HTTP(..) == font-features-turkish-override-2.html font-features-turkish.html # check use of -moz-font-language-override to override explicit lang tag -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == font-features-turkish-override-3.html font-features-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == font-features-turkish-override-4.html font-features-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == font-features-turkish-override-5.html font-features-turkish.html +fails-if(gtk2Widget) HTTP(..) == font-features-turkish-override-3.html font-features-ref.html +fails-if(gtk2Widget) HTTP(..) == font-features-turkish-override-4.html font-features-ref.html +fails-if(gtk2Widget) HTTP(..) == font-features-turkish-override-5.html font-features-turkish.html diff --git a/layout/reftests/font-matching/reftest.list b/layout/reftests/font-matching/reftest.list index 4f45b319ad59..d1ca4e1630dd 100644 --- a/layout/reftests/font-matching/reftest.list +++ b/layout/reftests/font-matching/reftest.list @@ -17,7 +17,7 @@ != defaultjapanese-bolditalic.html defaultjapanese.html != defaultjapanese-bolditalic.html defaultjapanese-bold.html -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") != impact-bold.html impact.html # bug 539418 +random-if(cocoaWidget) != impact-bold.html impact.html # bug 539418 != impact-italic.html impact.html != impact-oblique.html impact.html != impact-bolditalic.html impact.html @@ -48,11 +48,11 @@ HTTP(..) == normalmedium.html normalmedium-ref.html HTTP(..) != normalmedium.html normalmedium-notref.html # Linux fails due to bolder bug -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == weightmapping-12.html weightmapping-12-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == weightmapping-25.html weightmapping-25-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == weightmapping-45.html weightmapping-45-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == weightmapping-458.html weightmapping-458-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == weightmapping-478.html weightmapping-478-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == weightmapping-7.html weightmapping-7-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == weightmapping-12579.html weightmapping-12579-ref.html +random-if(gtk2Widget) HTTP(..) == weightmapping-12.html weightmapping-12-ref.html +random-if(gtk2Widget) HTTP(..) == weightmapping-25.html weightmapping-25-ref.html +random-if(gtk2Widget) HTTP(..) == weightmapping-45.html weightmapping-45-ref.html +random-if(gtk2Widget) HTTP(..) == weightmapping-458.html weightmapping-458-ref.html +random-if(gtk2Widget) HTTP(..) == weightmapping-478.html weightmapping-478-ref.html +random-if(gtk2Widget) HTTP(..) == weightmapping-7.html weightmapping-7-ref.html +random-if(gtk2Widget) HTTP(..) == weightmapping-12579.html weightmapping-12579-ref.html diff --git a/layout/reftests/forms/reftest.list b/layout/reftests/forms/reftest.list index 4804bd549f04..c201004dab6d 100644 --- a/layout/reftests/forms/reftest.list +++ b/layout/reftests/forms/reftest.list @@ -14,12 +14,12 @@ HTTP(..) == text-control-baseline-1.html text-control-baseline-1-ref.html == textbox-setsize.xul textbox-setsize-ref.xul == textarea-resize.html textarea-resize-ref.html # an offset seems to apply to the native resizer on windows so skip this test for now -skip-if(MOZ_WIDGET_TOOLKIT=="windows") == textarea-resize-background.html textarea-resize-background-ref.html +skip-if(windowsWidget) == textarea-resize-background.html textarea-resize-background-ref.html != textarea-ltr.html textarea-rtl.html != textarea-ltr-scrollbar.html textarea-rtl-scrollbar.html != textarea-in-ltr-doc-scrollbar.html textarea-in-rtl-doc-scrollbar.html != textarea-ltr.html textarea-no-resize.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") != textarea-rtl.html textarea-no-resize.html # bug 558201 +random-if(gtk2Widget) != textarea-rtl.html textarea-no-resize.html # bug 558201 == textarea-setvalue-framereconstruction-1.html textarea-setvalue-framereconstruction-ref.html == radio-label-dynamic.html radio-label-dynamic-ref.html diff --git a/layout/reftests/line-breaking/reftest.list b/layout/reftests/line-breaking/reftest.list index 8fb894d28d42..d5e1c06e8bc2 100644 --- a/layout/reftests/line-breaking/reftest.list +++ b/layout/reftests/line-breaking/reftest.list @@ -6,9 +6,9 @@ # The following three tests may fail if rendering with Core Text (see bug 389074) # due to subpixel glyph positioning differences between the reference cases with
# and the automatically-wrapped lines in the test file -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == ja-1.html ja-1-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == ja-2.html ja-2-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == ja-3.html ja-3-ref.html +random-if(cocoaWidget) == ja-1.html ja-1-ref.html +random-if(cocoaWidget) == ja-2.html ja-2-ref.html +random-if(cocoaWidget) == ja-3.html ja-3-ref.html == leaders-1.html leaders-1-ref.html == markup-src-1.html markup-src-1-ref.html == non-breakable-1.html non-breakable-1-ref.html @@ -18,7 +18,7 @@ random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == ja-3.html ja-3-ref.html == quotationmarks-1.html quotationmarks-1-ref.html # The following is currently disabled on Linux because of a rendering issue with missing-glyph # representations on the test boxes. See bug #450088 for discussion. -skip-if(MOZ_WIDGET_TOOLKIT=="gtk2") == quotationmarks-cjk-1.html quotationmarks-cjk-1-ref.html +skip-if(gtk2Widget) == quotationmarks-cjk-1.html quotationmarks-cjk-1-ref.html == smileys-1.html smileys-1-ref.html == smileys-2.html smileys-2-ref.html == url-1.html url-1-ref.html diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list index d9e98161f510..851bd64341f5 100644 --- a/layout/reftests/native-theme/reftest.list +++ b/layout/reftests/native-theme/reftest.list @@ -30,7 +30,7 @@ fails-if(!nativeThemePref) != checkbox-native.html checkbox-nonnative.html != 427122-1.html 427122-1-ref.html # 403458 is a Windows-only bug -skip-if(MOZ_WIDGET_TOOLKIT!="windows") != 403458-winmenu-ltr.xul 403458-winmenu-rtl.xul +skip-if(!windowsWidget) != 403458-winmenu-ltr.xul 403458-winmenu-rtl.xul == 470711-1.xul 470711-1-ref.xul @@ -45,17 +45,17 @@ fails-if(!nativeThemePref) == box-shadow-styling.html box-shadow-styling-ref.htm # RTL mirroring tests == checkbox-not-mirrored-when-rtl.html checkbox-not-mirrored-when-rtl-ref.html -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == menulist-mirrored-when-rtl.xul menulist-mirrored-when-rtl-ref.xul -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == searchfield-mirrored-when-rtl.xul searchfield-mirrored-when-rtl-ref.xul -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == select-mirrored-when-rtl.html select-mirrored-when-rtl-ref.html +skip-if(!cocoaWidget) == menulist-mirrored-when-rtl.xul menulist-mirrored-when-rtl-ref.xul +skip-if(!cocoaWidget) == searchfield-mirrored-when-rtl.xul searchfield-mirrored-when-rtl-ref.xul +skip-if(!cocoaWidget) == select-mirrored-when-rtl.html select-mirrored-when-rtl-ref.html != resizer-bottomend.xul blank-window.xul == resizer-bottomend.xul resizer-bottomright.xul != resizer-bottomend.xul resizer-bottomend-rtl.xul -skip-if(MOZ_WIDGET_TOOLKIT=="gtk2") != resizer-bottomend-rtl.xul blank-window.xul -skip-if(MOZ_WIDGET_TOOLKIT=="gtk2") == resizer-bottomend-rtl.xul resizer-bottomend-flipped.xul +skip-if(gtk2Widget) != resizer-bottomend-rtl.xul blank-window.xul +skip-if(gtk2Widget) == resizer-bottomend-rtl.xul resizer-bottomend-flipped.xul # Windows-only, depends on native scrollbar metrics -skip-if(MOZ_WIDGET_TOOLKIT!="windows") == scroll-thumb-minimum-size-notheme.html scroll-thumb-minimum-size-notheme-ref.html -# skip-if(MOZ_WIDGET_TOOLKIT!="windows") == scroll-thumb-minimum-size-theme.html scroll-thumb-minimum-size-theme-ref.html # Bug 512206 +skip-if(!windowsWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minimum-size-notheme-ref.html +# skip-if(!windowsWidget) == scroll-thumb-minimum-size-theme.html scroll-thumb-minimum-size-theme-ref.html # Bug 512206 == checkbox-dynamic-1.html checkbox-dynamic-1-ref.html diff --git a/layout/reftests/ogg-video/reftest.list b/layout/reftests/ogg-video/reftest.list index fa606de3f6ba..469b88a6958d 100644 --- a/layout/reftests/ogg-video/reftest.list +++ b/layout/reftests/ogg-video/reftest.list @@ -1,7 +1,7 @@ HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html -skip-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html -skip-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html +skip-if(gtk2Widget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html +skip-if(gtk2Widget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html HTTP(..) == aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml HTTP(..) == aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html @@ -16,7 +16,7 @@ random HTTP(..) == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html HTTP(..) == offset-1.xhtml offset-1-ref.html random HTTP(..) == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html random HTTP(..) == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html -skip-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html +skip-if(gtk2Widget) HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html == poster-1.html poster-ref-blue250x200.html == poster-2.html poster-ref-black140x100.html == poster-3.html poster-ref-black140x100.html diff --git a/layout/reftests/pixel-rounding/reftest.list b/layout/reftests/pixel-rounding/reftest.list index 012dc7e59036..6ea2e0c2479c 100644 --- a/layout/reftests/pixel-rounding/reftest.list +++ b/layout/reftests/pixel-rounding/reftest.list @@ -167,7 +167,7 @@ fails == collapsed-border-top-6.html border-top-10-ref.html == rounded-background-color-width-left-5.html rounded-background-color-width-5.html == rounded-background-color-width-left-6.html rounded-background-color-width-6.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == background-image-tiling.html background-image-tiling-ref.html # probably bug 379317 +fails-if(cocoaWidget) == background-image-tiling.html background-image-tiling-ref.html # probably bug 379317 != border-image-width-0.html border-image-width-10.html == border-image-width-4.html border-image-width-0.html diff --git a/layout/reftests/selection/reftest.list b/layout/reftests/selection/reftest.list index 302ae772c819..d75987065b55 100644 --- a/layout/reftests/selection/reftest.list +++ b/layout/reftests/selection/reftest.list @@ -26,5 +26,5 @@ == extend-4b.html extend-4-ref.html != pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous-ref.html # These tests uses Highlight and HighlightText color keywords, they are not same as text selection color on Mac. -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == non-themed-widget.html non-themed-widget-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == themed-widget.html themed-widget-ref.html +fails-if(cocoaWidget) == non-themed-widget.html non-themed-widget-ref.html +fails-if(cocoaWidget) == themed-widget.html themed-widget-ref.html diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list index d09e307bbd45..c400b775f565 100644 --- a/layout/reftests/svg/reftest.list +++ b/layout/reftests/svg/reftest.list @@ -146,7 +146,7 @@ fails == inline-in-xul-basic-01.xul pass.svg == style-without-type-attribute.svg pass.svg == svg-in-foreignObject-01.xhtml svg-in-foreignObject-01-ref.xhtml == svg-in-foreignObject-02.xhtml svg-in-foreignObject-01-ref.xhtml # reuse -01-ref.xhtml -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == text-font-weight-01.svg text-font-weight-01-ref.svg # bug 386713 +random-if(gtk2Widget) == text-font-weight-01.svg text-font-weight-01-ref.svg # bug 386713 == switch-01.svg pass.svg == text-gradient-01.svg text-gradient-01-ref.svg == text-in-link-01.svg text-in-link-01-ref.svg @@ -154,7 +154,7 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == text-font-weight-01.svg text-font-weigh == text-in-link-03.svg text-in-link-03-ref.svg # Tests for bug 546813: sanity-check using HTML text, then test SVG behavior. != text-language-00.xhtml text-language-00-ref.xhtml -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") != text-language-01.xhtml text-language-01-ref.xhtml # Fails on Linux tryserver due to lack of CJK fonts. +random-if(gtk2Widget) != text-language-01.xhtml text-language-01-ref.xhtml # Fails on Linux tryserver due to lack of CJK fonts. == text-layout-01.svg text-layout-01-ref.svg == text-layout-02.svg text-layout-02-ref.svg == text-scale-01.svg text-scale-01-ref.svg diff --git a/layout/reftests/svg/smil/container/reftest.list b/layout/reftests/svg/smil/container/reftest.list index f452625f91b1..a974e345deb9 100644 --- a/layout/reftests/svg/smil/container/reftest.list +++ b/layout/reftests/svg/smil/container/reftest.list @@ -5,7 +5,7 @@ random == enveloped-tree-1.xhtml enveloped-tree-1-ref.xhtml # bug 470868 == promoted-tree-1.xhtml promoted-tree-1-ref.xhtml random == moved-tree-1.xhtml moved-tree-1-ref.xhtml # bug 470868 -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == deferred-anim-1.xhtml deferred-anim-1-ref.xhtml # bug 470868 +random-if(cocoaWidget) == deferred-anim-1.xhtml deferred-anim-1-ref.xhtml # bug 470868 == deferred-tree-1.xhtml deferred-tree-1-ref.xhtml == deferred-tree-2a.xhtml deferred-tree-2-ref.xhtml == deferred-tree-2b.xhtml deferred-tree-2-ref.xhtml diff --git a/layout/reftests/svg/smil/transform/reftest.list b/layout/reftests/svg/smil/transform/reftest.list index 3dded37b504c..24c2ffd50abc 100644 --- a/layout/reftests/svg/smil/transform/reftest.list +++ b/layout/reftests/svg/smil/transform/reftest.list @@ -11,5 +11,5 @@ == scale-1.svg scale-1-ref.svg == skew-1.svg skew-1-ref.svg == translate-clipPath-1.svg lime.svg -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == translate-gradient-1.svg lime.svg +fails-if(cocoaWidget) == translate-gradient-1.svg lime.svg == translate-pattern-1.svg lime.svg diff --git a/layout/reftests/table-background/reftest.list b/layout/reftests/table-background/reftest.list index 4bda432bab26..05e720ce9940 100644 --- a/layout/reftests/table-background/reftest.list +++ b/layout/reftests/table-background/reftest.list @@ -2,8 +2,8 @@ != backgr_border-table-cell.html empty.html != backgr_border-table-column-group.html empty.html # This seems to be caused by bug 527825 -asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",0-12) != backgr_border-table-column.html empty.html -asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",0-6) != backgr_border-table-quirks.html empty.html +asserts-if(gtk2Widget,0-12) != backgr_border-table-column.html empty.html +asserts-if(gtk2Widget,0-6) != backgr_border-table-quirks.html empty.html != backgr_border-table-row-group.html empty.html != backgr_border-table-row.html empty.html != backgr_border-table.html empty.html diff --git a/layout/reftests/table-bordercollapse/reftest.list b/layout/reftests/table-bordercollapse/reftest.list index 240a0a9b0f3f..a21f706e4148 100644 --- a/layout/reftests/table-bordercollapse/reftest.list +++ b/layout/reftests/table-bordercollapse/reftest.list @@ -19,7 +19,7 @@ == bc_dyn_table2.html bc_dyn_table2_ref.html == bc_dyn_table3.html bc_dyn_table3_ref.html == bc_borderoffset1.html bc_borderoffset1_ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == bc_borderoffset2.html bc_borderoffset2_ref.html # bug 477504 +fails-if(cocoaWidget) == bc_borderoffset2.html bc_borderoffset2_ref.html # bug 477504 == frame_above_rules_all.html frame_above_rules_all_ref.html == frame_above_rules_cols.html frame_above_rules_cols_ref.html == frame_above_rules_groups.html frame_above_rules_groups_ref.html diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list index 97c3d00a4679..367223ab1379 100644 --- a/layout/reftests/text/reftest.list +++ b/layout/reftests/text/reftest.list @@ -4,7 +4,7 @@ # The following test passes consistently only on Mac OS X; # both Windows and Linux give results that vary depending on the font size/zoom factor used, # because hinting affects the metrics used to compute the font size adjustment. See bug 429605. -random-if(MOZ_WIDGET_TOOLKIT!="cocoa") == font-size-adjust-02.html font-size-adjust-02-ref.html +random-if(!cocoaWidget) == font-size-adjust-02.html font-size-adjust-02-ref.html # This currently fails because line spacing does not respect font-size-adjust # in the "obvious" way, but it is unclear what the behavior should really be; # see bug #366138 for some (inconclusive) discussion @@ -33,7 +33,7 @@ random-if(MOZ_WIDGET_TOOLKIT!="cocoa") == font-size-adjust-02.html font-size-adj == white-space-2.html white-space-2-ref.html == wordwrap-01.html wordwrap-01-ref.html random == wordwrap-02.html wordwrap-02-ref.html # bad fonts on test boxes -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == wordwrap-03.html wordwrap-03-ref.html # Bad fonts on test boxes +random-if(gtk2Widget) == wordwrap-03.html wordwrap-03-ref.html # Bad fonts on test boxes == wordwrap-04.html wordwrap-04-ref.html == wordwrap-05.html wordwrap-05-ref.html == wordwrap-06.html wordwrap-06-ref.html @@ -45,9 +45,9 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == wordwrap-03.html wordwrap-03-ref.html # == word-spacing-01.html word-spacing-01-ref.html # the following will fail when rendering with Core Text (see bug 389074) due to what appears to be # an Apple bug: the presence of ZWNJ disturbs the positioning of an adjacent glyph. rdar://6427865 -random-if(MOZ_WIDGET_TOOLKIT=="cocoa") HTTP(..) == zwnj-01.xhtml zwnj-01-ref.xhtml +random-if(cocoaWidget) HTTP(..) == zwnj-01.xhtml zwnj-01-ref.xhtml HTTP(..) == zwnj-02.xhtml zwnj-02-ref.xhtml # HTTP(..) for ../filters.svg -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") != zwnj-01.html zwnj-01-notref.html # Bad fonts on the tinderbox -- works locally +random-if(gtk2Widget) != zwnj-01.html zwnj-01-notref.html # Bad fonts on the tinderbox -- works locally == cgj-01.html cgj-01-ref.html == 444656.html 444656-ref.html == 449555-1.html 449555-1-ref.html @@ -59,6 +59,6 @@ random HTTP(..) == 475092-pos.html 475092-sub.html # bug 482596 == rgba-text.html rgba-text-ref.html # Test for bug 575695, 'kern' table support # Random on Windows because behavior depends on Uniscribe version(?) -random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) != kerning-01.html kerning-01-notref.html +random-if(windowsWidget) HTTP(..) != kerning-01.html kerning-01-notref.html # Test for bug 577380, support for AAT layout (on OS X only) -random-if(MOZ_WIDGET_TOOLKIT!="cocoa") == 577380.html 577380-ref.html +random-if(!cocoaWidget) == 577380.html 577380-ref.html diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index 5725c36198d5..a583fb2480f0 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -17,7 +17,7 @@ load 399289-1.svg load 404470-1.html load 411603-1.html load 412588-1.html -asserts-if(MOZ_WIDGET_TOOLKIT=="windows",2) load 413274-1.xhtml # Bug 576435 +asserts-if(windowsWidget,2) load 413274-1.xhtml # Bug 576435 load 416461-1.xul load 418007-1.xhtml load 431705-1.xul diff --git a/modules/libpr0n/test/reftest/icon/win/reftest.list b/modules/libpr0n/test/reftest/icon/win/reftest.list index 19f1890c005d..a94cb5332d75 100644 --- a/modules/libpr0n/test/reftest/icon/win/reftest.list +++ b/modules/libpr0n/test/reftest/icon/win/reftest.list @@ -1,2 +1,2 @@ -skip-if(MOZ_WIDGET_TOOLKIT!="windows") HTTP == bug415761.sjs bug415761.ico -skip-if(MOZ_WIDGET_TOOLKIT!="windows") HTTP == bug415761cleanup.sjs about:blank +skip-if(!windowsWidget) HTTP == bug415761.sjs bug415761.ico +skip-if(!windowsWidget) HTTP == bug415761cleanup.sjs about:blank diff --git a/modules/libpr0n/test/reftest/jpeg/reftest.list b/modules/libpr0n/test/reftest/jpeg/reftest.list index 76cbf2713e6c..44297ebb5141 100644 --- a/modules/libpr0n/test/reftest/jpeg/reftest.list +++ b/modules/libpr0n/test/reftest/jpeg/reftest.list @@ -2,27 +2,27 @@ # Images of various sizes. == jpg-size-1x1.jpg jpg-size-1x1.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-2x2.jpg jpg-size-2x2.png +fails-if(windowsWidget) == jpg-size-2x2.jpg jpg-size-2x2.png == jpg-size-3x3.jpg jpg-size-3x3.png == jpg-size-4x4.jpg jpg-size-4x4.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-5x5.jpg jpg-size-5x5.png +fails-if(windowsWidget) == jpg-size-5x5.jpg jpg-size-5x5.png == jpg-size-6x6.jpg jpg-size-6x6.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-7x7.jpg jpg-size-7x7.png +fails-if(windowsWidget) == jpg-size-7x7.jpg jpg-size-7x7.png == jpg-size-8x8.jpg jpg-size-8x8.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-9x9.jpg jpg-size-9x9.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-15x15.jpg jpg-size-15x15.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-16x16.jpg jpg-size-16x16.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-17x17.jpg jpg-size-17x17.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-31x31.jpg jpg-size-31x31.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-32x32.jpg jpg-size-32x32.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-size-33x33.jpg jpg-size-33x33.png +fails-if(windowsWidget) == jpg-size-9x9.jpg jpg-size-9x9.png +fails-if(windowsWidget) == jpg-size-15x15.jpg jpg-size-15x15.png +fails-if(windowsWidget) == jpg-size-16x16.jpg jpg-size-16x16.png +fails-if(windowsWidget) == jpg-size-17x17.jpg jpg-size-17x17.png +fails-if(windowsWidget) == jpg-size-31x31.jpg jpg-size-31x31.png +fails-if(windowsWidget) == jpg-size-32x32.jpg jpg-size-32x32.png +fails-if(windowsWidget) == jpg-size-33x33.jpg jpg-size-33x33.png # Progressive encoding -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-progressive.jpg jpg-progressive.png +fails-if(windowsWidget) == jpg-progressive.jpg jpg-progressive.png # Grayscale colorspace -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-gray.jpg jpg-gray.png +fails-if(windowsWidget) == jpg-gray.jpg jpg-gray.png # CMYK colorspace -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-cmyk-1.jpg jpg-cmyk-1.png -fails-if(MOZ_WIDGET_TOOLKIT=="windows") == jpg-cmyk-2.jpg jpg-cmyk-2.png +fails-if(windowsWidget) == jpg-cmyk-1.jpg jpg-cmyk-1.png +fails-if(windowsWidget) == jpg-cmyk-2.jpg jpg-cmyk-2.png == jpg-srgb-icc.jpg jpg-srgb-icc.png # webcam-simulacrum.mjpg is a hand-edited file containing red.jpg and blue.jpg, diff --git a/modules/libpr0n/test/reftest/pngsuite-background/reftest.list b/modules/libpr0n/test/reftest/pngsuite-background/reftest.list index 3df0eef3139d..8682873c131c 100644 --- a/modules/libpr0n/test/reftest/pngsuite-background/reftest.list +++ b/modules/libpr0n/test/reftest/pngsuite-background/reftest.list @@ -5,18 +5,18 @@ # identically and thus share common reference HTML files. # bgai4a08 - 8 bit grayscale, alpha, no background chunk, interlaced -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bgai4a08.png bg__4a08.html +fails-if(!cocoaWidget) == wrapper.html?bgai4a08.png bg__4a08.html # bgai4a16 - 16 bit grayscale, alpha, no background chunk, interlaced -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bgai4a16.png bg__4a16.html +fails-if(!cocoaWidget) == wrapper.html?bgai4a16.png bg__4a16.html # bgan6a08 - 3x8 bits rgb color, alpha, no background chunk -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bgan6a08.png bg__6a08.html +fails-if(!cocoaWidget) == wrapper.html?bgan6a08.png bg__6a08.html # bgan6a16 - 3x16 bits rgb color, alpha, no background chunk -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bgan6a16.png bg__6a16.html +fails-if(!cocoaWidget) == wrapper.html?bgan6a16.png bg__6a16.html # bgbn4a08 - 8 bit grayscale, alpha, black background chunk -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bgbn4a08.png bg__4a08.html +fails-if(!cocoaWidget) == wrapper.html?bgbn4a08.png bg__4a08.html # bggn4a16 - 16 bit grayscale, alpha, gray background chunk -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bggn4a16.png bg__4a16.html +fails-if(!cocoaWidget) == wrapper.html?bggn4a16.png bg__4a16.html # bgwn6a08 - 3x8 bits rgb color, alpha, white background chunk -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bgwn6a08.png bg__6a08.html +fails-if(!cocoaWidget) == wrapper.html?bgwn6a08.png bg__6a08.html # bgyn6a16 - 3x16 bits rgb color, alpha, yellow background chunk -fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == wrapper.html?bgyn6a16.png bg__6a16.html +fails-if(!cocoaWidget) == wrapper.html?bgyn6a16.png bg__6a16.html diff --git a/modules/plugin/test/crashtests/crashtests.list b/modules/plugin/test/crashtests/crashtests.list index 6e27139a1814..3326b8748a7f 100644 --- a/modules/plugin/test/crashtests/crashtests.list +++ b/modules/plugin/test/crashtests/crashtests.list @@ -2,6 +2,6 @@ load 41276-1.html load 48856-1.html load 110650-1.html -skip-if(MOZ_WIDGET_TOOLKIT=="cocoa") script 539897-1.html +skip-if(cocoaWidget) script 539897-1.html script 540114-1.html load 570884.html diff --git a/toolkit/themes/pinstripe/reftests/reftest.list b/toolkit/themes/pinstripe/reftests/reftest.list index b8851a0fee5e..27034dd8629c 100644 --- a/toolkit/themes/pinstripe/reftests/reftest.list +++ b/toolkit/themes/pinstripe/reftests/reftest.list @@ -1,5 +1,5 @@ -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == 482681.xul 482681-ref.xul -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == radiosize.xul radiosize-ref.xul -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == checkboxsize.xul checkboxsize-ref.xul -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == baseline.xul about:blank -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == nostretch.xul nostretch-ref.xul +skip-if(!cocoaWidget) == 482681.xul 482681-ref.xul +skip-if(!cocoaWidget) == radiosize.xul radiosize-ref.xul +skip-if(!cocoaWidget) == checkboxsize.xul checkboxsize-ref.xul +skip-if(!cocoaWidget) == baseline.xul about:blank +skip-if(!cocoaWidget) == nostretch.xul nostretch-ref.xul diff --git a/view/crashtests/crashtests.list b/view/crashtests/crashtests.list index a887de73ca01..0405f6c07700 100644 --- a/view/crashtests/crashtests.list +++ b/view/crashtests/crashtests.list @@ -2,7 +2,7 @@ load 38589-1.xul load 64049-1.html load 281743-1.html load 323497-1.html -asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",0-2) load 382756-1.xul # Bug 540078 -asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",0-2) load 387745-1.svg # Bug 540078 +asserts-if(gtk2Widget,0-2) load 382756-1.xul # Bug 540078 +asserts-if(gtk2Widget,0-2) load 387745-1.svg # Bug 540078 load 429315-1.html load 507563-1.html diff --git a/widget/reftests/reftest.list b/widget/reftests/reftest.list index 5c48da932edb..36337fc45e0d 100644 --- a/widget/reftests/reftest.list +++ b/widget/reftests/reftest.list @@ -1 +1 @@ -skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") != 507947.html about:blank +skip-if(!cocoaWidget) != 507947.html about:blank