Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge default -> production

--HG--
branch : production
  • Loading branch information...
commit 998c4b6e8aacfcc536931ea846b69fe1be88dbd7 2 parents aaf906c + 5d7aabc
Aki Sasaki authored March 05, 2013
2  .hgtags
@@ -956,3 +956,5 @@ f6c8ed27364b7aef38a2ac46c36dcf3ce7ebe837 FENNEC_20_0b1_BUILD3
956 956
 87813aad3de4d9b8df4ca46f7aeff81971dd7113 FENNEC_20_0b2_RELEASE
957 957
 6d437a7d6243407ef1dea4fd1c4836960677f52d FENNEC_20_0b2_RELEASE
958 958
 6d437a7d6243407ef1dea4fd1c4836960677f52d FENNEC_20_0b2_BUILD2
  959
+e36c562a519fd388a9fc77df837873f7a090b907 THUNDERBIRD_20_0b1_RELEASE
  960
+e36c562a519fd388a9fc77df837873f7a090b907 THUNDERBIRD_20_0b1_BUILD1
4  configs/unittests/mac_unittest.py
@@ -60,6 +60,10 @@
60 60
         "reftest": ["tests/reftest/tests/layout/reftests/reftest.list"],
61 61
         "crashtest": ["tests/reftest/tests/testing/crashtest/crashtests.list"],
62 62
         "jsreftest": ["--extra-profile-file=tests/jsreftest/tests/user.js", "tests/jsreftest/tests/jstests.list"],
  63
+        "reftest-ipc": ['--setpref=browser.tabs.remote=true',
  64
+                        'tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list'],
  65
+        "crashtest-ipc": ['--setpref=browser.tabs.remote=true',
  66
+                          'tests/reftest/tests/testing/crashtest/crashtests.list'],
63 67
     },
64 68
     "all_xpcshell_suites": {
65 69
         "xpcshell": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
6  configs/unittests/win_unittest.py
@@ -70,8 +70,12 @@
70 70
         "reftest": ["tests/reftest/tests/layout/reftests/reftest.list"],
71 71
         "crashtest": ["tests/reftest/tests/testing/crashtest/crashtests.list"],
72 72
         "jsreftest": ["--extra-profile-file=tests/jsreftest/tests/user.js", "tests/jsreftest/tests/jstests.list"],
  73
+        "reftest-ipc": ['--setpref=browser.tabs.remote=true',
  74
+                        'tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list'],
73 75
         "reftest-no-accel": ["--setpref=gfx.direct2d.disabled=true", "--setpref=layers.acceleration.disabled=true",
74 76
                              "tests/reftest/tests/layout/reftests/reftest.list"],
  77
+        "crashtest-ipc": ['--setpref=browser.tabs.remote=true',
  78
+                          'tests/reftest/tests/testing/crashtest/crashtests.list'],
75 79
     },
76 80
     "all_xpcshell_suites": {
77 81
         "xpcshell": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
@@ -92,7 +96,7 @@
92 96
             "cmd": [
93 97
                 # when configs are consolidated this python path will only show
94 98
                 # for windows.
95  
-                os.path.join(os.getcwd(), "build", "venv", "Scripts", "python"),
  99
+                sys.executable,
96 100
                 "../scripts/external_tools/mouse_and_screen_resolution.py",
97 101
                 "--configuration-url",
98 102
                 "http://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" +
1  external_tools/mouse_and_screen_resolution.py
@@ -111,7 +111,6 @@ class POINT(Structure):
111 111
     _fields_ = [("x", c_ulong), ("y", c_ulong)]
112 112
 
113 113
 def queryMousePosition():
114  
-    global pt
115 114
     pt = POINT()
116 115
     windll.user32.GetCursorPos(byref(pt))
117 116
     return { "x": pt.x, "y": pt.y}

0 notes on commit 998c4b6

Please sign in to comment.
Something went wrong with that request. Please try again.