Bug 628589 - [SeaMonkey] mochitest-plain-3: permanent "TEST-UNEXPECTED-FAIL | /tests/gfx/test_acceleration.html | Acceleration enabled on x86-64 OS X". (Windows 2003 too); (Dv1) test_selection_underline.html: Move waitForExplicitFinish() out of onLoad(), Make existing todo() more explicit.

r=masayuki a=(test only).

layout/generic/test/test_selection_underline.html

@@ -66,7 +66,9 @@ var gFontMetrics = [];
 
 if (kIsWin) {
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  if (!Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).DWriteEnabled) {
+  if (Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).DWriteEnabled) {
+    todo(false, "This test is not supported on Windows when DirectWrite is enabled.");
+  } else {
     gFontMetrics = [
       { emHeight: 16, ascent: 13, offset: -2, lineHeight: 1, descentLimit:  3 },
       { emHeight: 16, ascent: 17, offset: -2, lineHeight: 1, descentLimit:  5 },
@@ -77,10 +79,8 @@ if (kIsWin) {
     ];
   }
 }
-
 /*
-
-if (kIsMac) {
+else if (kIsMac) {
   // XXX mnakano: I got following metrics on my Mac (both 10.4 and 10.5).
   // However, on tinderbox machines, they are different values.  I'm not sure
   // the reason.
@@ -93,8 +93,7 @@ if (kIsMac) {
     { ascent: 56, offset: -6.500000, lineHeight: 2.600159 }
   ];
 }
-
-if (kIsLinux) {
+else if (kIsLinux) {
   // XXX mnakano: I got following metrics on my Ubuntu 8.10.  However, on
   // tinderbox machines, they are different.  Probably, the values depend on
   // the version of FreeType and Pango.  I bet we cannot test this on Linux
@@ -108,8 +107,10 @@ if (kIsLinux) {
     { ascent: 56, offset: -3.300781, lineHeight: 2.600002 }
   ];
 }
-
 */
+else {
+  todo(false, "This test is not supported on this platform.");
+}
 
 const kUnderlineStyles = [
   { color: "rgb(100%,  0%,  0%)", isIMESelection: false },
@@ -387,10 +388,7 @@ function doTest(aStyle, aSize)
 
 function onLoad()
 {
-  SimpleTest.waitForExplicitFinish();
-
   if (gFontMetrics.length == 0) {
-    todo(false, "test_selection_underline doesn't support this platform");
     SimpleTest.finish();
     return;
   }
@@ -436,6 +434,8 @@ function cleanup()
   }
 }
 
+SimpleTest.waitForExplicitFinish();
+
 </script>
 
 </head>