Commit Graph

959 Commits

Author SHA1 Message Date
Benjamin Smedberg
2a03b84fa5 Bug 576206 - hangs in necko unit tests on Windows because the content process is crashing, bandaid patch r=Mossop for landing into a CLOSED TREE
--HG--
extra : rebase_source : 7ee40a702c86acc3cc3872954a989b935cd0bec4
2010-07-01 16:03:42 -04:00
Benjamin Smedberg
4d172dd53d Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
a2833452f8 Merge mozilla-central to the bug 568691 branch.
--HG--
rename : gfx/public/nsITheme.h => gfx/src/nsITheme.h
2010-06-30 14:23:23 -04:00
Ted Mielczarek
17362ddaa6 bug 574357 - Plugin crash reports are submitted with Throttleable=0. r=dolske
--HG--
rename : modules/plugin/test/mochitest/test_crash_notify_no_report.xul => modules/plugin/test/mochitest/test_crash_submit.xul
2010-06-30 10:29:05 -04:00
Justin Dolske
157f21c04d Backed out changeset e112f68bc941 (bug 574357) due to test failures. 2010-06-29 22:45:30 -07:00
Ted Mielczarek
1ff7a5c880 bug 574357 - Plugin crash reports are submitted with Throttleable=0. r=dolske
--HG--
rename : modules/plugin/test/mochitest/test_crash_notify_no_report.xul => modules/plugin/test/mochitest/test_crash_submit.xul
2010-06-29 19:34:39 -04:00
Benjamin Smedberg
63c0077443 Merge mozilla-central into the branch for bug 568691, including fixup of the new jetpack binary module. 2010-06-25 19:41:09 -04:00
Benjamin Smedberg
abf280675d Testing fixes for bug 568691 - change xpcshell do_load_module to do_load_manifest, and switch the relevant tests to use manifests and the new function. 2010-06-25 10:43:25 -04:00
Benjamin Smedberg
762def30bb Merge mozilla-central into the static-xpcom-registration branch. 2010-06-23 17:26:25 -04:00
Benjamin Smedberg
8a8835638e Fix test packaging and execution from bug 568691. 2010-06-22 20:44:44 -04:00
Dave Townsend
20a7dcab0c Bug 573779: Log which tabs were left at the end of a test. r=gavin 2010-06-22 11:28:32 -07:00
wfernandom2004@gmail.com
abe089666e Bug 572975, bug 573227, websocket fixes, r=smaug
--HG--
extra : rebase_source : d9b5160666ce18344abb47634fa94405c9c2d070
2010-06-28 00:09:29 +03:00
Timothy Nikkel
862d66fc00 Bug 571640. Part 1. Enhance synthesizeDrop to take a source element to start the drag on. r=enndeakin 2010-06-25 16:51:17 -05:00
Jesse Ruderman
427777ed92 Bug 570287 - New stack fixer that uses breakpad symbol files. r=ted 2010-06-25 14:47:19 -07:00
Doug Turner
ba5d48b7ab merge with mc 2010-06-30 10:50:45 -07:00
Doug Turner
901e02b2de Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp
--HG--
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
2010-06-28 16:33:19 -07:00
Oleg Romashin
b8ab8239cd Auto-merge with m-c b51803f3fdef 2010-06-25 08:30:40 -04:00
Doug Turner
4719dd0705 Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
Joel Maher
7d77d349d6 Bug 567417 - bug to get mochitests running on fennec + e10s r=smaug,ctalbert 2010-06-24 13:30:50 -07:00
Clint Talbert
87348db73f Bug 573263 - Refactor remote reftest to work on android, create shared remoteautomation class r=jmaher 2010-06-24 02:32:01 -07:00
Clint Talbert
cc2d4b85a1 Bug 573263 - Refactor remote reftest to work on android, create shared remoteautomation class r=jmaher 2010-06-24 02:32:01 -07:00
Jason Duell
1b0fefc8aa Merged again from m-c to get latest bits and avoid deleted branch issue. 2010-06-22 17:57:09 -07:00
Jason Duell
d194b9d486 Merge from m-c.
Fair amount of merge conflicts.

Biggest item was changes to nsHttpChannel from web sockets changes.

Other likely suspects if things are borken:

nsFrameLoader.cpp:
    - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or
      nsnull (m-c) to local process call to new nsFrameMessageManager(),
      callback arg?  Smaug said null.
    - only calling SetCallBackData for local case.  also +r smaug.

nsPrefBranch.cpp had fairly extensive merge conflicts.

nsChromeRegistry had lots of changes.

Dougt did most of the non-necko changes (thanks).

--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
2010-06-22 17:33:57 -07:00
Doug Turner
ded51c1c5f Merging with M-C.
Hand merged the following files:

