92515 2012-07-27 09:38:44 -0700 [Chromium-Android] Virtual test suites fail 2012-08-06 16:22:24 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 1 wangxianzhu wangxianzhu abarth dpranke kbalazs ojan peter tony webkit.review.bot oldest_to_newest 680738 0 wangxianzhu 2012-07-27 09:38:44 -0700 From http://trac.webkit.org/changeset/122780 (bug 88542), ChromiumAndroidPort doesn't use DriverProxy but uses ChromiumAndroidDriver directly because we don't want DriverProxy to create two drivers for us. ChromiumAndroidDriver switches between pixel and non-pixel mode by itself. However, the code to support virtual test suite is in DriverProxy, so now the feature is broken on Chromium-Android. Dirk, can we move the following code from DriverProxy.run_test() into Driver.run_test()? base = self._port.lookup_virtual_test_base(driver_input.test_name) if base: virtual_driver_input = copy.copy(driver_input) virtual_driver_input.test_name = base virtual_driver_input.args = self._port.lookup_virtual_test_args(driver_input.test_name) return self.run_test(virtual_driver_input) I tried that but it broke some unit tests. I'm wondering if the change would break some ports. If not, I could fix the unit tests. 680747 1 dpranke 2012-07-27 09:50:58 -0700 No, you can't move this into Driver.run_test() because the command line args might change, leading you to need to restart the driver (defeating the point of DriverProxy). However, if you're willing to accept restarts yourself, you can create a ChromiumAndroidDriver that subclasses Driver and override run_test() as needed. The longer-term fix is to support the other command line flags on a per-test basis. Once we get https://bugs.webkit.org/show_bug.cgi?id=92398 to land, we'll have most of the logic in place and then we extend it for the chromium ports (and anyone else that wants to use virtual suites) to support other sets of command line flags. 680757 2 wangxianzhu 2012-07-27 10:05:30 -0700 (In reply to comment #1) > No, you can't move this into Driver.run_test() because the command line args might change, leading you to need to restart the driver (defeating the point of DriverProxy). > > However, if you're willing to accept restarts yourself, you can create a ChromiumAndroidDriver that subclasses Driver and override run_test() as needed. > > The longer-term fix is to support the other command line flags on a per-test basis. > > Once we get https://bugs.webkit.org/show_bug.cgi?id=92398 to land, we'll have most of the logic in place and then we extend it for the chromium ports (and anyone else that wants to use virtual suites) to support other sets of command line flags. Thanks for explanations. I think I'd better make a workaround in our downstream first and wait for the changes about per_test_args landed in upstream. 688320 3 156735 wangxianzhu 2012-08-06 11:46:23 -0700 Created attachment 156735 Patch 688375 4 kbalazs 2012-08-06 13:20:16 -0700 (In reply to comment #3) > Created an attachment (id=156735) [details] > Patch Do you still need DriverProxy? Ref tests are now supported with a simple driver instance since the harness pass the pixel test option for each test that need it. Dpranke and I are actually planning to remove it: bug 93269. I hope you can handle the special config of virtual test suites by extending the command line flags of tests. 688389 5 dpranke 2012-08-06 13:37:27 -0700 (In reply to comment #4) > (In reply to comment #3) > > Created an attachment (id=156735) [details] [details] > > Patch > > Do you still need DriverProxy? Ref tests are now supported with a simple driver instance since the harness pass the pixel test option for each test that need it. Dpranke and I are actually planning to remove it: bug 93269. I hope you can handle the special config of virtual test suites by extending the command line flags of tests. The Android port still needs the DriverProxy for the same reason the other Chromium ports do; however, since the Android port still has its own driver, we could just move the retstart-if-command-line-is-different logic directly into the ChromiumAndroidDriver code. As you say, it would be good to update the port to support the other command line args on a per-test basis as well. 688416 6 156735 wangxianzhu 2012-08-06 14:12:10 -0700 Comment on attachment 156735 Patch Will upload a new patch soon. 688424 7 156760 wangxianzhu 2012-08-06 14:37:08 -0700 Created attachment 156760 This patch doesn't use DriverProxy 688440 8 156766 wangxianzhu 2012-08-06 14:53:27 -0700 Created attachment 156766 landing 688532 9 156766 webkit.review.bot 2012-08-06 16:22:20 -0700 Comment on attachment 156766 landing Clearing flags on attachment: 156766 Committed r124810: <http://trac.webkit.org/changeset/124810> 688533 10 webkit.review.bot 2012-08-06 16:22:24 -0700 All reviewed patches have been landed. Closing bug. 156735 2012-08-06 11:46:23 -0700 2012-08-06 14:37:04 -0700 Patch bug-92515-20120806114559.patch text/plain 4247 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Nzg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI4NDY0ODMzMGJmMDZiZGUzMjU4YTI4NGRlZTg5OGU4 YWU5MGUxOS4uZjlhZTE1M2UzMGM4YzRkOTFlM2E1ZjliZmM2MTUyZmI3ZTY0MjI4ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTA4LTA2ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFZpcnR1YWwgdGVzdCBzdWl0ZXMgZmFpbAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI1MTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZmFpbHVy ZSBpcyBiZWNhdXNlIG91ciBieXBhc3Npbmcgb2YgRHJpdmVyUHJveHkuCisgICAgICAgIE5vdyBl eHRlbmRzIERyaXZlclByb3h5IHRvIGFsbG93IG9ubHkgb25lIGRyaXZlciBpbiBzdGFydGVkIG1v ZGUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX2FuZHJvaWQucHk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0LmNyZWF0ZV9kcml2 ZXIpOiBOb3cgY3JlYXRlcyBDaHJvbWl1bUFuZHJvaWREcml2ZXJQcm94eSBpbnN0ZWFkIG9mIENo cm9taXVtQW5kcm9pZERyaXZlci4KKyAgICAgICAgKENocm9taXVtQW5kcm9pZFBvcnQuZHJpdmVy X2NtZF9saW5lKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlclByb3h5KToKKyAgICAg ICAgKENocm9taXVtQW5kcm9pZERyaXZlclByb3h5Ll9faW5pdF9fKToKKyAgICAgICAgKENocm9t aXVtQW5kcm9pZERyaXZlclByb3h5Ll9tYWtlX2RyaXZlcik6IFN0b3AgdGhlIG9yaWdpbmFsIHJ1 bm5pbmcgZHJpdmVyIGJlZm9yZSBjcmVhdGluZyBhIG5ldyBvbmUgdG8gbWVldCB0aGUgcmVxdWly ZW1lbnQgb2YgQW5kb3JpZC4KKwogMjAxMi0wOC0wNiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBucnd0OiBjbGVhbiB1cCBsb2dnaW5nLCBwYXJ0IDEKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fYW5kcm9pZC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fYW5kcm9pZC5weQppbmRleCA0M2JkMmIyZTY1ZDBmZDgwMGRhNTY1OTJmYjRmYzc1 YTAwYTNlNWM4Li5kYWQxMDZlM2E2ZDg4M2IzNjVmNzVlZmU4M2M1NDM1NTgzOGMzZDMxIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X2FuZHJvaWQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9hbmRyb2lkLnB5CkBAIC0yMzcsMTIgKzIzNywxMiBAQCBjbGFzcyBDaHJvbWl1 bUFuZHJvaWRQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAKICAgICBkZWYgY3JlYXRlX2Ry aXZlcihzZWxmLCB3b3JrZXJfbnVtYmVyLCBub190aW1lb3V0PUZhbHNlKToKICAgICAgICAgIyBX ZSBkb24ndCB3YW50IHRoZSBkZWZhdWx0IERyaXZlclByb3h5IHdoaWNoIGlzIG5vdCBjb21wYXRp YmxlIHdpdGggb3VyIGRyaXZlci4KLSAgICAgICAgIyBTZWUgY29tbWVudHMgaW4gQ2hyb21pdW1B bmRyb2lkRHJpdmVyLnN0YXJ0KCkuCi0gICAgICAgIHJldHVybiBDaHJvbWl1bUFuZHJvaWREcml2 ZXIoc2VsZiwgd29ya2VyX251bWJlciwgcGl4ZWxfdGVzdHM9c2VsZi5nZXRfb3B0aW9uKCdwaXhl bF90ZXN0cycpLCBub190aW1lb3V0PW5vX3RpbWVvdXQpCisgICAgICAgICMgU2VlIGNvbW1lbnRz IGluIENocm9taXVtQW5kcm9pZERyaXZlclByb3h5Ll9tYWtlX2RyaXZlcigpLgorICAgICAgICBy ZXR1cm4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyUHJveHkoc2VsZiwgd29ya2VyX251bWJlciwgc2Vs Zi5nZXRfb3B0aW9uKCdwaXhlbF90ZXN0cycpLCBub190aW1lb3V0KQogCiAgICAgZGVmIGRyaXZl cl9jbWRfbGluZShzZWxmKToKLSAgICAgICAgIyBPdmVycmlkZSB0byByZXR1cm4gdGhlIGFjdHVh bCBEdW1wUmVuZGVyVHJlZSBjb21tYW5kIGxpbmUuCi0gICAgICAgIHJldHVybiBzZWxmLmNyZWF0 ZV9kcml2ZXIoMCkuX2RydF9jbWRfbGluZShzZWxmLmdldF9vcHRpb24oJ3BpeGVsX3Rlc3RzJyks IFtdKQorICAgICAgICAjIE92ZXJyaWRlIHRvIHJldHVybiB0aGUgYWN0dWFsIER1bXBSZW5kZXJU cmVlIGNvbW1hbmQgbGluZS4gSW5mb3JtYXRpb25hbCBvbmx5LgorICAgICAgICByZXR1cm4gQ2hy b21pdW1BbmRyb2lkRHJpdmVyKHNlbGYsIDAsIEZhbHNlKS5fZHJ0X2NtZF9saW5lKEZhbHNlLCBb XSkKIAogICAgICMgT3ZlcnJpZGRlbiBwcml2YXRlIGZ1bmN0aW9ucy4KIApAQCAtNTIxLDE0ICs1 MjEsNiBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAg ICAgICAgICAgICAgbm90IHNlbGYuX2ZpbGVfZXhpc3RzX29uX2RldmljZShzZWxmLl9vdXRfZmlm b19wYXRoKSBhbmQKICAgICAgICAgICAgICAgICBub3Qgc2VsZi5fZmlsZV9leGlzdHNfb25fZGV2 aWNlKHNlbGYuX2Vycl9maWZvX3BhdGgpKQogCi0gICAgZGVmIHN0YXJ0KHNlbGYsIHBpeGVsX3Rl c3RzLCBwZXJfdGVzdF9hcmdzKToKLSAgICAgICAgIyBPbmx5IG9uZSBkcml2ZXIgaW5zdGFuY2Ug aXMgYWxsb3dlZCBiZWNhdXNlIG9mIHRoZSBuYXR1cmUgb2YgQW5kcm9pZCBhY3Rpdml0eS4KLSAg ICAgICAgIyBUaGUgc2luZ2xlIGRyaXZlciBuZWVkcyB0byBzd2l0Y2ggYmV0d2VlbiBwaXhlbCB0 ZXN0IGFuZCBubyBwaXhlbCB0ZXN0IG1vZGUgYnkgaXRzZWxmLgotICAgICAgICBpZiBwaXhlbF90 ZXN0cyAhPSBzZWxmLl9waXhlbF90ZXN0czoKLSAgICAgICAgICAgIHNlbGYuc3RvcCgpCi0gICAg ICAgICAgICBzZWxmLl9waXhlbF90ZXN0cyA9IHBpeGVsX3Rlc3RzCi0gICAgICAgIHN1cGVyKENo cm9taXVtQW5kcm9pZERyaXZlciwgc2VsZikuc3RhcnQocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2Fy Z3MpCi0KICAgICBkZWYgX3N0YXJ0KHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToK ICAgICAgICAgc2VsZi5fc2V0dXBfdGVzdCgpCiAKQEAgLTY1NiwzICs2NDgsMTcgQEAgY2xhc3Mg Q2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICAgICAgICAgIGlm IGxhc3RfY2hhciA9PSAnJCc6CiAgICAgICAgICAgICAgICAgICAgIHJhaXNlIEFzc2VydGlvbkVy cm9yKCdBZGJkIGlzIG5vdCBydW5uaW5nIGFzIHJvb3QnKQogICAgICAgICAgICAgbGFzdF9jaGFy ID0gY3VycmVudF9jaGFyCisKKworY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyUHJveHkoZHJp dmVyLkRyaXZlclByb3h5KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgd29ya2VyX251 bWJlciwgcGl4ZWxfdGVzdHMsIG5vX3RpbWVvdXQpOgorICAgICAgICBzZWxmLl9jdXJyZW50X2Ry aXZlciA9IE5vbmUgICMgTXVzdCBwbGFjZSB0aGlzIGJlZm9yZSBzdXBlciBjb25zdHJ1Y3RvciBi ZWNhdXNlIF9tYWtlX2RyaXZlciBpcyBjYWxsZWQgZnJvbSB0aGUgY29uc3RydWN0b3IuCisgICAg ICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlclByb3h5LCBzZWxmKS5fX2luaXRfXyhwb3J0 LCB3b3JrZXJfbnVtYmVyLCBDaHJvbWl1bUFuZHJvaWREcml2ZXIsIHBpeGVsX3Rlc3RzLCBub190 aW1lb3V0KQorCisgICAgZGVmIF9tYWtlX2RyaXZlcihzZWxmLCBwaXhlbF90ZXN0cyk6CisgICAg ICAgICMgT25seSBvbmUgZHJpdmVyIGluc3RhbmNlIGNhbiBiZSBzdGFydGVkIGJlY2F1c2Ugb2Yg dGhlIG5hdHVyZSBvZiBBbmRyb2lkIGFjdGl2aXR5LgorICAgICAgICAjIFN0b3AgdGhlIGN1cnJl bnQgc3RhcnRlZCBkcml2ZXIgYmVmb3JlIGNyZWF0aW5nIGFub3RoZXIgb25lLgorICAgICAgICBp ZiBzZWxmLl9jdXJyZW50X2RyaXZlcjoKKyAgICAgICAgICAgIHNlbGYuX2N1cnJlbnRfZHJpdmVy LnN0b3AoKQorICAgICAgICBzZWxmLl9jdXJyZW50X2RyaXZlciA9IHN1cGVyKENocm9taXVtQW5k cm9pZERyaXZlclByb3h5LCBzZWxmKS5fbWFrZV9kcml2ZXIocGl4ZWxfdGVzdHMpCisgICAgICAg IHJldHVybiBzZWxmLl9jdXJyZW50X2RyaXZlcgo= 156760 2012-08-06 14:37:08 -0700 2012-08-06 14:53:24 -0700 This patch doesn't use DriverProxy bug-92515-20120806143645.patch text/plain 4838 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Nzg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI4NDY0ODMzMGJmMDZiZGUzMjU4YTI4NGRlZTg5OGU4 YWU5MGUxOS4uNGMyZWNiZTg5MWNmM2RlZDBlZjY5ZjAxODVkNTZhY2UwM2M5Yzc3OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA4LTA2ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFZpcnR1YWwgdGVzdCBzdWl0ZXMgZmFpbAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI1MTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZmFpbHVy ZSBpcyBiZWNhdXNlIG91ciBieXBhc3Npbmcgb2YgRHJpdmVyUHJveHkuCisgICAgICAgIFJlcGVh dCB0aGUgbG9naWMgb2YgdmlydHVhbCB0ZXN0cyBpbiBEcml2ZXJQcm94eSBpbiBDaHJvbWl1bUFu ZHJvaWREcml2ZXIKKyAgICAgICAgYW5kIHJlc3RhcnQgRFJUIHdoZW4gdGhlIGNvbW1hbmQgbGlu ZSBjaGFuZ2VzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9hbmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9f aW5pdF9fKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5jbWRfbGluZSk6IEFkZGVk IGNvbW1lbnRzIGFib3V0IHdoeSB3ZSBvdmVycmlkZSB0aGlzIGFuZCBoYXZlIF9kcnRfY21kX2xp bmUoKS4KKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5ydW5fdGVzdCk6IFJlcGVhdCB0 aGUgbG9naWMgb2YgdmlydHVhbCB0ZXN0cyBpbiBEcml2ZXJQcm94eS4KKyAgICAgICAgKENocm9t aXVtQW5kcm9pZERyaXZlci5zdGFydCk6IFJlc3RhcnQgRFJUIHdoZW4gdGhlIGNvbW1hbmQgbGlu ZSBjaGFuZ2VzLgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydF9vbmNlKToK KwogMjAxMi0wOC0wNiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBucnd0OiBjbGVhbiB1cCBsb2dnaW5nLCBwYXJ0IDEKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5w eQppbmRleCA0M2JkMmIyZTY1ZDBmZDgwMGRhNTY1OTJmYjRmYzc1YTAwYTNlNWM4Li5mMjcyOTYy YzZmZjVhOTA0MWE3NjNmNzcwOGU2MDNiZDRkMDg3OWI1IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lk LnB5CkBAIC0yNyw2ICsyNyw3IEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCitp bXBvcnQgY29weQogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHJlCkBAIC0zMDks NyArMzEwLDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBv cnQpOgogY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB3b3JrZXJfbnVtYmVyLCBwaXhlbF90ZXN0cywgbm9fdGlt ZW91dD1GYWxzZSk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2VsZiku X19pbml0X18ocG9ydCwgd29ya2VyX251bWJlciwgcGl4ZWxfdGVzdHMsIG5vX3RpbWVvdXQpCi0g ICAgICAgIHNlbGYuX3BpeGVsX3Rlc3RzID0gcGl4ZWxfdGVzdHMKKyAgICAgICAgc2VsZi5fY21k X2xpbmUgPSBOb25lCiAgICAgICAgIHNlbGYuX2luX2ZpZm9fcGF0aCA9IERFVklDRV9EUlRfRElS ICsgJ0R1bXBSZW5kZXJUcmVlLmluJwogICAgICAgICBzZWxmLl9vdXRfZmlmb19wYXRoID0gREVW SUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWUub3V0JwogICAgICAgICBzZWxmLl9lcnJfZmlm b19wYXRoID0gREVWSUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWUuZXJyJwpAQCAtNDg5LDYg KzQ5MCw4IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAg ICAgICAgcmV0dXJuIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2VsZikuX2dldF9jcmFz aF9sb2coc3Rkb3V0LCBzdGRlcnIsIG5ld2VyX3RoYW4pCiAKICAgICBkZWYgY21kX2xpbmUoc2Vs ZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgorICAgICAgICAjIFRoZSByZXR1cm5lZCBj b21tYW5kIGxpbmUgaXMgdXNlZCB0byBzdGFydCBfc2VydmVyX3Byb2Nlc3MuIEluIG91ciBjYXNl LCBpdCdzIGFuIGludGVyYWN0aXZlICdhZGIgc2hlbGwnLgorICAgICAgICAjIFRoZSBjb21tYW5k IGxpbmUgcGFzc2VkIHRvIHRoZSBEUlQgcHJvY2VzcyBpcyByZXR1cm5lZCBieSBfZHJ0X2NtZF9s aW5lKCkgaW5zdGVhZC4KICAgICAgICAgcmV0dXJuIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVs bCddCiAKICAgICBkZWYgX2ZpbGVfZXhpc3RzX29uX2RldmljZShzZWxmLCBmdWxsX2ZpbGVfcGF0 aCk6CkBAIC01MjEsMTIgKzUyNCwyMSBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJp dmVyLkRyaXZlcik6CiAgICAgICAgICAgICAgICAgbm90IHNlbGYuX2ZpbGVfZXhpc3RzX29uX2Rl dmljZShzZWxmLl9vdXRfZmlmb19wYXRoKSBhbmQKICAgICAgICAgICAgICAgICBub3Qgc2VsZi5f ZmlsZV9leGlzdHNfb25fZGV2aWNlKHNlbGYuX2Vycl9maWZvX3BhdGgpKQogCisgICAgZGVmIHJ1 bl90ZXN0KHNlbGYsIGRyaXZlcl9pbnB1dCk6CisgICAgICAgIGJhc2UgPSBzZWxmLl9wb3J0Lmxv b2t1cF92aXJ0dWFsX3Rlc3RfYmFzZShkcml2ZXJfaW5wdXQudGVzdF9uYW1lKQorICAgICAgICBp ZiBiYXNlOgorICAgICAgICAgICAgZHJpdmVyX2lucHV0ID0gY29weS5jb3B5KGRyaXZlcl9pbnB1 dCkKKyAgICAgICAgICAgIGRyaXZlcl9pbnB1dC50ZXN0X25hbWUgPSBiYXNlCisgICAgICAgICAg ICBkcml2ZXJfaW5wdXQuYXJncyA9IHNlbGYuX3BvcnQubG9va3VwX3ZpcnR1YWxfdGVzdF9hcmdz KGRyaXZlcl9pbnB1dC50ZXN0X25hbWUpCisgICAgICAgIHJldHVybiBzdXBlcihDaHJvbWl1bUFu ZHJvaWREcml2ZXIsIHNlbGYpLnJ1bl90ZXN0KGRyaXZlcl9pbnB1dCkKKwogICAgIGRlZiBzdGFy dChzZWxmLCBwaXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncyk6CiAgICAgICAgICMgT25seSBvbmUg ZHJpdmVyIGluc3RhbmNlIGlzIGFsbG93ZWQgYmVjYXVzZSBvZiB0aGUgbmF0dXJlIG9mIEFuZHJv aWQgYWN0aXZpdHkuCi0gICAgICAgICMgVGhlIHNpbmdsZSBkcml2ZXIgbmVlZHMgdG8gc3dpdGNo IGJldHdlZW4gcGl4ZWwgdGVzdCBhbmQgbm8gcGl4ZWwgdGVzdCBtb2RlIGJ5IGl0c2VsZi4KLSAg ICAgICAgaWYgcGl4ZWxfdGVzdHMgIT0gc2VsZi5fcGl4ZWxfdGVzdHM6CisgICAgICAgICMgVGhl IHNpbmdsZSBkcml2ZXIgbmVlZHMgdG8gcmVzdGFydCBEdW1wUmVuZGVyVHJlZSB3aGVuIHRoZSBj b21tYW5kIGxpbmUgY2hhbmdlcy4KKyAgICAgICAgY21kX2xpbmUgPSBzZWxmLl9kcnRfY21kX2xp bmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpCisgICAgICAgIGlmIGNtZF9saW5lICE9IHNl bGYuX2NtZF9saW5lOgogICAgICAgICAgICAgc2VsZi5zdG9wKCkKLSAgICAgICAgICAgIHNlbGYu X3BpeGVsX3Rlc3RzID0gcGl4ZWxfdGVzdHMKKyAgICAgICAgICAgIHNlbGYuX2NtZF9saW5lID0g Y21kX2xpbmUKICAgICAgICAgc3VwZXIoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLCBzZWxmKS5zdGFy dChwaXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncykKIAogICAgIGRlZiBfc3RhcnQoc2VsZiwgcGl4 ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgpAQCAtNTQ5LDcgKzU2MSw3IEBAIGNsYXNzIENocm9t aXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgc2VsZi5fZm9yd2FyZGVy X3Byb2Nlc3Muc3RhcnQoKQogCiAgICAgICAgIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ2xvZ2Nh dCcsICctYyddKQotICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcsICdlY2hv J10gKyBzZWxmLl9kcnRfY21kX2xpbmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpICsgWyc+ JywgQ09NTUFORF9MSU5FX0ZJTEVdKQorICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydz aGVsbCcsICdlY2hvJ10gKyBzZWxmLl9jbWRfbGluZSArIFsnPicsIENPTU1BTkRfTElORV9GSUxF XSkKICAgICAgICAgc3RhcnRfcmVzdWx0ID0gc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwn LCAnYW0nLCAnc3RhcnQnLCAnLWUnLCAnUnVuSW5TdWJUaHJlYWQnLCAnLW4nLCBEUlRfQUNUSVZJ VFlfRlVMTF9OQU1FXSkKICAgICAgICAgaWYgc3RhcnRfcmVzdWx0LmZpbmQoJ0V4Y2VwdGlvbicp ICE9IC0xOgogICAgICAgICAgICAgX2xvZy5lcnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5k ZXJUcmVlIGFwcGxpY2F0aW9uLiBFeGNlcHRpb246XG4nICsgc3RhcnRfcmVzdWx0KQo= 156766 2012-08-06 14:53:27 -0700 2012-08-06 16:22:20 -0700 landing bug-92515-20120806145303.patch text/plain 4835 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Nzg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI4NDY0ODMzMGJmMDZiZGUzMjU4YTI4NGRlZTg5OGU4 YWU5MGUxOS4uYWVjNmMzNWRmMGM4MTVjMDEyMzJlMWZlOGE2N2M2MDBhNmQ2YjU0MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA4LTA2ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFZpcnR1YWwgdGVzdCBzdWl0ZXMgZmFpbAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI1MTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFByYW5rZS4KKworICAgICAgICBUaGUgZmFpbHVyZSBp cyBiZWNhdXNlIG91ciBieXBhc3Npbmcgb2YgRHJpdmVyUHJveHkuCisgICAgICAgIFJlcGVhdCB0 aGUgbG9naWMgb2YgdmlydHVhbCB0ZXN0cyBpbiBEcml2ZXJQcm94eSBpbiBDaHJvbWl1bUFuZHJv aWREcml2ZXIKKyAgICAgICAgYW5kIHJlc3RhcnQgRFJUIHdoZW4gdGhlIGNvbW1hbmQgbGluZSBj aGFuZ2VzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9hbmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9faW5p dF9fKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5jbWRfbGluZSk6IEFkZGVkIGNv bW1lbnRzIGFib3V0IHdoeSB3ZSBvdmVycmlkZSB0aGlzIGFuZCBoYXZlIF9kcnRfY21kX2xpbmUo KS4KKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5ydW5fdGVzdCk6IFJlcGVhdCB0aGUg bG9naWMgb2YgdmlydHVhbCB0ZXN0cyBpbiBEcml2ZXJQcm94eS4KKyAgICAgICAgKENocm9taXVt QW5kcm9pZERyaXZlci5zdGFydCk6IFJlc3RhcnQgRFJUIHdoZW4gdGhlIGNvbW1hbmQgbGluZSBj aGFuZ2VzLgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydF9vbmNlKToKKwog MjAxMi0wOC0wNiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBucnd0OiBjbGVhbiB1cCBsb2dnaW5nLCBwYXJ0IDEKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQpp bmRleCA0M2JkMmIyZTY1ZDBmZDgwMGRhNTY1OTJmYjRmYzc1YTAwYTNlNWM4Li45OGU4OGRiMWNj YTMwYWU1NDVhZjZmMjA0ODFiMDZjNWRlZWIwOTljIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5 CkBAIC0yNyw2ICsyNyw3IEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0Up IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCitpbXBv cnQgY29weQogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHJlCkBAIC0zMDksNyAr MzEwLDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQp OgogY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwb3J0LCB3b3JrZXJfbnVtYmVyLCBwaXhlbF90ZXN0cywgbm9fdGltZW91 dD1GYWxzZSk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2VsZikuX19p bml0X18ocG9ydCwgd29ya2VyX251bWJlciwgcGl4ZWxfdGVzdHMsIG5vX3RpbWVvdXQpCi0gICAg ICAgIHNlbGYuX3BpeGVsX3Rlc3RzID0gcGl4ZWxfdGVzdHMKKyAgICAgICAgc2VsZi5fY21kX2xp bmUgPSBOb25lCiAgICAgICAgIHNlbGYuX2luX2ZpZm9fcGF0aCA9IERFVklDRV9EUlRfRElSICsg J0R1bXBSZW5kZXJUcmVlLmluJwogICAgICAgICBzZWxmLl9vdXRfZmlmb19wYXRoID0gREVWSUNF X0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWUub3V0JwogICAgICAgICBzZWxmLl9lcnJfZmlmb19w YXRoID0gREVWSUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWUuZXJyJwpAQCAtNDg5LDYgKzQ5 MCw4IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAg ICAgcmV0dXJuIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2VsZikuX2dldF9jcmFzaF9s b2coc3Rkb3V0LCBzdGRlcnIsIG5ld2VyX3RoYW4pCiAKICAgICBkZWYgY21kX2xpbmUoc2VsZiwg cGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgorICAgICAgICAjIFRoZSByZXR1cm5lZCBjb21t YW5kIGxpbmUgaXMgdXNlZCB0byBzdGFydCBfc2VydmVyX3Byb2Nlc3MuIEluIG91ciBjYXNlLCBp dCdzIGFuIGludGVyYWN0aXZlICdhZGIgc2hlbGwnLgorICAgICAgICAjIFRoZSBjb21tYW5kIGxp bmUgcGFzc2VkIHRvIHRoZSBEUlQgcHJvY2VzcyBpcyByZXR1cm5lZCBieSBfZHJ0X2NtZF9saW5l KCkgaW5zdGVhZC4KICAgICAgICAgcmV0dXJuIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVsbCdd CiAKICAgICBkZWYgX2ZpbGVfZXhpc3RzX29uX2RldmljZShzZWxmLCBmdWxsX2ZpbGVfcGF0aCk6 CkBAIC01MjEsMTIgKzUyNCwyMSBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVy LkRyaXZlcik6CiAgICAgICAgICAgICAgICAgbm90IHNlbGYuX2ZpbGVfZXhpc3RzX29uX2Rldmlj ZShzZWxmLl9vdXRfZmlmb19wYXRoKSBhbmQKICAgICAgICAgICAgICAgICBub3Qgc2VsZi5fZmls ZV9leGlzdHNfb25fZGV2aWNlKHNlbGYuX2Vycl9maWZvX3BhdGgpKQogCisgICAgZGVmIHJ1bl90 ZXN0KHNlbGYsIGRyaXZlcl9pbnB1dCk6CisgICAgICAgIGJhc2UgPSBzZWxmLl9wb3J0Lmxvb2t1 cF92aXJ0dWFsX3Rlc3RfYmFzZShkcml2ZXJfaW5wdXQudGVzdF9uYW1lKQorICAgICAgICBpZiBi YXNlOgorICAgICAgICAgICAgZHJpdmVyX2lucHV0ID0gY29weS5jb3B5KGRyaXZlcl9pbnB1dCkK KyAgICAgICAgICAgIGRyaXZlcl9pbnB1dC5hcmdzID0gc2VsZi5fcG9ydC5sb29rdXBfdmlydHVh bF90ZXN0X2FyZ3MoZHJpdmVyX2lucHV0LnRlc3RfbmFtZSkKKyAgICAgICAgICAgIGRyaXZlcl9p bnB1dC50ZXN0X25hbWUgPSBiYXNlCisgICAgICAgIHJldHVybiBzdXBlcihDaHJvbWl1bUFuZHJv aWREcml2ZXIsIHNlbGYpLnJ1bl90ZXN0KGRyaXZlcl9pbnB1dCkKKwogICAgIGRlZiBzdGFydChz ZWxmLCBwaXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncyk6CiAgICAgICAgICMgT25seSBvbmUgZHJp dmVyIGluc3RhbmNlIGlzIGFsbG93ZWQgYmVjYXVzZSBvZiB0aGUgbmF0dXJlIG9mIEFuZHJvaWQg YWN0aXZpdHkuCi0gICAgICAgICMgVGhlIHNpbmdsZSBkcml2ZXIgbmVlZHMgdG8gc3dpdGNoIGJl dHdlZW4gcGl4ZWwgdGVzdCBhbmQgbm8gcGl4ZWwgdGVzdCBtb2RlIGJ5IGl0c2VsZi4KLSAgICAg ICAgaWYgcGl4ZWxfdGVzdHMgIT0gc2VsZi5fcGl4ZWxfdGVzdHM6CisgICAgICAgICMgVGhlIHNp bmdsZSBkcml2ZXIgbmVlZHMgdG8gcmVzdGFydCBEdW1wUmVuZGVyVHJlZSB3aGVuIHRoZSBjb21t YW5kIGxpbmUgY2hhbmdlcy4KKyAgICAgICAgY21kX2xpbmUgPSBzZWxmLl9kcnRfY21kX2xpbmUo cGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpCisgICAgICAgIGlmIGNtZF9saW5lICE9IHNlbGYu X2NtZF9saW5lOgogICAgICAgICAgICAgc2VsZi5zdG9wKCkKLSAgICAgICAgICAgIHNlbGYuX3Bp eGVsX3Rlc3RzID0gcGl4ZWxfdGVzdHMKKyAgICAgICAgICAgIHNlbGYuX2NtZF9saW5lID0gY21k X2xpbmUKICAgICAgICAgc3VwZXIoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLCBzZWxmKS5zdGFydChw aXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncykKIAogICAgIGRlZiBfc3RhcnQoc2VsZiwgcGl4ZWxf dGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgpAQCAtNTQ5LDcgKzU2MSw3IEBAIGNsYXNzIENocm9taXVt QW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgc2VsZi5fZm9yd2FyZGVyX3By b2Nlc3Muc3RhcnQoKQogCiAgICAgICAgIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ2xvZ2NhdCcs ICctYyddKQotICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcsICdlY2hvJ10g KyBzZWxmLl9kcnRfY21kX2xpbmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpICsgWyc+Jywg Q09NTUFORF9MSU5FX0ZJTEVdKQorICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVs bCcsICdlY2hvJ10gKyBzZWxmLl9jbWRfbGluZSArIFsnPicsIENPTU1BTkRfTElORV9GSUxFXSkK ICAgICAgICAgc3RhcnRfcmVzdWx0ID0gc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAn YW0nLCAnc3RhcnQnLCAnLWUnLCAnUnVuSW5TdWJUaHJlYWQnLCAnLW4nLCBEUlRfQUNUSVZJVFlf RlVMTF9OQU1FXSkKICAgICAgICAgaWYgc3RhcnRfcmVzdWx0LmZpbmQoJ0V4Y2VwdGlvbicpICE9 IC0xOgogICAgICAgICAgICAgX2xvZy5lcnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJU cmVlIGFwcGxpY2F0aW9uLiBFeGNlcHRpb246XG4nICsgc3RhcnRfcmVzdWx0KQo=