Bug 578588 - Test suite may not work correctly on Win64 because navigator.platform is Win64. r=sayrer, a=Test Only
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 30 Jul 2010 17:18:45 +0900
changeset 48401 decac99650a5e5c47251c531489f3212a79bc4ae
parent 48400 5b189034696e45fa4c3f0767fee81fba2abd520f
child 48402 c5f35032f22df63a99d63bba7cf791ae309d0ab7
push id14714
push userm_kato@ga2.so-net.ne.jp
push dateFri, 30 Jul 2010 08:27:44 +0000
treeherderautoland@decac99650a5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssayrer, Test
bugs578588
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 578588 - Test suite may not work correctly on Win64 because navigator.platform is Win64. r=sayrer, a=Test Only
layout/forms/test/test_bug348236.html
modules/libpr0n/test/reftest/pngsuite-ancillary/qcms-asm-check.js
--- a/layout/forms/test/test_bug348236.html
+++ b/layout/forms/test/test_bug348236.html
@@ -108,17 +108,17 @@ addLoadEvent(function test() {
     // Test ALT-Down.
     testKey(IDOMKeyEvent.DOM_VK_DOWN, IDOMNSEvent.ALT_MASK, "ALT-Down", nextKey1)
     function nextKey1() {
         // Test ALT-Up.
         testKey(IDOMKeyEvent.DOM_VK_UP, IDOMNSEvent.ALT_MASK, "ALT-Up", nextKey2)
     }
     function nextKey2() {
         // Test the F4 key on OS/2 and Windows.
-        if (/OS\/2|Win32/i.test(navigator.platform))
+        if (/OS\/2|Win/i.test(navigator.platform))
             testKey(IDOMKeyEvent.DOM_VK_F4, 0, "F4", finished)
         else
             finished()
     }
     function finished() {
     // Reset value to get the expected value if we reload the page.
         eSelect.selectedIndex = 0
         SimpleTest.finish()
--- a/modules/libpr0n/test/reftest/pngsuite-ancillary/qcms-asm-check.js
+++ b/modules/libpr0n/test/reftest/pngsuite-ancillary/qcms-asm-check.js
@@ -5,17 +5,17 @@ function check_qcms_has_assembly()
 {
     // We have assembly code on x86 and x86_64 architectures.
     // Unfortunately, detecting that is a little complicated.
 
     if (navigator.platform == "MacIntel") {
         return true;
     }
 
-    if (navigator.platform == "Win32" || navigator.platform == "OS/2") {
+    if (navigator.platform.indexOf("Win") == 0 || navigator.platform == "OS/2") {
         // Assume all Windows and OS/2 is x86 or x86_64.  We don't
         // expose any way for Web content to check.
         return true;
     }
 
     // On most Unix-like platforms, navigator.platform is basically
     // |uname -sm|.
     if (navigator.platform.match(/(i[3456]86|x86_64|amd64|i86)/)) {