U chrome/src/nsChromeRegistry.cpp
U chrome/src/nsChromeRegistry.h
U content/base/src/nsFrameLoader.cpp
U content/base/src/nsFrameLoader.h
U dom/src/geolocation/nsGeolocation.cpp
U dom/src/geolocation/nsGeolocation.h
U netwerk/build/Makefile.in
U netwerk/cookie/nsCookieService.cpp
U netwerk/cookie/nsCookieService.h

--HG--
rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
2010-06-07 13:38:02 -07:00
Oleg Romashin
b36fb69349 Merge with latest mozilla central r 42802:ffbc3baf03ae 2010-05-25 15:19:33 -04:00
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Doug Turner
fe405e740c merge with m-c. resolved conflicts in:
U chrome/src/nsChromeRegistry.cpp
U content/base/src/Makefile.in
U dom/base/nsDOMClassInfo.cpp
U toolkit/toolkit-tiers.mk

--HG--
rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js
2010-05-11 11:09:54 -07:00
Honza Bambas
b0df7df6bb Bug 564975 - Intermittent test_bug455367.html | Test timed out, added larger timeout, r=ted 2010-05-21 22:43:09 +02:00
Josh Matthews
d6697b8a65 Bug 550860 - Profile directory for xpcshell based tests needs to be in a predefined, stable, location for at least some tests. r=ted 2010-04-28 03:28:56 +10:00
Ehsan Akhgari
35d3466b87 Bug 542928 - Add some more debugging logs to waitForFocus in order to track down the browser-chrome random orange; r=enndeakin 2010-05-19 09:52:07 -04:00
Ehsan Akhgari
886325df00 Bug 543278 - Try to use a more robust way of making sure that the main browser window is focused before running the next browser-chrome test; r=Mossop 2010-05-12 18:51:04 -04:00
Neil Deakin
a45e72c383 Bug 554873, improve waitForFocus to check for about:blank pages, r=mak 2010-05-18 09:31:03 -04:00
Ben Turner
2e8a7ea60e Bug 552300 - 'Use VMware VMs to run mochitests, optionally record and repeat until they fail.' r=ted. 2010-05-17 11:00:13 -07:00
Neil Deakin
5be95f4ad7 Bug 527099, use waitForFocus to wait for the frameset window 2010-05-17 09:21:11 -04:00
Simon Montagu
c3e7f17ab2 Tests for bug 563618 2010-05-11 17:38:25 +03:00
Jesse Ruderman
6c09de8976 Fix MozillaFileLogger bustage (https://bugzilla.mozilla.org/show_bug.cgi?id=570730#c9)
--HG--
extra : rebase_source : 1720f7e2e57fcebd2362e4f296b38ad463fd6484
2010-06-17 13:36:02 -07:00
Jonathan Griffin
ff0b54f0da Bug 570789. Add WebSocket support to mochitest. r=ted
--HG--
extra : rebase_source : 2e33d054a13824d1a7e527777383820946684c3f
2010-06-16 22:38:55 -07:00
Marco Bonardo
56687a63fc Bug 572425 - nsISearchEngine.getSubmission reponseType should be an [optional] param. r=gavin 2010-06-16 18:54:29 +02:00
Matt Brubeck
3666cdf87f Bug 572244 - Mochitests broken in Fennec by bug 571885 [r=gavin] 2010-06-15 23:55:46 -04:00
Oleg Romashin
87c511839e Merged with mozilla-central 2010-04-22 20:22:26 -04:00
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Mike Hommey
3744eabe50 Bug 555189 - Cleanup reftest and mochitest logs during 'make clean' [r=benjamin]
--HG--
extra : rebase_source : 6800bd4391219a089906714554c720b5093a7ea0
2010-04-19 10:28:15 +02:00
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Oleg Romashin
8de514e284 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Doug Turner
c15f159231 merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp. 2010-03-26 14:22:48 -07:00
Clint Talbert
4fd313f0d8 Bug 568624 Running runtestsremote does not work on windows r=jmaher 2010-06-15 13:02:17 -07:00
Benjamin Smedberg
3fcaf094f4 Bug 570488 - Fix loading of XPTs nested in JARs [2/2] r=mwu
--HG--
extra : rebase_source : b97a591c0260daed1f2ef2eba69e60ff82acd18f
2010-06-14 16:10:04 -07:00
Dão Gottwald
7235b520f2 Bug 571885 - blame tests for leaving too many tabs open. pending r=gavin 2010-06-14 17:53:43 +02:00
Michael Kohler
9397418412 Bug 506041 Part 2: Correct misspellings in source code
r=timeless
2010-05-13 14:19:50 +02:00