summaryrefslogtreecommitdiffstats
path: root/chromium/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* Revert "Revert "Merge third_party/angle_dx11 replacing third_party/angle""Bo Liu2013-06-241-1/+1
| | | | | | | | This reverts commit f85152d3feb7e2102312d3fbc60cbd3d633237ad. Switch to angle_dx11 happened in chromium r208191 again. Change-Id: Ie6521f85b0aff9f2513dc767ed995a7746210060
* Revert "Merge third_party/angle_dx11 replacing third_party/angle"Bo Liu2013-06-191-1/+1
| | | | | | | | | | This reverts commit 25b96b14b9f77ae4317836b6501149715f489263. Upstream reverted due to incorrectly using codesite svn that cannot handle the load of all of chromium. Should have used GoB mirror instead. http://src.chromium.org/viewvc/chrome?revision=207244&view=revision Change-Id: Ia0fb2f72317cddfaadd932bc62bdf8c6958fb170
* Merge third_party/angle_dx11 replacing third_party/angleBo Liu2013-06-181-1/+1
| | | | Change-Id: Iab9ef13c0a0ffb652e6d6a4e27e5ebf0ee94cda6
* Add third_party/mesa/src to automerger project list.Ben Murdoch2013-06-101-0/+1
| | | | Change-Id: I1c7d091c4fcc15ec2bb22a836e0132b954ab2943
* Add tool to check that we jarjar'ed everything.Torne (Richard Coles)2013-06-071-0/+74
| | | | | | | | | | | | Add a tool to verify that after jarjar has run, all the classes remaining are in whitelisted packages. This will ensure that we don't accidentally introduce a conflicting class definition into the system classpath by failing to rename a new dependency. Make the built module depend on this check step so that the build will fail if the check doesn't pass. Bug: 8030113 Change-Id: I92fc75eeee644a3eb05a13799ae398be20c286b3
* Do not skip runhooks on tot botBo Liu2013-05-311-1/+1
| | | | Change-Id: I76d140906aa41ce333eee5c8dc8df5cbbbaded12
* Merge scripts: add LASTCHANGE.blink.Torne (Richard Coles)2013-05-311-0/+13
| | | | | | | | Create build/util/LASTCHANGE.blink when merging, containing the last version of Blink merged into third_party/WebKit. This is used to generate version header files. Change-Id: I3ddf5be9081d06541c48713db88a47ca0d37b33e
* Disable testFindNextJonathan Dixon2013-05-271-0/+2
| | | | | | | This is the only test failing in new gfx architecture, so disabling it to allow earlier switch over to this mode. Change-Id: Id2ff6d02bc77cc1cb8fe47f2e7adc3cb5b9f2a95
* Mark flaky android.webkit.cts.WebHistoryItemTest#testWebHistoryItem as failingMikhail Naganov2013-05-241-0/+2
| | | | | | BUG=9121594 Change-Id: I6c1dbf2d12f50e4a059f60d13bf92bd99c114189
* Merge "Mark flaky android.webkit.cts.WebViewTest#testRequestImageRef as ↵Mikhail Naganov2013-05-231-0/+2
|\ | | | | | | failing" into master-chromium
| * Mark flaky android.webkit.cts.WebViewTest#testRequestImageRef as failingMikhail Naganov2013-05-231-0/+2
| | | | | | | | Change-Id: I3a6be4eead522cd39a6757399a20af57a027e8a8
* | Merge "Update CTS expectations for Chromium WebView." into master-chromiumBen Murdoch2013-05-211-1/+0
|\ \
| * | Update CTS expectations for Chromium WebView.Ben Murdoch2013-05-211-1/+0
| |/ | | | | | | | | | | | | WebSettings.get[set]SaveFormData has been implemented. Bug: 6335434 Change-Id: I61bdb68ef54ba2b8009fcc737a9b5661aa8bce7a
* / Change --screenshot-on-ui-failure to --screenshot-on-failure.Ben Murdoch2013-05-211-1/+1
|/ | | | | | | Flag was renamed and CTS runner doesn't accept arguments it doesn't recognize. Change-Id: I5f6f3515e6b2edb009efe7717fe386f429dcb0ab
* Merge "Merge scripts: update merge_to_master." into master-chromiumTorne (Richard Coles)2013-05-141-9/+23
|\
| * Merge scripts: update merge_to_master.Torne (Richard Coles)2013-05-131-9/+23
| | | | | | | | | | | | | | | | Update merge_to_master.py to work with the new separate history projects; also add support for merging a specific chromium revision using the archived revisions on the server. Change-Id: Ifaf3aefe0b88936e98c9a7db2605417e89accbe9
* | Merge "Fix webview_command_line script." into master-chromiumPrimiano Tucci2013-05-141-4/+3
|\ \
| * | Fix webview_command_line script.Primiano Tucci2013-05-081-4/+3
| |/ | | | | | | | | | | | | | | | | | | CommandLine.initFromFile expects a binary name as first argument (which is subsequently stripped off). Prepending "webview " string when creating the webview-command-line file. BUG:8357127 Change-Id: I0a3553f73bcc205e192bc9ae70d3b4784625bf54
* / Add telemetry_apk app for running WebView telemetry scripts.Primiano Tucci2013-05-136-0/+163
|/ | | | | | | | A simple apk that creates a blank WebView instance, which is hooked by telemetry scripts. BUG:8885150 Change-Id: I030d5630aea85185e8b3f332675d224563e80efa
* Switched WebView command line to use file instead of system property.Primiano Tucci2013-05-071-0/+32
| | | | | | | | | | | Removed the former |webview.chromium.flags| system property. Now WebView startup paths load the command line arguments from /data/local/tmp/webview-command-line (if the file exists). Adding also the webview_command_line script for getting/setting the file contents (like adb_content_shell_command_line). BUG:8357127 Change-Id: Ic8962d88e7d8895f04897fb34303abf8517fc560
* automerger: push archived revisions and fix a bug.Torne (Richard Coles)2013-05-021-4/+10
| | | | | | | | | | | | When we push a merge successfully, also push a new ref under refs/archive/chromium-* with the revision number. This allows specific past merge points to be checked out across all chromium_org/* projects correctly. We were also incorrectly using git push -f even for pushing to master-chromium, which could cause downstream changes to be lost; instead of using -f just specify the + prefix on the refs we want to allow non-fast-forward updates. Change-Id: Ide846f2213228b721f90db544f33be268f47759b
* Update test expectations.Ben Murdoch2013-04-301-3/+5
| | | | | | | Update bug numbers for CTS tests and add testFlingScroll as a failure. Change-Id: Ifd5b7d317e2f51470b31308d714dd18471b32081
* Merge tool: pass "all" to gyp_webview.Torne (Richard Coles)2013-04-301-1/+1
| | | | | | | | | In preparation for changing gyp_webview to only generate makefiles for one platform by default, pass it "all" from the merge script to tell it to generate all of them. It currently doesn't use its arguments so this is safe. Change-Id: I6d6b020fc009dbcd78e353fde9ca0ae3cc4c5945
* Merge "Revert "Stub out pause/ResumeTimers until b/8639231 is resolved."" ↵Ben Murdoch2013-04-291-2/+0
|\ | | | | | | into master-chromium
| * Revert "Stub out pause/ResumeTimers until b/8639231 is resolved."Ben Murdoch2013-04-261-2/+0
| | | | | | | | | | | | | | | | The bug is now fixed. This reverts commit 06f656d1143ad9c738eff35a0a8c557adf036362. Change-Id: I6bf37969a096af64ddbd30b85aa0cb2e9d52c279
* | Update CTS tests expectationsMikhail Naganov2013-04-261-1/+2
|/ | | | | | | Mark as failing: android.webkit.cts.GeolocationTest#testSimpleGeolocationRequestReject Change-Id: I7c4041f58df286463b47c681fb4edd2b0bee0bc5
* Update CTS test expectationsMikhail Naganov2013-04-261-9/+1
| | | | | | | | | | | | | | | | | | | | Mark the following tests as passing after the fix: https://codereview.chromium.org/14060019/ android.webkit.cts.CookieManagerTest#testAcceptCookie android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager android.webkit.cts.CookieManagerTest#testClone android.webkit.cts.CookieManagerTest#testCookieManager android.webkit.cts.CookieManagerTest#testRemoveCookies android.webkit.cts.CookieManagerTest#testb3167208 android.webkit.cts.CookieManagerTest#testGetInstance Mark this one as passing too, alhough there wasn't any specifix fix for it: android.webkit.cts.GeolocationTest#testSimpleGeolocationRequestAcceptOnce BUG=8707883 Change-Id: I9db28e95e3f676027e10863d4619d91777573bfa
* Update CTS tests expectationsMikhail Naganov2013-04-251-3/+8
| | | | | | | | | | | | | | | | | | Remove passing tests: android.webkit.cts.WebViewTest#testRequestImageRef android.webkit.cts.WebViewTest#testFindNext android.webkit.cts.WebViewTest#testFlingScroll Add failing tests (b/8707883) android.webkit.cts.CookieManagerTest#testAcceptCookie android.webkit.cts.CookieManagerTest#testGetInstance android.webkit.cts.CookieManagerTest#testClone android.webkit.cts.CookieManagerTest#testCookieManager android.webkit.cts.CookieManagerTest#testRemoveCookies android.webkit.cts.CookieManagerTest#testb3167208 android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager Change-Id: I20d9eddc6162709af12e6eb016d36d8c1f21b95a
* Update test expectations.Ben Murdoch2013-04-241-0/+2
| | | | Change-Id: I20762f441523e2d330e72d7419e93b5717a7f178
* Merge script: fix function reference.Torne (Richard Coles)2013-04-192-4/+4
| | | | | | | Need to refer to GetCommandStdout with a qualified name now that the calls are not in merge_common. Change-Id: Icf613d263a81338b656738fb679526dc78e577fd
* Merge tool: update merge_to_master for new projects.Torne (Richard Coles)2013-04-193-29/+25
| | | | | | | | | merge_to_master needs just one trivial change to actually do the merge correctly. To make pushing work, we stop sharing the implementation of PushToServer between the two scripts as they are increasingly different and the sharing is just making it harder to understand. Change-Id: Ib04d6e2f6621c98a72ad157ba7ed6238d542bf5a
* Update merge script to use new local-mirrored repos.Torne (Richard Coles)2013-04-172-51/+50
| | | | | | | | We have local mirror branches of chromium and webkit now; use these in the merge script instead of fetching directly from upstream, and push the full history specifically to the history projects. Change-Id: I6a222cbf1a305408efe8096c2a8b7d7ea2f889dc
* Print synced chromium revision on ToT bot.Marcin Kosiba2013-04-111-5/+3
| | | | | | | Since we're pulling ToT and not BUILDBOT_REVISION it seems like a good idea to print out what we've just synced to. Change-Id: Ib9f1fddc3b890d0962c2920ef5e321954766f27a
* Generate local manifest to local_manifest.xml.Marcin Kosiba2013-04-111-1/+1
| | | | | | | | Looks like the webview-tot bot is running with an old version of repo (probably the one from depot_tools) which is still looking at .repo/local_manifest.xml rather than .repo/local_manitests/*.xml Change-Id: I9887ca04915d0acbe8068d856be6e0166ed4eac6
* Change the webview_tot script to not use the merge script.Marcin Kosiba2013-04-114-36/+139
| | | | | | | | | | | Running the ToT bot with the merge script doesn't work because of upstream forking WebKit. To mitigate the problem the build script has been changed to simply checkout the upstream tree. This is achieved by removing the existing chromium_org projects using a local manifest and checking out a full upstream tree using the git submodules flow. Change-Id: I9405e7851716f300136e80a06f71eeb83973be09
* Update expectationsBen Murdoch2013-03-181-1/+0
| | | | | | | WebViewTest#loadDataWithBaseURL now passing. Bug: 7907196 Change-Id: I3755aebb9e02e0d3f0e68d45c2a4c92aef90fe26
* Update expectations.Ben Murdoch2013-03-121-1/+0
| | | | | | | WebView.pause/ResumeTimers now fixed. Bug: 7010205 Change-Id: I51247d0629388d3cd30978624da030777180116e
* Update expectations.Ben Murdoch2013-03-071-1/+0
| | | | | | | WebViewTest#testStopLoading now passing. Bug: 8271980 Change-Id: I3bcd1ccc2776374649034022d998a7afc104b024
* Update CTS expectations.Ben Murdoch2013-03-041-2/+0
| | | | | | | Bug 8280368 is now fixed. Bug: 8280368 Change-Id: I24e7ff042541b510c56221e54bcd70fff7a4f797
* Update Expectations.Ben Murdoch2013-03-011-2/+0
| | | | | | | testDatabaseEnabled has been removed. Bug: 8231270 Change-Id: Iddba569d160b89c9e22e5a0cdced6fe2b5789c07
* WebViewTest#testSetNetworkAvailable failing on bots.Ben Murdoch2013-02-271-0/+2
| | | | | | | Disable the test until we figure out what's up. Bug: 8280368 Change-Id: Ib48dafecf58d0d7ed8718a9841f52c57ff276de1
* Merge "Add --sha1 option to merge_from_chromium.py" into master-chromiumTorne (Richard Coles)2013-02-271-9/+34
|\
| * Add --sha1 option to merge_from_chromium.pyBo Liu2013-02-261-9/+34
| | | | | | | | | | | | | | | | The tot bot polls one of the Chromium git branches and can provide the exact sha1 to the merge script to match up information such as blamelists. This is the first step to making making this happen. Change-Id: I85a768198902ba7961b60382a00ff59b9226d137
* | Update expectations.Ben Murdoch2013-02-271-4/+0
| | | | | | | | | | | | | | | | Bug 8276976 is now fixed. Turns out to be a force close dialog stealing our input events. Bug: 8276976 Change-Id: I1ef9ae4a0b0d3a314f636e70c88d9cd8be05f82a
* | Add --screenshot-on-ui-failure option to CTS script.Ben Murdoch2013-02-271-1/+1
| | | | | | | | | | | | | | | | When we fail due to INJECT_EVENTS not being allowed, grab a screenshot so we can better see what's going on. Bug: 8276976 Change-Id: Icddc63b60a3a08bc39ef5228e6341bbc39715775
* | Add spreadsheet reminderBen Murdoch2013-02-271-0/+3
| | | | | | | | Change-Id: Ieedb90ea9d24d0fa45a80284c5879765a11060bb
* | Merge tool: force push to temp branch.Torne (Richard Coles)2013-02-271-1/+2
| | | | | | | | | | | | | | | | | | If the real push failed we can be left in a state where the temporary branch includes commits not on the real branch, which causes future pushes to fail. Force push to the temp branch, as nobody checks it out, to avoid this. Change-Id: Ib2e0f866fc7df035fbd698da9ecb9d6f9faadef2
* | Disable 3 failing testsJonathan Dixon2013-02-261-1/+5
| | | | | | | | | | Bug: 8276976 Change-Id: I5ea689079e263992a75996c533482a824aab78d9
* | Remove ssl tests from failuresSelim Gurun2013-02-261-6/+0
|/ | | | | | Bug: 6204287 Change-Id: I006afbeb37b9a06ea1d5fb49d8578b220adc898c
* Add yasm to the projects to merge.Torne (Richard Coles)2013-02-261-0/+1
| | | | | | | | We need to merge third_party/yasm to be able to build media on x86. Bug: 7556801 Change-Id: I0186b62ebb64836c3b9c633180343541f9f96585