Commit Graph

527 Commits

Author SHA1 Message Date
Robert Sayre
edb7aca0d0 merge mozilla-central to tracemonkey. 2010-09-08 10:33:07 -04:00
Mitchell Field
52d9113c02 Bug 542582 - pymake should support -s. r=khuey, a=NPOTB 2010-09-08 02:06:55 +10:00
Phil Ringnalda
2996fb056f Bug 592953 - Remove ancient build/file_migrate.pl, which would move modified files from one CVS tree to another, r=khuey, a=NPOTB 2010-09-01 23:02:13 -07:00
Dmitri Gribenko
3dd644d597 Bug 590753. Avoid adding empty entries to paths. r=bsmedberg
--HG--
extra : rebase_source : 0220d37deb0ec175cc1580b0c1ec82c886c6db94
2010-09-06 15:18:07 +12:00
Robert Sayre
357a4a6366 Merge mozilla-central to tracemonkey. 2010-09-01 22:27:07 -07:00
Jonas Sicking
21b686ea6a Bug 590870: Allow mochitest domains that don't support XUL/XBL. r=ted a=test-only 2010-09-03 15:53:28 -07:00
Doug Turner
7ae483e1db Bug 489813 - Fire timeout error if provider fails to response after initial response. Also cleans up test. r=smaug a=jst 2010-08-31 09:15:52 -07:00
David Mandelin
f575742690 [JAEGER] Merge from Tracemonkey. 2010-08-30 11:38:48 -07:00
David Mandelin
78cdeefdf2 [JAEGER] Merge from Tracemonkey. 2010-08-24 11:56:29 -07:00
David Mandelin
67a9ce8c76 [JAEGER] Merge from tracemonkey. 2010-08-20 11:34:59 -07:00
David Mandelin
a21c621577 Merge from Tracemonkey. 2010-08-19 11:11:36 -07:00
Karl Tomlinson
a17dc95129 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
Jonas Sicking
1fb16b80d7 Fix missing comments from patch for bug 546857 2010-08-21 18:48:01 +02:00
Bobby Holley
ae9d0e0ff2 Backout of changesets c866e73f3209 and baff7b7b32bc because of sicking's push-and-run bustage. a=backout 2010-08-20 23:42:24 -04:00
Jonas Sicking
c8ed6b7843 Fix missing comments from patch for bug 546857 2010-08-20 17:50:35 -07:00
David Mandelin
acfc0bc281 [JAEGER] Merge from tracemonkey. 2010-08-11 11:30:10 -07:00
David Mandelin
df3e6a9e74 [JAEGER] Merge from tracemonkey. 2010-08-09 11:36:39 -07:00
David Mandelin
d7f6c4209b Merge from Tracemonkey. 2010-08-02 15:55:29 -07:00
David Mandelin
a73ecdeee1 Merge from Tracemonkey. 2010-07-28 11:16:36 -07:00
Robert Sayre
72e587294e Backed out changeset e393b9673207. ( Bug 573803 - add SSL WebSocket support to mochitest. r=ted ) 2010-07-29 13:13:11 -07:00
Jonathan Griffin
ed48fbc343 Bug 573803 - add SSL WebSocket support to mochitest. r=ted 2010-07-29 10:23:58 -07:00
Sean Stangl
7388a70f72 [JAEGER] Merge from TraceMonkey (which pulled m-c). 2010-07-20 22:24:39 -07:00
David Anderson
cf5a8cf505 [JAEGER] Merge from tracemonkey. 2010-07-19 20:49:26 -07:00
Clint Talbert
8cd44f2c7b Bug 584218 Fix sutagent bustage - checked in incorrect files a=bustage,NPOTB 2010-08-26 14:47:29 -07:00
Bob Moss
2a1c728d47 Bug 584218 Android SUT agent needs ability to update itself r=ctalbert a=NPOTB 2010-08-25 11:47:39 -07:00
David Anderson
64fd3377e9 [JAEGER] Merge from fatval & TM. 2010-07-05 18:07:39 -07:00
Vladimir Vukicevic
836d2f6c3a b=?; fix make-makefile and cairo-features.h.in hack; r=ted 2010-07-02 11:20:29 -07:00
David Mandelin
df6fc2e4a4 Browser prefs for enabling methodjit 2010-06-29 16:46:10 -07:00
Kyle Huey
4b34c7ceab Bug 585774: Revert pymake to an earlier version to fix a massive build perf loss. 2010-08-09 17:56:49 -07:00
Kyle Huey
f32d7a5a95 Backed out changeset f2c04d62dc9c 2010-08-09 17:55:33 -07:00
Benjamin Smedberg
ccb16680db Merge bug 579178 to mozilla-central. reviews by Mossop/khuey/jwalden/ted 2010-08-09 10:04:10 -04:00
Mitchell Field
02b7baf809 Bug 581938 - Update pymake snapshot. rs=ted 2010-08-06 01:08:40 +10:00
Benjamin Smedberg
a6c50c40f9 Bug 579178 part D - When unifying as sorted-matching, keep version A as the unified version, not the sorted version, r=ted 2010-08-05 10:11:39 -04:00
Kyle Huey
2450cd740b Backing out Bug 489813 due to test failures 2010-08-04 17:38:20 -07:00
Kyle Huey
ef7fa65c41 Backed out changeset 1d8d2deb3644 2010-08-04 17:36:54 -07:00
Kyle Huey
c5fc54ad89 Bug 518136: Use -showIncludes to generate dependencies for MSVC for a substantial build performance win. r=ted 2010-08-04 16:59:23 -07:00
Doug Turner
99723f5ed1 Bug 489813 - Fire timeout error if provider fails to response after initial response. Also cleans up test. r=olli
--HG--
extra : rebase_source : 00aa6024b9e3e998801cf548b8ade5c532a6965d
2010-08-04 13:58:15 -07:00
Clint Talbert
ad556ab54f Bug 580418 Fix remote reftests to start their own httpd.js webserver r=jmaher 2010-07-26 18:43:34 -07:00
Jonathan Griffin
889921576e Bug 572570 - backed out changeset 90ade0c197ed due to linux m0 oranges 2010-07-26 16:01:06 -07:00
Jonathan Griffin
e1a1e214a6 Bug 572570 - make ssltunnel recognize WebSocket traffic via header inspection. r=ted 2010-07-26 14:40:08 -07:00
Bob Moss
0c5474f8a1 Bug 579578 Update SUTAgent code for android r=ctalbert 2010-07-19 08:55:42 -07:00
Clint Talbert
954fc063b2 Bug 573281 Update Devicemanager.py for android r=jmaher 2010-07-19 08:55:42 -07:00
Eli Friedman
87a30182c7 Bug 579689 - Fix cases of return without expression in a function returning "int". r=khuey 2010-07-18 11:19:48 +02:00
Jonathan Griffin
9cc92295b6 Bug 572570 - allow ssltunnel to detect WebSocket traffic via header inspection. r=ted 2010-07-28 10:55:36 -07:00
Jacek Caban
f8de08b4af Bug 559854 - Compile target xpidl only if libIDL is configured when cross compiling. [r=ted]
(transplanted from 0388c837c9867762bcc10a1fb88428050d158479)

--HG--
extra : transplant_source : %03%88%C87%C9%86wb%BC%C1%0A%1F%B8%84%28%05%0D%15%84y
2010-06-02 10:08:00 -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
Benjamin Smedberg
b5d1f192d2 Unify should ensure that when a .manifest file is being compared, if the last line doesn't end with a newline, it should add one so that lines don't get munged together incorrectly. rs=ted 2010-06-29 19:19:23 -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
762def30bb Merge mozilla-central into the static-xpcom-registration branch. 2010-06-23 17:26:25 -04:00
Clint Talbert
da406e2cb1 Bug 567945 - Re-enable sutagent build now that we have proper tool chain on android builds r=ted 2010-06-23 09:57:17 -07:00