67035 2011-08-26 06:17:46 -0700 Modify the build bot master's script to pass --chromium-android where appropriate 2011-08-27 12:05:31 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67032 1 peter webkit-unassigned abarth aroben steveblock webkit.review.bot oldest_to_newest 457538 0 105356 peter 2011-08-26 06:17:46 -0700 Created attachment 105356 Patch In order to invoke the script changes from bug 67034, the build bot master has to be able to pass the --chromium-android argument for the update-webkit-chromium and build-webkit scripts. 457698 1 105356 abarth 2011-08-26 12:17:44 -0700 Comment on attachment 105356 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105356&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:91 > +def appendCustomBuildFlags(step, platform, fullPlatform=""): I see. The issue here is that we're cross-compiling. Maybe rather than "fullPlatform" we should say target_os ? > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:92 > + if fullPlatform == "chromium-android": This this becomes platform == "chromium" && target_os == "android". That will generalize better if we want to support other sorts of cross compiling (e.g., building on Linux but targeting Mac). 457700 2 105356 abarth 2011-08-26 12:21:37 -0700 Comment on attachment 105356 Patch 3434 self.platform = platform.split('-', 1)[0] 3535 self.fullPlatform = platform ^^ maybe put self.target_os = platform.split('-', 2)[1] ? You can also leave this as fullPlatform if you think that's better. 457951 3 peter 2011-08-27 10:16:13 -0700 There are naming issues with generalizing it to a target OS. Various other ports (e.g. win, qt and efl) don't use such a suffix, so we'd have to check for the presence of a dash first, as an IndexError would occur otherwise. Furthermore, Chromium's Mac bots use "chromium-cg-mac" as their platform, meaning that the target OS would be "cg". I agree that generalizing the approach would be desirable, but don't really see a way to do that without either loosing chromium-cg-mac's history by renaming it, or rather, adding an exception for their naming scheme and specifying future platform strings to be [port]-[target_os]. 457954 4 abarth 2011-08-27 10:54:17 -0700 Yeah, you're right that we're not consistent enough to make this work well. 457956 5 105356 peter 2011-08-27 11:02:40 -0700 Comment on attachment 105356 Patch Ok. I'm marking this as cq? then, thanks. 457965 6 105356 webkit.review.bot 2011-08-27 12:05:27 -0700 Comment on attachment 105356 Patch Clearing flags on attachment: 105356 Committed r93942: <http://trac.webkit.org/changeset/93942> 457966 7 webkit.review.bot 2011-08-27 12:05:31 -0700 All reviewed patches have been landed. Closing bug. 105356 2011-08-26 06:17:46 -0700 2011-08-27 12:05:27 -0700 Patch patch-buildbot-master.patch text/plain 2999 peter ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL21hc3Rlci5jZmcgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnCmluZGV4IDRmZWFhZjEuLmJkNDIxYmEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcK KysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFz dGVyLmNmZwpAQCAtNzQsNiArNzQsMTEgQEAgY2xhc3MgSW5zdGFsbENocm9taXVtRGVwZW5kZW5j aWVzKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgZGVzY3JpcHRpb25Eb25lID0gWyJ1cGRhdGVk IGNocm9taXVtIGRlcGVuZGVuY2llcyJdCiAgICAgY29tbWFuZCA9IFsicGVybCIsICIuL1Rvb2xz L1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bSIsICItLWZvcmNlIl0KICAgICBoYWx0T25G YWlsdXJlID0gVHJ1ZQorICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgaWYgc2VsZi5nZXRQ cm9wZXJ0eSgnZnVsbFBsYXRmb3JtJykgPT0gImNocm9taXVtLWFuZHJvaWQiOgorICAgICAgICAg ICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIFsnLS1jaHJvbWl1bS1hbmRyb2lkJ10p CisKKyAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5zdGFydChzZWxmKQogCiBjbGFz cyBDbGVhbnVwQ2hyb21pdW1DcmFzaExvZ3Moc2hlbGwuU2hlbGxDb21tYW5kKToKICAgICBuYW1l ID0gImNsZWFudXAgY3Jhc2ggbG9ncyIKQEAgLTgzLDggKzg4LDEwIEBAIGNsYXNzIENsZWFudXBD aHJvbWl1bUNyYXNoTG9ncyhzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIGhhbHRPbkZhaWx1cmUg PSBGYWxzZQogCiAKLWRlZiBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHN0ZXAsIHBsYXRmb3JtKToK LSAgICBpZiBwbGF0Zm9ybSBpbiAoJ2Nocm9taXVtJywgJ2VmbCcsICdndGsnLCAncXQnLCAnd2lu Y2Fpcm8nLCAnd2luY2UnLCAnd3gnKToKK2RlZiBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHN0ZXAs IHBsYXRmb3JtLCBmdWxsUGxhdGZvcm09IiIpOgorICAgIGlmIGZ1bGxQbGF0Zm9ybSA9PSAiY2hy b21pdW0tYW5kcm9pZCI6CisgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNvbW1hbmQgKyBb Jy0tY2hyb21pdW0tYW5kcm9pZCddKQorICAgIGVsaWYgcGxhdGZvcm0gaW4gKCdjaHJvbWl1bScs ICdlZmwnLCAnZ3RrJywgJ3F0JywgJ3dpbmNhaXJvJywgJ3dpbmNlJywgJ3d4Jyk6CiAgICAgICAg IHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNvbW1hbmQgKyBbJy0tJyArIHBsYXRmb3JtXSkKIAogCkBA IC0xMDIsNyArMTA5LDcgQEAgY2xhc3MgQ29tcGlsZVdlYktpdChzaGVsbC5Db21waWxlKToKICAg ICAgICAgaWYgcGxhdGZvcm0gPT0gJ21hYycgYW5kIGJ1aWxkT25seToKICAgICAgICAgICAgIHNl bGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBbJ0RFQlVHX0lORk9STUFUSU9OX0ZPUk1BVD1k d2FyZi13aXRoLWRzeW0nXSkKIAotICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYs IHBsYXRmb3JtKQorICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYsIHBsYXRmb3Jt LCBzZWxmLmdldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nKSkKIAogICAgICAgICBmZWF0dXJlcyA9 IHNlbGYuZ2V0UHJvcGVydHkoJ2ZlYXR1cmVzJykKICAgICAgICAgZm9yIGZlYXR1cmUgaW4gZmVh dHVyZXM6CkBAIC0yMzYsNyArMjQzLDcgQEAgY2xhc3MgUnVuV2ViS2l0VGVzdHMoc2hlbGwuVGVz dCk6CiAKICAgICBkZWYgc3RhcnQoc2VsZik6CiAgICAgICAgIHBsYXRmb3JtID0gc2VsZi5nZXRQ cm9wZXJ0eSgncGxhdGZvcm0nKQotICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYs IHBsYXRmb3JtKQorICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYsIHBsYXRmb3Jt LCBzZWxmLmdldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nKSkKICAgICAgICAgaWYgcGxhdGZvcm0g PT0gIndpbiI6CiAgICAgICAgICAgICByb290QXJndW1lbnQgPSBbJy0tcm9vdD0nICsgb3MucGF0 aC5qb2luKCJXZWJLaXRCdWlsZCIsIHNlbGYuZ2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nKSwg ImJpbiIpXQogICAgICAgICBlbHNlOgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDU4ZTFlYmYuLmU4Y2IyM2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMS0wOC0y NiAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVXBkYXRl IHRoZSBtYXN0ZXIgYnVpbGQgYm90IGNvbmZpZ3VyYXRpb24gc2NyaXB0IHRvIHByb3Blcmx5Cisg ICAgICAgIGRlYWwgd2l0aCB0aGUgLS1jaHJvbWl1bS1hbmRyb2lkIHN3aXRjaC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2Njg3CisKKyAgICAgICAg VGhlIC0tY2hyb21pdW0tYW5kcm9pZCBzd2l0Y2ggaXMgbmVlZGVkIHdoZW4gcnVubmluZworICAg ICAgICB1cGRhdGUtd2Via2l0LWNocm9taXVtIGFuZCBidWlsZC13ZWJraXQsIGFzIGl0J2xsIHRl bGwgdGhlCisgICAgICAgIHNjcmlwdHMgdG8gcHVsbCBpbiB0aGUgcmlnaHQgZGVwZW5kZW5jaWVz IGFuZCBjcm9zcy1jb21waWxlCisgICAgICAgIFdlYktpdCB1c2luZyB0aGUgQW5kcm9pZCBOREsu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorCiAyMDEx LTA4LTI2ICBOb2VsIEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KIAogICAgICAgICBN YWtlIHNob3ctcHJldHR5LWRpZmYgd29yayBvbiBsaW51eAo=