60baf1c0e9
Bug 592859 Update browser chrome tests to only use chrome paths for mochitest to prep for android support r=ctalbert a=NPOTB
2010-09-10 10:20:38 -07:00
00f202c9fa
Bug 451134 (1/2): switch to the official border-radius property names: purely mechanical changes. r=dbaron a2.0=blocking2.0:beta6
...
This was generated with the command:
LC_ALL=C grep -irlEZe '[-_]moz[-_]border[-_]radius([-_](top|bottom)(right|left))?' * | xargs -0 perl -pi -e \
's/-moz-border-radius-(top|bottom)(left|right)/border-${1}-${2}-radius/gi;
s/_moz_border_radius_(top|bottom)Right/border_${1}_right_radius/g;
s/_moz_border_radius_(top|bottom)Left/border_${1}_left_radius/g;
s/-moz-border-radius/border-radius/gi;
s/_moz_border_radius/border_radius/g;'
2010-09-09 08:21:47 -07:00
a3937f5ceb
Bug 592527 - runtest.py and runxpcshelltest.py should ignore ctrl-c when using an interactive debugger. r=ted, a=only-sorta-potb
2010-08-31 18:03:38 -07:00
c36c897a86
Test for bug 590812. r=jst a=test-only
2010-09-03 15:53:28 -07:00
2fac5b095b
Bug 586754 Xpcshell tests should use relativesrcdir instead of $MODULE (android prepartion) r=mitchell.field a=NPOTB
2010-08-26 14:47:28 -07:00
ec98104ba7
Backed out changeset 49beef9387a0 due to Xpcshell orange a=backout
...
--HG--
extra : rebase_source : 01307f705ab07b7784401d69a53921b200544978
2010-08-25 14:03:44 -07:00
62bd93f5af
Bug 586754 Change xpcshell to use $relativesrcdir instead of $module for android support a=NPOTB r=mitchell.field
2010-08-25 11:47:39 -07:00
70c6930b1d
merge backout
2010-08-24 15:51:34 -07:00
4bc7033e34
Backed out changeset 2d57f5901aa2 (bug 576026). a=bustage
2010-08-24 15:41:14 -07:00
09453a63b7
Bug 574189 - Fix chrome tests to work from an extension for android and e10s support a=NPOTB r=ctalbert
2010-08-24 10:29:34 -07:00
7517ca85ac
Bug 576026 - runtests.py.in is an interpolated file and shouldn't be. r=ted, a=bsmedberg
...
--HG--
rename : testing/mochitest/runtests.py.in => testing/mochitest/runtests.py
2010-08-21 12:52:22 -07:00
0a4de59cf6
Backout bugs 586754, 574189, 584611 due to orange. a=backout
2010-08-20 11:08:43 -07:00
cb20a221ad
Bug 586754 xpcshell tests should use relativesrcdir instead of $MODULE r=:Mitch a=NPOTB
2010-08-20 09:32:58 -07:00
05a108244d
Bug 574189 - Fix chrome tests so they can run from a .jar bundle (e10s, android) r=ctalbert a=NPOTB
2010-08-20 09:28:13 -07:00
6f0e39db30
Bug 584611 - Correct mochitest test detection to search for test_* r=jmaher a=NPOTB
2010-08-20 08:27:58 -07:00
b2785263cc
Backed out changeset 860c490eb849 (merge) a=backout
2010-08-24 16:01:38 +02:00
86ed8976fb
Backed out changeset 860c490eb849
2010-08-24 15:59:35 +02:00
6001368dcd
Bug 589498: clean up browser test timing code, r=dtownsend, a=tests
2010-08-23 15:44:07 -07:00
cff57d723a
bug 589313, remove obsolete l10n tests, those are hosted elsewhere, details in the bug. r/a=sayrer, NPOTB
2010-08-23 10:08:50 +02:00
038764f33f
use "Test timed out" so that automation.py detects the time out b=414049 r=gavin a=testing
...
--HG--
extra : rebase_source : 515c62bfe919ab0ec62bd916f2930ee0ec10f11e
2010-08-23 13:29:05 +12:00
a66e6f053d
b=414049 dump screen on first mochitest time out (GTK) r=ted a=testing
...
--HG--
extra : rebase_source : bc550d298019baa44f719cdd2b88181ac9c670eb
2010-08-23 13:27:26 +12:00
baadcf5d9e
Add a GDK/X11 screenshot to png utility b=414049 r=dbaron a=npotb
...
--HG--
extra : rebase_source : c73326cce47805fd5ce7cda7b8e51b5dda1e39a7
2010-08-23 12:11:43 +12:00
bd371a1300
Bug 477322: remove "Start new Session" button on about:sessionrestore. r=zpao, ui-r=faaborg
2010-06-16 15:51:04 -04:00
ec4b0011f4
Bug 556644 - 10. Make windows installer locale repacks use the standard repacking path, r=rs,khuey a=blocking2.0
2010-08-12 21:36:16 -07:00
66c3f75df9
Bug 585361 - Handle requests for synchronously removing an already asynchronously closing tab. r=gavin
...
--HG--
extra : rebase_source : 6f9c8f691706b63e70c2fc0d91b115e8894d5e0a
2010-08-11 15:12:54 +02:00
7274f7f20b
Back out all of dgottwald's push from Wed Aug 11 05:04:25 2010 PDT because the tree is in a state of chaos and the push was obviously against tree rules.
2010-08-11 09:00:33 -04:00
994fbfc403
Bug 585361 - Handle requests for synchronously removing an already asynchronously closing tab. r=gavin
2010-08-11 14:02:49 +02:00
570228abfb
temporary measure against infinite loop after browser_bug380960.js (bug 585361)
2010-08-10 10:48:20 +02:00
b4a9f61430
Bug 585396: Log how long tests take to run. r=robcee
2010-08-09 13:54:23 -07:00
36ab6635a2
Merge bug 579178 to mozilla-central. reviews by Mossop/khuey/jwalden/ted
2010-08-09 10:04:10 -04:00
a3bfdec863
Merge mozilla-central into single-chrome-manifest.
2010-08-04 14:23:04 -04:00
8adee9118a
Followup to bug 579178 part B (packaging) - only create the mochitest distribution bundle directory if it doesn't already exist
2010-07-22 10:44:38 -04:00
7ccbcf526e
Bug 579178 part C - Allow xpcshell to register additional manifests from the command line, and use this to load httpd.manifest in the xpcshell test harness, r=jwalden
2010-07-22 10:42:43 -04:00
71bf1136af
Bug 579718 part B - packaging and build changes to ship a single chrome.manifest from which other manifests are read. r=khuey See long-form commit details below:
...
In a nonpackaged build, we have the following manifests:
* chrome.manifest is just a series of manifest directives for all the other manifests, generated in rules.mk using buildlist.py
** components/interfaces.manifest is also generated in rules.mk using buildlist.py
** components/components.manifest contains only the *binary* components. JS components each have their own manifest which is installed to dist/bin/components
** Each chrome/jarfile.jar has a matching chrome/jarfile.manifest, and JarMaker.py inserts this filename into the root chrome.manifest by importing buildlist.py
In a packaged build, we end up with the following manifests:
* chrome.manifest lists the four manifests below
** components/interfaces.manifest
** components/components.manifest
** chrome/nonlocalized.manifest
** chrome/localized.manifest
In the future it should be possible to integrate the three non-localized manifests directly into the root chrome.manifest for increased performance, but this is slightly tricky because it involves rewriting some manifest instructions which may include relative JAR URIs. That is left for a future followup.
When we repackage a l10n build, we only have to replace chrome/localized.manifest.
2010-07-22 10:38:59 -04:00
50beba5a25
Bug 584995 - waitForFocus makes test analysis lie about the number of tests run. r=enn
...
--HG--
extra : rebase_source : 919daaea171f5e464b6363ba86c0c5202d5c66f1
2010-08-06 14:22:47 +02:00
679b13dd0f
Backed out changeset e393b9673207. ( Bug 573803 - add SSL WebSocket support to mochitest. r=ted )
2010-07-29 13:13:11 -07:00
abd3db0d7e
Bug 573803 - add SSL WebSocket support to mochitest. r=ted
2010-07-29 10:23:58 -07:00
42b6895038
Bug 557225 - Fix TryServer failures. r=cjones r=josh
2010-07-20 00:17:45 -04:00
fb807fcf7a
Backed out changeset cd5c28912351, bug 574663 (momentum scroll zooming) because the new test fails on Windows.
2010-08-02 17:51:57 +02:00
f9d3c8946e
Bug 574663 - Mark scroll events that are sent by touchpad momentum scrolling after the finger has left the touchpad with a kIsMomentum flag and prevent these events from changing the zoom factor. r=josh, r=smaug
2010-08-02 15:30:52 +02:00
d7024547e2
Bug 576151 - Better message for leftover tabs and windows on timed out browser-chrome tests. r=gavin
2010-07-15 22:38:03 +02:00
9d58daeb3f
Bug 514739: Remove 'block images from www.site.com' context menu item. r=gavin
2010-07-14 19:00:12 -07:00
4d90598aeb
Bug 578301 - Clearly identify expected and actual results when tests fail. r=dbaron
2010-07-14 22:55:21 +02:00
efe05cafdb
Bug 376553: Don't restart during startup affor extension and app changes. r=robstring, r=bsmedberg
2010-07-14 10:13:26 -07:00
086559bc2c
Bug 571989 part 4: Reorganize all the tests directories below gfx/. r=joedrew
...
--HG--
rename : gfx/thebes/crashtests/122875-1.html => gfx/tests/crashtests/122875-1.html
rename : gfx/thebes/crashtests/156882-1.html => gfx/tests/crashtests/156882-1.html
rename : gfx/thebes/crashtests/157320-1.html => gfx/tests/crashtests/157320-1.html
rename : gfx/thebes/crashtests/199379-1.html => gfx/tests/crashtests/199379-1.html
rename : gfx/thebes/crashtests/206561-1.html => gfx/tests/crashtests/206561-1.html
rename : gfx/thebes/crashtests/248518-1.html => gfx/tests/crashtests/248518-1.html
rename : gfx/thebes/crashtests/306649-1.xml => gfx/tests/crashtests/306649-1.xml
rename : gfx/src/thebes/crashtests/306902-1.xml => gfx/tests/crashtests/306902-1.xml
rename : gfx/thebes/crashtests/333861-1.html => gfx/tests/crashtests/333861-1.html
rename : gfx/thebes/crashtests/334735-1.html => gfx/tests/crashtests/334735-1.html
rename : gfx/thebes/crashtests/345576-1.html => gfx/tests/crashtests/345576-1.html
rename : gfx/thebes/crashtests/345629-1.html => gfx/tests/crashtests/345629-1.html
rename : gfx/thebes/crashtests/348462-1.html => gfx/tests/crashtests/348462-1.html
rename : gfx/thebes/crashtests/348462-2.html => gfx/tests/crashtests/348462-2.html
rename : gfx/thebes/crashtests/369688-1.html => gfx/tests/crashtests/369688-1.html
rename : gfx/thebes/crashtests/369947-1.html => gfx/tests/crashtests/369947-1.html
rename : gfx/thebes/crashtests/372094-1.xhtml => gfx/tests/crashtests/372094-1.xhtml
rename : gfx/thebes/crashtests/376627-1.html => gfx/tests/crashtests/376627-1.html
rename : gfx/thebes/crashtests/377231-1.html => gfx/tests/crashtests/377231-1.html
rename : gfx/thebes/crashtests/377232-1.xhtml => gfx/tests/crashtests/377232-1.xhtml
rename : gfx/thebes/crashtests/377461-1.xhtml => gfx/tests/crashtests/377461-1.xhtml
rename : gfx/thebes/crashtests/383473-1.html => gfx/tests/crashtests/383473-1.html
rename : gfx/src/thebes/crashtests/383872-1.svg => gfx/tests/crashtests/383872-1.svg
rename : gfx/thebes/crashtests/385228-1.svg => gfx/tests/crashtests/385228-1.svg
rename : gfx/thebes/crashtests/385228-2.svg => gfx/tests/crashtests/385228-2.svg
rename : gfx/thebes/crashtests/385289-1.xhtml => gfx/tests/crashtests/385289-1.xhtml
rename : gfx/thebes/crashtests/385417-1.html => gfx/tests/crashtests/385417-1.html
rename : gfx/thebes/crashtests/385417-2.html => gfx/tests/crashtests/385417-2.html
rename : gfx/thebes/crashtests/385423-1.html => gfx/tests/crashtests/385423-1.html
rename : gfx/thebes/crashtests/385423-2.html => gfx/tests/crashtests/385423-2.html
rename : gfx/thebes/crashtests/385719-1.html => gfx/tests/crashtests/385719-1.html
rename : gfx/thebes/crashtests/389326-1-inner.xhtml => gfx/tests/crashtests/389326-1-inner.xhtml
rename : gfx/thebes/crashtests/389326-1.html => gfx/tests/crashtests/389326-1.html
rename : gfx/thebes/crashtests/393746-1.xhtml => gfx/tests/crashtests/393746-1.xhtml
rename : gfx/thebes/crashtests/393749-1.html => gfx/tests/crashtests/393749-1.html
rename : gfx/thebes/crashtests/393822-1.html => gfx/tests/crashtests/393822-1.html
rename : gfx/thebes/crashtests/394246-1.html => gfx/tests/crashtests/394246-1.html
rename : gfx/thebes/crashtests/394246-2.html => gfx/tests/crashtests/394246-2.html
rename : gfx/thebes/crashtests/394384-1.html => gfx/tests/crashtests/394384-1.html
rename : gfx/thebes/crashtests/395335-1.xhtml => gfx/tests/crashtests/395335-1.xhtml
rename : gfx/thebes/crashtests/395458-1.html => gfx/tests/crashtests/395458-1.html
rename : gfx/thebes/crashtests/396321-1.svg => gfx/tests/crashtests/396321-1.svg
rename : gfx/thebes/crashtests/398042-1.xhtml => gfx/tests/crashtests/398042-1.xhtml
rename : gfx/thebes/crashtests/398042-2.xhtml => gfx/tests/crashtests/398042-2.xhtml
rename : gfx/thebes/crashtests/402307-1.html => gfx/tests/crashtests/402307-1.html
rename : gfx/thebes/crashtests/403464-1.html => gfx/tests/crashtests/403464-1.html
rename : gfx/thebes/crashtests/404112-1.html => gfx/tests/crashtests/404112-1.html
rename : gfx/thebes/crashtests/404112-2.html => gfx/tests/crashtests/404112-2.html
rename : gfx/thebes/crashtests/405268-1.xhtml => gfx/tests/crashtests/405268-1.xhtml
rename : gfx/thebes/crashtests/407761-1.html => gfx/tests/crashtests/407761-1.html
rename : gfx/thebes/crashtests/407842.html => gfx/tests/crashtests/407842.html
rename : gfx/thebes/crashtests/408754-1.html => gfx/tests/crashtests/408754-1.html
rename : gfx/thebes/crashtests/410728-1.xml => gfx/tests/crashtests/410728-1.xml
rename : gfx/thebes/crashtests/416637-1.html => gfx/tests/crashtests/416637-1.html
rename : gfx/thebes/crashtests/419095-1.html => gfx/tests/crashtests/419095-1.html
rename : gfx/thebes/crashtests/419255-1.html => gfx/tests/crashtests/419255-1.html
rename : gfx/thebes/crashtests/420945-1.html => gfx/tests/crashtests/420945-1.html
rename : gfx/thebes/crashtests/420962-1.html => gfx/tests/crashtests/420962-1.html
rename : gfx/thebes/crashtests/421393-1.html => gfx/tests/crashtests/421393-1.html
rename : gfx/thebes/crashtests/421813-1.html => gfx/tests/crashtests/421813-1.html
rename : gfx/src/thebes/crashtests/423110-1.xhtml => gfx/tests/crashtests/423110-1.xhtml
rename : gfx/thebes/crashtests/423270-1.html => gfx/tests/crashtests/423270-1.html
rename : gfx/thebes/crashtests/429899-1.html => gfx/tests/crashtests/429899-1.html
rename : gfx/thebes/crashtests/441360.html => gfx/tests/crashtests/441360.html
rename : gfx/thebes/crashtests/441360_data.gif => gfx/tests/crashtests/441360_data.gif
rename : gfx/src/thebes/crashtests/445711.html => gfx/tests/crashtests/445711.html
rename : gfx/thebes/crashtests/463307-1.html => gfx/tests/crashtests/463307-1.html
rename : gfx/thebes/crashtests/467703-1.xhtml => gfx/tests/crashtests/467703-1.xhtml
rename : gfx/thebes/crashtests/467873-1.html => gfx/tests/crashtests/467873-1.html
rename : gfx/thebes/crashtests/470418-1.html => gfx/tests/crashtests/470418-1.html
rename : gfx/thebes/crashtests/474410-1.html => gfx/tests/crashtests/474410-1.html
rename : gfx/thebes/crashtests/483120-1.xhtml => gfx/tests/crashtests/483120-1.xhtml
rename : gfx/thebes/crashtests/483120-2.xhtml => gfx/tests/crashtests/483120-2.xhtml
rename : gfx/thebes/crashtests/487549-1.html => gfx/tests/crashtests/487549-1.html
rename : gfx/thebes/crashtests/487549-bad_kern_table.ttf => gfx/tests/crashtests/487549-bad_kern_table.ttf
rename : gfx/thebes/crashtests/487724-1.html => gfx/tests/crashtests/487724-1.html
rename : gfx/thebes/crashtests/490777-1.html => gfx/tests/crashtests/490777-1.html
rename : gfx/thebes/crashtests/532726-1.html => gfx/tests/crashtests/532726-1.html
rename : gfx/thebes/crashtests/538065-1.html => gfx/tests/crashtests/538065-1.html
rename : gfx/thebes/crashtests/546870-1.html => gfx/tests/crashtests/546870-1.html
rename : gfx/thebes/crashtests/balinese-letter-spacing.html => gfx/tests/crashtests/balinese-letter-spacing.html
rename : gfx/thebes/crashtests/crashtests.list => gfx/tests/crashtests/crashtests.list
rename : gfx/thebes/test/gfxColorManagementTest.cmtest => gfx/tests/gfxColorManagementTest.cmtest
rename : gfx/thebes/test/gfxColorManagementTest.cpp => gfx/tests/gfxColorManagementTest.cpp
rename : gfx/thebes/test/gfxFontSelectionTest.cpp => gfx/tests/gfxFontSelectionTest.cpp
rename : gfx/thebes/test/gfxFontSelectionTests.h => gfx/tests/gfxFontSelectionTests.h
rename : gfx/thebes/test/gfxSurfaceRefCountTest.cpp => gfx/tests/gfxSurfaceRefCountTest.cpp
rename : gfx/thebes/test/gfxTestCocoaHelper.h => gfx/tests/gfxTestCocoaHelper.h
rename : gfx/thebes/test/gfxTestCocoaHelper.mm => gfx/tests/gfxTestCocoaHelper.mm
rename : gfx/thebes/test/gfxTextRunPerfTest.cpp => gfx/tests/gfxTextRunPerfTest.cpp
rename : gfx/thebes/test/gfxWordCacheTest.cpp => gfx/tests/gfxWordCacheTest.cpp
rename : gfx/thebes/mochitest/test_bug509244.html => gfx/tests/mochitest/test_bug509244.html
rename : gfx/thebes/mochitest/test_bug513439.html => gfx/tests/mochitest/test_bug513439.html
rename : gfx/thebes/test/per-word-runs.h => gfx/tests/per-word-runs.h
rename : gfx/thebes/test/process-textruns.pl => gfx/tests/process-textruns.pl
rename : gfx/thebes/test/testprofiles/DELL2407WFP-2B283C91.icc => gfx/tests/testprofiles/DELL2407WFP-2B283C91.icc
rename : gfx/thebes/test/testprofiles/G22LWk-2489A79.icc => gfx/tests/testprofiles/G22LWk-2489A79.icc
rename : gfx/thebes/test/testprofiles/MBP20080419-1.icc => gfx/tests/testprofiles/MBP20080419-1.icc
rename : gfx/thebes/test/testprofiles/PhLCD17a.icm => gfx/tests/testprofiles/PhLCD17a.icm
rename : gfx/thebes/test/testprofiles/identity.icc => gfx/tests/testprofiles/identity.icc
rename : gfx/thebes/test/testprofiles/murphy.icc => gfx/tests/testprofiles/murphy.icc
rename : gfx/thebes/test/testprofiles/sRGB_IEC61966-2-1_noBPC.icc => gfx/tests/testprofiles/sRGB_IEC61966-2-1_noBPC.icc
rename : gfx/thebes/test/testprofiles/sRGB_IEC61966-2-1_withBPC.icc => gfx/tests/testprofiles/sRGB_IEC61966-2-1_withBPC.icc
rename : gfx/thebes/test/testprofiles/sRGB_v4_ICC_preference.icc => gfx/tests/testprofiles/sRGB_v4_ICC_preference.icc
2010-07-13 14:54:18 -07:00
f9f0f5e759
Bug 572570 - allow ssltunnel to detect WebSocket traffic via header inspection. r=ted
2010-07-28 10:55:36 -07:00
9f0967e24e
Bug 563095 Ensure package test target for Android contains sutagent apk r=ted a=NPOTB
2010-07-26 18:43:34 -07:00
7df41dd1b2
Bug 580418 Fix remote reftests to start their own httpd.js webserver r=jmaher
2010-07-26 18:43:34 -07:00
bd7c78cd13
Bug 573694 Optionally allow reftest harness to write output to log file for android r=dbaron
2010-07-26 18:43:33 -07:00
58e71c59f4
Bug 572570 - backed out changeset 90ade0c197ed due to linux m0 oranges
2010-07-26 16:01:06 -07:00
33af957293
Bug 572570 - make ssltunnel recognize WebSocket traffic via header inspection. r=ted
2010-07-26 14:40:08 -07:00
a50dcbc4c4
Bug 568698 - Instead of fixing two globals in the jetpack process, allow jetpack to create sandboxes in which to load user code and implementation modules, r=bent
2010-07-08 09:40:07 -07:00
f4237b25a4
Bug 566050: Make runxpcshelltests.py tests more amenable to non-standard debugging scenarios. r=ted
2010-02-10 14:52:16 -08:00
05ec0bfc11
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
dfed11844b
Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.
2010-07-01 11:55:57 -04:00
94ef4d2ac3
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
6b1c15948b
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
d559bf005f
Backed out changeset e112f68bc941 (bug 574357) due to test failures.
2010-06-29 22:45:30 -07:00
b98c629748
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
b54a384bb8
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
0d4fc0a836
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
f56445a420
Merge mozilla-central into the static-xpcom-registration branch.
2010-06-23 17:26:25 -04:00
f60acd9726
Fix test packaging and execution from bug 568691.
2010-06-22 20:44:44 -04:00
454e67e6cc
Bug 573779: Log which tabs were left at the end of a test. r=gavin
2010-06-22 11:28:32 -07:00
3d7d6602a6
Bug 572975, bug 573227, websocket fixes, r=smaug
...
--HG--
extra : rebase_source : d9b5160666ce18344abb47634fa94405c9c2d070
2010-06-28 00:09:29 +03:00
08166d8e8b
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
e3a2807fc0
Bug 570287 - New stack fixer that uses breakpad symbol files. r=ted
2010-06-25 14:47:19 -07:00
dd7ab04f73
merge with mc
2010-06-30 10:50:45 -07:00
c7c3407599
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
6f07b68ff9
Auto-merge with m-c b51803f3fdef
2010-06-25 08:30:40 -04:00
c1b97654d7
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
38730305a7
Bug 567417 - bug to get mochitests running on fennec + e10s r=smaug,ctalbert
2010-06-24 13:30:50 -07:00
5b5a4adcab
Bug 573263 - Refactor remote reftest to work on android, create shared remoteautomation class r=jmaher
2010-06-24 02:32:01 -07:00
c1ea68a998
Bug 573263 - Refactor remote reftest to work on android, create shared remoteautomation class r=jmaher
2010-06-24 02:32:01 -07:00
8b09ed7151
Merged again from m-c to get latest bits and avoid deleted branch issue.
2010-06-22 17:57:09 -07:00
549ae22a9e
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
6e5944e4fe
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
91d5a62423
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
fea6936df1
Merged m-c
2010-05-13 18:04:53 -05:00
7492065872
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
d1441baf4a
Bug 564975 - Intermittent test_bug455367.html | Test timed out, added larger timeout, r=ted
2010-05-21 22:43:09 +02:00
f429b8be27
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
e9dbf69d65
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
82630d3798
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
114a8a3812
Bug 554873, improve waitForFocus to check for about:blank pages, r=mak
2010-05-18 09:31:03 -04:00
f3131513d2
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
3384016566
Bug 527099, use waitForFocus to wait for the frameset window
2010-05-17 09:21:11 -04:00
e5e59d7066
Tests for bug 563618
2010-05-11 17:38:25 +03:00
c49b5fefee
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
33d2462456
Bug 570789. Add WebSocket support to mochitest. r=ted
...
--HG--
extra : rebase_source : 2e33d054a13824d1a7e527777383820946684c3f
2010-06-16 22:38:55 -07:00
cab3829395
Bug 572425 - nsISearchEngine.getSubmission reponseType should be an [optional] param. r=gavin
2010-06-16 18:54:29 +02:00
02ca497833
Bug 572244 - Mochitests broken in Fennec by bug 571885 [r=gavin]
2010-06-15 23:55:46 -04:00
dc47e440f0
Merged with mozilla-central
2010-04-22 20:22:26 -04:00
5350023988
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
7650e02a73
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
2918f2e692
Merge mozilla-central
2010-04-16 01:34:35 -05:00
f3e3834d75
Merged with mozilla-central
2010-04-07 06:59:04 -04:00
55aabe42b5
merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.
2010-03-26 14:22:48 -07:00
2dcd89fec8
Bug 568624 Running runtestsremote does not work on windows r=jmaher
2010-06-15 13:02:17 -07:00
Joel Maher
Zack Weinberg ext:(%2C%20L.%20David%20Baron%20%3Cdbaron%40dbaron.org%3E)
Justin Lebar
Jonas Sicking
Clint Talbert
Edmund Wong
Dão Gottwald
Gavin Sharp
Axel Hecht
Karl Tomlinson
Ted Mielczarek ext:(%20and%20Karl%20Tomlinson%20%3Ckarlt%2B%40karlt.net%3E)
Michael Wu
Benjamin Smedberg
Dave Townsend
Robert Sayre
Jonathan Griffin
Benoit Girard
Markus Stange
Marco Bonardo
Frank Yan
Chris Jones
Justin Dolske
wfernandom2004@gmail.com
Timothy Nikkel
Jesse Ruderman
Doug Turner
Oleg Romashin
Jason Duell
Olli Pettay
Honza Bambas
Josh Matthews
Ehsan Akhgari
Neil Deakin
Ben Turner
Simon Montagu
Matt Brubeck
Mike Hommey