Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge default -> production

--HG--
branch : production
  • Loading branch information...
commit 998c4b6e8aacfcc536931ea846b69fe1be88dbd7 2 parents aaf906c + 5d7aabc
@escapewindow escapewindow authored
View
2  .hgtags
@@ -956,3 +956,5 @@ f6c8ed27364b7aef38a2ac46c36dcf3ce7ebe837 FENNEC_20_0b1_BUILD3
87813aad3de4d9b8df4ca46f7aeff81971dd7113 FENNEC_20_0b2_RELEASE
6d437a7d6243407ef1dea4fd1c4836960677f52d FENNEC_20_0b2_RELEASE
6d437a7d6243407ef1dea4fd1c4836960677f52d FENNEC_20_0b2_BUILD2
+e36c562a519fd388a9fc77df837873f7a090b907 THUNDERBIRD_20_0b1_RELEASE
+e36c562a519fd388a9fc77df837873f7a090b907 THUNDERBIRD_20_0b1_BUILD1
View
4 configs/unittests/mac_unittest.py
@@ -60,6 +60,10 @@
"reftest": ["tests/reftest/tests/layout/reftests/reftest.list"],
"crashtest": ["tests/reftest/tests/testing/crashtest/crashtests.list"],
"jsreftest": ["--extra-profile-file=tests/jsreftest/tests/user.js", "tests/jsreftest/tests/jstests.list"],
+ "reftest-ipc": ['--setpref=browser.tabs.remote=true',
+ 'tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list'],
+ "crashtest-ipc": ['--setpref=browser.tabs.remote=true',
+ 'tests/reftest/tests/testing/crashtest/crashtests.list'],
},
"all_xpcshell_suites": {
"xpcshell": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
View
6 configs/unittests/win_unittest.py
@@ -70,8 +70,12 @@
"reftest": ["tests/reftest/tests/layout/reftests/reftest.list"],
"crashtest": ["tests/reftest/tests/testing/crashtest/crashtests.list"],
"jsreftest": ["--extra-profile-file=tests/jsreftest/tests/user.js", "tests/jsreftest/tests/jstests.list"],
+ "reftest-ipc": ['--setpref=browser.tabs.remote=true',
+ 'tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list'],
"reftest-no-accel": ["--setpref=gfx.direct2d.disabled=true", "--setpref=layers.acceleration.disabled=true",
"tests/reftest/tests/layout/reftests/reftest.list"],
+ "crashtest-ipc": ['--setpref=browser.tabs.remote=true',
+ 'tests/reftest/tests/testing/crashtest/crashtests.list'],
},
"all_xpcshell_suites": {
"xpcshell": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
@@ -92,7 +96,7 @@
"cmd": [
# when configs are consolidated this python path will only show
# for windows.
- os.path.join(os.getcwd(), "build", "venv", "Scripts", "python"),
+ sys.executable,
"../scripts/external_tools/mouse_and_screen_resolution.py",
"--configuration-url",
"http://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" +
View
1  external_tools/mouse_and_screen_resolution.py
@@ -111,7 +111,6 @@ class POINT(Structure):
_fields_ = [("x", c_ulong), ("y", c_ulong)]
def queryMousePosition():
- global pt
pt = POINT()
windll.user32.GetCursorPos(byref(pt))
return { "x": pt.x, "y": pt.y}
Please sign in to comment.
Something went wrong with that request. Please try again.