96393 2012-09-11 08:23:41 -0700 [Chromium] Make sure that md5sum is only setup on Android. 2012-10-04 09:50:35 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 95346 0 pliard webkit-unassigned abarth adamk dpranke jamesr ojan peter roger_fong webkit.review.bot oldest_to_newest 717192 0 pliard 2012-09-11 08:23:41 -0700 Previously md5sum was setup in ChromiumAndroidDriver's constructor which is also invoked on non-Android platforms. The following patch moves this logic to _startup_test() which is guaranteed to be invoked only on Android. 717201 1 peter 2012-09-11 08:30:06 -0700 + the gardeners. 717210 2 163373 pliard 2012-09-11 08:37:18 -0700 Created attachment 163373 Patch 717219 3 peter 2012-09-11 08:49:15 -0700 With your patch applied, I'm now getting this assert: [1189/1616] webkitpy.layout_tests.port.chromium_android_unittest.ChromiumAndroidDriverTest.test_read_prompt failed: Traceback (most recent call last): File "/usr/local/google/build/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py", line 243, in test_read_prompt self.assertRaises(AssertionError, self.driver._read_prompt, time.time() + 1) AssertionError: AssertionError not raised 717221 4 163377 pliard 2012-09-11 08:50:12 -0700 Created attachment 163377 Patch 717224 5 pliard 2012-09-11 08:51:26 -0700 I uploaded a new patch. The previous one was incorrect. Let me see if it solves the error in your last message. 717225 6 peter 2012-09-11 08:52:06 -0700 Ah, the failure is because we're accepting "$" as input now as well, so the mock input on line 242 causes that. Removing lines 242 and 243 of the unit tests should fix that, as we now accept input running as a non-root (i.e. normal) user as well, making the assert invalid. 717229 7 163378 pliard 2012-09-11 08:58:22 -0700 Created attachment 163378 Patch 717233 8 peter 2012-09-11 09:02:00 -0700 While I'm not thrilled about the name "_setup_md5sum_and_push_data_if_needed", we can address that later. I verified that the latest patch fixes the webkitpy steps. 717235 9 pliard 2012-09-11 09:05:31 -0700 Thanks Peter and sorry for the inconvenience! I will send a CL later addressing the _setup_md5sum_and_push_data_if_needed issue. 717274 10 163378 webkit.review.bot 2012-09-11 09:36:59 -0700 Comment on attachment 163378 Patch Rejecting attachment 163378 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Tools/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/13826288 717276 11 peter 2012-09-11 09:38:01 -0700 (In reply to comment #10) > (From update of attachment 163378 [details]) > Rejecting attachment 163378 [details] from commit-queue. > > Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 > > ERROR: /mnt/git/webkit-commit-queue/Tools/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). > > Full output: http://queues.webkit.org/results/13826288 I'll land it manually. Philippe: be sure to not remove the "Reviewed by (OOPS!)." line from your CLs :-). 717278 12 pliard 2012-09-11 09:39:55 -0700 Ah, sorry :) Thanks for the tip and landing it. 717279 13 peter 2012-09-11 09:40:24 -0700 Committed r128194: <http://trac.webkit.org/changeset/128194> 732969 14 roger_fong 2012-10-02 12:49:38 -0700 Hello, I get the following error output for this test on Windows port: [439/1585] webkitpy.layout_tests.port.chromium_android_unittest.ChromiumAndroidDriverTest.test_command_from_driver_input failed: Traceback (most recent call last): File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py", line 247, in test_command_from_driver_input self.assertEquals(self.driver._command_from_driver_input(driver_input), expected_command) AssertionError: "C:\\cygwin\\mock-checkout\\LayoutTests\\foo\\bar\\test.html'--pixel-test'checksum\n" != "/data/local/tmp/third_party/WebKit/LayoutTests/foo/bar/test.html'--pixel-test'checksum\n" Looks like it's related to this checksum stuff somehow? Thanks 733867 15 roger_fong 2012-10-03 11:20:05 -0700 (In reply to comment #14) > Hello, > I get the following error output for this test on Windows port: > > [439/1585] webkitpy.layout_tests.port.chromium_android_unittest.ChromiumAndroidDriverTest.test_command_from_driver_input failed: > Traceback (most recent call last): > File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py", line 247, in test_command_from_driver_input > self.assertEquals(self.driver._command_from_driver_input(driver_input), expected_command) > AssertionError: "C:\\cygwin\\mock-checkout\\LayoutTests\\foo\\bar\\test.html'--pixel-test'checksum\n" != "/data/local/tmp/third_party/WebKit/LayoutTests/foo/bar/test.html'--pixel-test'checksum\n" > > Looks like it's related to this checksum stuff somehow? > Thanks I have not received any response. Therefore I'm going to skip this part of the test for now and reopen this bug. 733869 16 roger_fong 2012-10-03 11:21:04 -0700 Setting bug as unconfirmed 733887 17 roger_fong 2012-10-03 11:45:23 -0700 Meh, I'll just make a new bug, that makes more sense 733895 18 roger_fong 2012-10-03 11:54:19 -0700 (In reply to comment #17) > Meh, I'll just make a new bug, that makes more sense https://bugs.webkit.org/show_bug.cgi?id=98288 734522 19 pliard 2012-10-04 02:13:28 -0700 Sorry guys for the late reply, I was traveling. I will look at the issue. 734774 20 roger_fong 2012-10-04 09:50:35 -0700 Thanks :) 163373 2012-09-11 08:37:18 -0700 2012-09-11 08:50:07 -0700 Patch bug-96393-20120911173653.patch text/plain 3616 pliard U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MTg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODlhOGI1NTQ5NDQ3NmU0MzM3YTI2Yzc0Njc5MTVmMjlm ZGU1ZmFkYy4uODU3N2Q2NjU2YWYxMzY3MWZhZGZkYTQ4MDE4MjViYWU5MzM0OTgxZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTA5LTExICBQaGlsaXBwZSBMaWFyZCAgPHBsaWFyZEBnb29nbGUuY29tPgorCisg ICAgICAgIE1ha2Ugc3VyZSB0aGF0IG1kNXN1bSBpcyBub3Qgc2V0dXAgb24gbm9uLUNocm9taXVt IEFuZHJvaWQgcGxhdGZvcm1zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTYzOTMKKworICAgICAgICBQcmV2aW91c2x5IG1kNXN1bSB3YXMgc2V0dXAg aW4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyJ3MgY29uc3RydWN0b3IKKyAgICAgICAgd2hpY2ggaXMg YWxzbyBpbnZva2VkIG9uIG5vbi1DaHJvbWl1bSBBbmRyb2lkIHBsYXRmb3Jtcy4gVGhlIGZvbGxv d2luZyBwYXRjaAorICAgICAgICBtb3ZlcyB0aGlzIGxvZ2ljIHRvIF9zdGFydHVwX3Rlc3QoKSB3 aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGludm9rZWQKKyAgICAgICAgb25seSBvbiBBbmRyb2lk LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9hbmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9faW5pdF9fKToK KyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fc2V0dXBfbWQ1c3VtX2FuZF9wdXNoX2Rh dGFfaWZfbmVlZGVkKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fc2V0dXBfdGVz dCk6CisKIDIwMTItMDktMTEgIEx1Y2lhbm8gV29sZiAgPGx1Y2lhbm8ud29sZkBvcGVuYm9zc2Eu b3JnPgogCiAgICAgICAgIFtRdF0gW1dLMl0gZWRpdGluZy9pbnNlcnRpbmcvdHlwaW5nLXRhYi1k ZXNpZ25tb2RlIHRlc3RzIGFyZSBmYWlsaW5nCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKaW5kZXgg MjY5NmIwNzliOTNkMjM5MWI2ZTE4ZDVmMzExYTEwMTczODBhZWJlMi4uY2E3NWE0MmE1ZTQwZjQy M2IzMjE3NDI1M2VkNTNhZDllOTU3NjAwNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQpAQCAt MzA5LDggKzMwOSw2IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hyb21pdW0uQ2hyb21p dW1Qb3J0KToKIAogCiBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6 Ci0gICAgX2RhdGFfYWxyZWFkeV9wdXNoZWRfZm9yX3dvcmtlciA9IHNldHMuU2V0KCkKLQogICAg IGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB3b3JrZXJfbnVtYmVyLCBwaXhlbF90ZXN0cywgbm9f dGltZW91dD1GYWxzZSk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2Vs ZikuX19pbml0X18ocG9ydCwgd29ya2VyX251bWJlciwgcGl4ZWxfdGVzdHMsIG5vX3RpbWVvdXQp CiAgICAgICAgIHNlbGYuX2NtZF9saW5lID0gTm9uZQpAQCAtMzI0LDMxICszMjIsMzAgQEAgY2xh c3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICBzZWxmLl9v cmlnaW5hbF9nb3Zlcm5vcnMgPSB7fQogICAgICAgICBzZWxmLl9kZXZpY2Vfc2VyaWFsID0gcG9y dC5fZ2V0X2RldmljZV9zZXJpYWwod29ya2VyX251bWJlcikKICAgICAgICAgc2VsZi5fYWRiX2Nv bW1hbmQgPSBbJ2FkYicsICctcycsIHNlbGYuX2RldmljZV9zZXJpYWxdCi0gICAgICAgIHNlbGYu X3NldHVwX21kNXN1bSgpCi0gICAgICAgIGlmIG5vdCB3b3JrZXJfbnVtYmVyIGluIENocm9taXVt QW5kcm9pZERyaXZlci5fZGF0YV9hbHJlYWR5X3B1c2hlZF9mb3Jfd29ya2VyOgotICAgICAgICAg ICAgc2VsZi5fcHVzaF9leGVjdXRhYmxlKCkKLSAgICAgICAgICAgIHNlbGYuX3B1c2hfZm9udHMo KQotICAgICAgICAgICAgc2VsZi5fcHVzaF90ZXN0X3Jlc291cmNlcygpCi0gICAgICAgICAgICBD aHJvbWl1bUFuZHJvaWREcml2ZXIuX2RhdGFfYWxyZWFkeV9wdXNoZWRfZm9yX3dvcmtlci5hZGQo d29ya2VyX251bWJlcikKIAogICAgIGRlZiBfX2RlbF9fKHNlbGYpOgogICAgICAgICBzZWxmLl90 ZWFyZG93bl9wZXJmb3JtYW5jZSgpCiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZl ciwgc2VsZikuX19kZWxfXygpCiAKLSAgICBkZWYgX3NldHVwX21kNXN1bShzZWxmKToKLSAgICAg ICAgc2VsZi5fbWQ1c3VtX3BhdGggPSBzZWxmLl9wb3J0Ll9idWlsZF9wYXRoX3dpdGhfY29uZmln dXJhdGlvbihzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgTUQ1U1VNX0RF VklDRV9GSUxFX05BTUUpCi0gICAgICAgIGFzc2VydCBvcy5wYXRoLmV4aXN0cyhzZWxmLl9tZDVz dW1fcGF0aCkKKyAgICBkZWYgX3NldHVwX21kNXN1bV9hbmRfcHVzaF9kYXRhX2lmX25lZWRlZChz ZWxmKToKKyAgICAgICAgbWQ1c3VtX3BhdGggPSBzZWxmLl9wb3J0Ll9idWlsZF9wYXRoX3dpdGhf Y29uZmlndXJhdGlvbihzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgTUQ1 U1VNX0RFVklDRV9GSUxFX05BTUUpCisgICAgICAgIGFzc2VydCBvcy5wYXRoLmV4aXN0cyhtZDVz dW1fcGF0aCkKIAogICAgICAgICBpZiBzZWxmLl9maWxlX2V4aXN0c19vbl9kZXZpY2UoTUQ1U1VN X0RFVklDRV9QQVRIKToKICAgICAgICAgICAgIHJldHVybgotICAgICAgICBpZiBub3Qgc2VsZi5f cHVzaF90b19kZXZpY2Uoc2VsZi5fbWQ1c3VtX3BhdGgsIE1ENVNVTV9ERVZJQ0VfUEFUSCk6Cisg ICAgICAgIGlmIG5vdCBzZWxmLl9wdXNoX3RvX2RldmljZShtZDVzdW1fcGF0aCwgTUQ1U1VNX0RF VklDRV9QQVRIKToKICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0NvdWxkIG5vdCBwdXNoIG1kNXN1 bSB0byBkZXZpY2UnKQogCisgICAgICAgIHNlbGYuX3B1c2hfZXhlY3V0YWJsZSgpCisgICAgICAg IHNlbGYuX3B1c2hfZm9udHMoKQorICAgICAgICBzZWxmLl9wdXNoX3Rlc3RfcmVzb3VyY2VzKCkK KwogICAgIGRlZiBfc2V0dXBfdGVzdChzZWxmKToKICAgICAgICAgaWYgc2VsZi5faGFzX3NldHVw OgogICAgICAgICAgICAgcmV0dXJuCiAKICAgICAgICAgc2VsZi5faGFzX3NldHVwID0gVHJ1ZQor ICAgICAgICBzZWxmLl9zZXR1cF9tZDVzdW1fYW5kX3B1c2hfZGF0YV9pZl9uZWVkZWQoKQogICAg ICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydyb290J10pCiAgICAgICAgIHNlbGYuX3NldHVw X3BlcmZvcm1hbmNlKCkKICAgICAgICAgIyBSZXF1aXJlZCBieSB3ZWJraXRfc3VwcG9ydDo6R2V0 V2ViS2l0Um9vdERpckZpbGVQYXRoKCkuCg== 163377 2012-09-11 08:50:12 -0700 2012-09-11 08:58:17 -0700 Patch bug-96393-20120911174946.patch text/plain 3513 pliard U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MTg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODlhOGI1NTQ5NDQ3NmU0MzM3YTI2Yzc0Njc5MTVmMjlm ZGU1ZmFkYy4uODU3N2Q2NjU2YWYxMzY3MWZhZGZkYTQ4MDE4MjViYWU5MzM0OTgxZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTA5LTExICBQaGlsaXBwZSBMaWFyZCAgPHBsaWFyZEBnb29nbGUuY29tPgorCisg ICAgICAgIE1ha2Ugc3VyZSB0aGF0IG1kNXN1bSBpcyBub3Qgc2V0dXAgb24gbm9uLUNocm9taXVt IEFuZHJvaWQgcGxhdGZvcm1zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTYzOTMKKworICAgICAgICBQcmV2aW91c2x5IG1kNXN1bSB3YXMgc2V0dXAg aW4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyJ3MgY29uc3RydWN0b3IKKyAgICAgICAgd2hpY2ggaXMg YWxzbyBpbnZva2VkIG9uIG5vbi1DaHJvbWl1bSBBbmRyb2lkIHBsYXRmb3Jtcy4gVGhlIGZvbGxv d2luZyBwYXRjaAorICAgICAgICBtb3ZlcyB0aGlzIGxvZ2ljIHRvIF9zdGFydHVwX3Rlc3QoKSB3 aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGludm9rZWQKKyAgICAgICAgb25seSBvbiBBbmRyb2lk LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9hbmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9faW5pdF9fKToK KyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fc2V0dXBfbWQ1c3VtX2FuZF9wdXNoX2Rh dGFfaWZfbmVlZGVkKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fc2V0dXBfdGVz dCk6CisKIDIwMTItMDktMTEgIEx1Y2lhbm8gV29sZiAgPGx1Y2lhbm8ud29sZkBvcGVuYm9zc2Eu b3JnPgogCiAgICAgICAgIFtRdF0gW1dLMl0gZWRpdGluZy9pbnNlcnRpbmcvdHlwaW5nLXRhYi1k ZXNpZ25tb2RlIHRlc3RzIGFyZSBmYWlsaW5nCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKaW5kZXgg MjY5NmIwNzliOTNkMjM5MWI2ZTE4ZDVmMzExYTEwMTczODBhZWJlMi4uNjAwZDlhMDU4NDdiN2Yz NDIwM2RiNWMwOTc2MGM1NDY3NWVlNmIwMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQpAQCAt MzA5LDggKzMwOSw2IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hyb21pdW0uQ2hyb21p dW1Qb3J0KToKIAogCiBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6 Ci0gICAgX2RhdGFfYWxyZWFkeV9wdXNoZWRfZm9yX3dvcmtlciA9IHNldHMuU2V0KCkKLQogICAg IGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB3b3JrZXJfbnVtYmVyLCBwaXhlbF90ZXN0cywgbm9f dGltZW91dD1GYWxzZSk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2Vs ZikuX19pbml0X18ocG9ydCwgd29ya2VyX251bWJlciwgcGl4ZWxfdGVzdHMsIG5vX3RpbWVvdXQp CiAgICAgICAgIHNlbGYuX2NtZF9saW5lID0gTm9uZQpAQCAtMzI0LDMwICszMjIsMjggQEAgY2xh c3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICBzZWxmLl9v cmlnaW5hbF9nb3Zlcm5vcnMgPSB7fQogICAgICAgICBzZWxmLl9kZXZpY2Vfc2VyaWFsID0gcG9y dC5fZ2V0X2RldmljZV9zZXJpYWwod29ya2VyX251bWJlcikKICAgICAgICAgc2VsZi5fYWRiX2Nv bW1hbmQgPSBbJ2FkYicsICctcycsIHNlbGYuX2RldmljZV9zZXJpYWxdCi0gICAgICAgIHNlbGYu X3NldHVwX21kNXN1bSgpCi0gICAgICAgIGlmIG5vdCB3b3JrZXJfbnVtYmVyIGluIENocm9taXVt QW5kcm9pZERyaXZlci5fZGF0YV9hbHJlYWR5X3B1c2hlZF9mb3Jfd29ya2VyOgotICAgICAgICAg ICAgc2VsZi5fcHVzaF9leGVjdXRhYmxlKCkKLSAgICAgICAgICAgIHNlbGYuX3B1c2hfZm9udHMo KQotICAgICAgICAgICAgc2VsZi5fcHVzaF90ZXN0X3Jlc291cmNlcygpCi0gICAgICAgICAgICBD aHJvbWl1bUFuZHJvaWREcml2ZXIuX2RhdGFfYWxyZWFkeV9wdXNoZWRfZm9yX3dvcmtlci5hZGQo d29ya2VyX251bWJlcikKIAogICAgIGRlZiBfX2RlbF9fKHNlbGYpOgogICAgICAgICBzZWxmLl90 ZWFyZG93bl9wZXJmb3JtYW5jZSgpCiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZl ciwgc2VsZikuX19kZWxfXygpCiAKLSAgICBkZWYgX3NldHVwX21kNXN1bShzZWxmKToKKyAgICBk ZWYgX3NldHVwX21kNXN1bV9hbmRfcHVzaF9kYXRhX2lmX25lZWRlZChzZWxmKToKICAgICAgICAg c2VsZi5fbWQ1c3VtX3BhdGggPSBzZWxmLl9wb3J0Ll9idWlsZF9wYXRoX3dpdGhfY29uZmlndXJh dGlvbihzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgTUQ1U1VNX0RFVklD RV9GSUxFX05BTUUpCiAgICAgICAgIGFzc2VydCBvcy5wYXRoLmV4aXN0cyhzZWxmLl9tZDVzdW1f cGF0aCkKIAotICAgICAgICBpZiBzZWxmLl9maWxlX2V4aXN0c19vbl9kZXZpY2UoTUQ1U1VNX0RF VklDRV9QQVRIKToKLSAgICAgICAgICAgIHJldHVybgotICAgICAgICBpZiBub3Qgc2VsZi5fcHVz aF90b19kZXZpY2Uoc2VsZi5fbWQ1c3VtX3BhdGgsIE1ENVNVTV9ERVZJQ0VfUEFUSCk6Ci0gICAg ICAgICAgICBfbG9nLmVycm9yKCdDb3VsZCBub3QgcHVzaCBtZDVzdW0gdG8gZGV2aWNlJykKKyAg ICAgICAgaWYgbm90IHNlbGYuX2ZpbGVfZXhpc3RzX29uX2RldmljZShNRDVTVU1fREVWSUNFX1BB VEgpOgorICAgICAgICAgICAgaWYgbm90IHNlbGYuX3B1c2hfdG9fZGV2aWNlKHNlbGYuX21kNXN1 bV9wYXRoLCBNRDVTVU1fREVWSUNFX1BBVEgpOgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3Io J0NvdWxkIG5vdCBwdXNoIG1kNXN1bSB0byBkZXZpY2UnKQorCisgICAgICAgIHNlbGYuX3B1c2hf ZXhlY3V0YWJsZSgpCisgICAgICAgIHNlbGYuX3B1c2hfZm9udHMoKQorICAgICAgICBzZWxmLl9w dXNoX3Rlc3RfcmVzb3VyY2VzKCkKIAogICAgIGRlZiBfc2V0dXBfdGVzdChzZWxmKToKICAgICAg ICAgaWYgc2VsZi5faGFzX3NldHVwOgogICAgICAgICAgICAgcmV0dXJuCiAKKyAgICAgICAgc2Vs Zi5fc2V0dXBfbWQ1c3VtX2FuZF9wdXNoX2RhdGFfaWZfbmVlZGVkKCkKICAgICAgICAgc2VsZi5f aGFzX3NldHVwID0gVHJ1ZQogICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydyb290J10p CiAgICAgICAgIHNlbGYuX3NldHVwX3BlcmZvcm1hbmNlKCkK 163378 2012-09-11 08:58:22 -0700 2012-09-11 09:36:59 -0700 Patch bug-96393-20120911175757.patch text/plain 4633 pliard U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MTg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODlhOGI1NTQ5NDQ3NmU0MzM3YTI2Yzc0Njc5MTVmMjlm ZGU1ZmFkYy4uY2YzY2Q0NDJiNTM2ODJjYmMzMzk3NTQ5OWMwNTM5MmZhYjdiYjJiYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTA5LTExICBQaGlsaXBwZSBMaWFyZCAgPHBsaWFyZEBnb29nbGUuY29tPgorCisg ICAgICAgIE1ha2Ugc3VyZSB0aGF0IG1kNXN1bSBpcyBub3Qgc2V0dXAgb24gbm9uLUNocm9taXVt IEFuZHJvaWQgcGxhdGZvcm1zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTYzOTMKKworICAgICAgICBQcmV2aW91c2x5IG1kNXN1bSB3YXMgc2V0dXAg aW4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyJ3MgY29uc3RydWN0b3IKKyAgICAgICAgd2hpY2ggaXMg YWxzbyBpbnZva2VkIG9uIG5vbi1DaHJvbWl1bSBBbmRyb2lkIHBsYXRmb3Jtcy4gVGhlIGZvbGxv d2luZyBwYXRjaAorICAgICAgICBtb3ZlcyB0aGlzIGxvZ2ljIHRvIF9zdGFydHVwX3Rlc3QoKSB3 aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGludm9rZWQKKyAgICAgICAgb25seSBvbiBBbmRyb2lk LgorCisgICAgICAgIFRoaXMgYWxzbyB1cGRhdGVzIHRoZSBwcm9tcHQgdW5pdCB0ZXN0IGluIGNo cm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHk6CisgICAgICAgIChDaHJvbWl1 bUFuZHJvaWREcml2ZXIuX19pbml0X18pOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVy Ll9zZXR1cF9tZDVzdW1fYW5kX3B1c2hfZGF0YV9pZl9uZWVkZWQpOgorICAgICAgICAoQ2hyb21p dW1BbmRyb2lkRHJpdmVyLl9zZXR1cF90ZXN0KToKKwogMjAxMi0wOS0xMSAgTHVjaWFubyBXb2xm ICA8bHVjaWFuby53b2xmQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XSBbV0syXSBlZGl0 aW5nL2luc2VydGluZy90eXBpbmctdGFiLWRlc2lnbm1vZGUgdGVzdHMgYXJlIGZhaWxpbmcKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fYW5kcm9pZC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fYW5kcm9pZC5weQppbmRleCAyNjk2YjA3OWI5M2QyMzkxYjZlMThkNWYzMTFhMTAx NzM4MGFlYmUyLi42MDBkOWEwNTg0N2I3ZjM0MjAzZGI1YzA5NzYwYzU0Njc1ZWU2YjAwIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X2FuZHJvaWQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9hbmRyb2lkLnB5CkBAIC0zMDksOCArMzA5LDYgQEAgY2xhc3MgQ2hyb21pdW1B bmRyb2lkUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogCiAKIGNsYXNzIENocm9taXVtQW5k cm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKLSAgICBfZGF0YV9hbHJlYWR5X3B1c2hlZF9mb3Jf d29ya2VyID0gc2V0cy5TZXQoKQotCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIHdvcmtl cl9udW1iZXIsIHBpeGVsX3Rlc3RzLCBub190aW1lb3V0PUZhbHNlKToKICAgICAgICAgc3VwZXIo Q2hyb21pdW1BbmRyb2lkRHJpdmVyLCBzZWxmKS5fX2luaXRfXyhwb3J0LCB3b3JrZXJfbnVtYmVy LCBwaXhlbF90ZXN0cywgbm9fdGltZW91dCkKICAgICAgICAgc2VsZi5fY21kX2xpbmUgPSBOb25l CkBAIC0zMjQsMzAgKzMyMiwyOCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVy LkRyaXZlcik6CiAgICAgICAgIHNlbGYuX29yaWdpbmFsX2dvdmVybm9ycyA9IHt9CiAgICAgICAg IHNlbGYuX2RldmljZV9zZXJpYWwgPSBwb3J0Ll9nZXRfZGV2aWNlX3NlcmlhbCh3b3JrZXJfbnVt YmVyKQogICAgICAgICBzZWxmLl9hZGJfY29tbWFuZCA9IFsnYWRiJywgJy1zJywgc2VsZi5fZGV2 aWNlX3NlcmlhbF0KLSAgICAgICAgc2VsZi5fc2V0dXBfbWQ1c3VtKCkKLSAgICAgICAgaWYgbm90 IHdvcmtlcl9udW1iZXIgaW4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9kYXRhX2FscmVhZHlfcHVz aGVkX2Zvcl93b3JrZXI6Ci0gICAgICAgICAgICBzZWxmLl9wdXNoX2V4ZWN1dGFibGUoKQotICAg ICAgICAgICAgc2VsZi5fcHVzaF9mb250cygpCi0gICAgICAgICAgICBzZWxmLl9wdXNoX3Rlc3Rf cmVzb3VyY2VzKCkKLSAgICAgICAgICAgIENocm9taXVtQW5kcm9pZERyaXZlci5fZGF0YV9hbHJl YWR5X3B1c2hlZF9mb3Jfd29ya2VyLmFkZCh3b3JrZXJfbnVtYmVyKQogCiAgICAgZGVmIF9fZGVs X18oc2VsZik6CiAgICAgICAgIHNlbGYuX3RlYXJkb3duX3BlcmZvcm1hbmNlKCkKICAgICAgICAg c3VwZXIoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLCBzZWxmKS5fX2RlbF9fKCkKIAotICAgIGRlZiBf c2V0dXBfbWQ1c3VtKHNlbGYpOgorICAgIGRlZiBfc2V0dXBfbWQ1c3VtX2FuZF9wdXNoX2RhdGFf aWZfbmVlZGVkKHNlbGYpOgogICAgICAgICBzZWxmLl9tZDVzdW1fcGF0aCA9IHNlbGYuX3BvcnQu X2J1aWxkX3BhdGhfd2l0aF9jb25maWd1cmF0aW9uKHNlbGYuX3BvcnQuZ2V0X29wdGlvbignY29u ZmlndXJhdGlvbicpLCBNRDVTVU1fREVWSUNFX0ZJTEVfTkFNRSkKICAgICAgICAgYXNzZXJ0IG9z LnBhdGguZXhpc3RzKHNlbGYuX21kNXN1bV9wYXRoKQogCi0gICAgICAgIGlmIHNlbGYuX2ZpbGVf ZXhpc3RzX29uX2RldmljZShNRDVTVU1fREVWSUNFX1BBVEgpOgotICAgICAgICAgICAgcmV0dXJu Ci0gICAgICAgIGlmIG5vdCBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxmLl9tZDVzdW1fcGF0aCwg TUQ1U1VNX0RFVklDRV9QQVRIKToKLSAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0NvdWxkIG5vdCBw dXNoIG1kNXN1bSB0byBkZXZpY2UnKQorICAgICAgICBpZiBub3Qgc2VsZi5fZmlsZV9leGlzdHNf b25fZGV2aWNlKE1ENVNVTV9ERVZJQ0VfUEFUSCk6CisgICAgICAgICAgICBpZiBub3Qgc2VsZi5f cHVzaF90b19kZXZpY2Uoc2VsZi5fbWQ1c3VtX3BhdGgsIE1ENVNVTV9ERVZJQ0VfUEFUSCk6Cisg ICAgICAgICAgICAgICAgX2xvZy5lcnJvcignQ291bGQgbm90IHB1c2ggbWQ1c3VtIHRvIGRldmlj ZScpCisKKyAgICAgICAgc2VsZi5fcHVzaF9leGVjdXRhYmxlKCkKKyAgICAgICAgc2VsZi5fcHVz aF9mb250cygpCisgICAgICAgIHNlbGYuX3B1c2hfdGVzdF9yZXNvdXJjZXMoKQogCiAgICAgZGVm IF9zZXR1cF90ZXN0KHNlbGYpOgogICAgICAgICBpZiBzZWxmLl9oYXNfc2V0dXA6CiAgICAgICAg ICAgICByZXR1cm4KIAorICAgICAgICBzZWxmLl9zZXR1cF9tZDVzdW1fYW5kX3B1c2hfZGF0YV9p Zl9uZWVkZWQoKQogICAgICAgICBzZWxmLl9oYXNfc2V0dXAgPSBUcnVlCiAgICAgICAgIHNlbGYu X3J1bl9hZGJfY29tbWFuZChbJ3Jvb3QnXSkKICAgICAgICAgc2VsZi5fc2V0dXBfcGVyZm9ybWFu Y2UoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9hbmRyb2lkX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkX3VuaXR0ZXN0LnB5CmluZGV4IGQyMDBh Y2M1YjkzMzlmMGY3MGVlZTc2NjMxN2U1NTkyMjA4ZGVkYmUuLmY2Y2M1MTMwMWMzMGYxZjFhNjkx NjEzY2Q0MDgzZjhhMTlkOWE5ODQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5p dHRlc3QucHkKQEAgLTI0MCw3ICsyNDAsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXJU ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5kcml2ZXIuX3NlcnZlcl9wcm9j ZXNzID0gZHJpdmVyX3VuaXR0ZXN0Lk1vY2tTZXJ2ZXJQcm9jZXNzKGxpbmVzPVsncm9vdEBhbmRy b2lkOi8gIyAnXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5kcml2ZXIuX3JlYWRf cHJvbXB0KHRpbWUudGltZSgpICsgMSksIE5vbmUpCiAgICAgICAgIHNlbGYuZHJpdmVyLl9zZXJ2 ZXJfcHJvY2VzcyA9IGRyaXZlcl91bml0dGVzdC5Nb2NrU2VydmVyUHJvY2VzcyhsaW5lcz1bJyQg J10pCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmRyaXZl ci5fcmVhZF9wcm9tcHQsIHRpbWUudGltZSgpICsgMSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoc2VsZi5kcml2ZXIuX3JlYWRfcHJvbXB0KHRpbWUudGltZSgpICsgMSksIE5vbmUpCiAKICAg ICBkZWYgdGVzdF9jb21tYW5kX2Zyb21fZHJpdmVyX2lucHV0KHNlbGYpOgogICAgICAgICBkcml2 ZXJfaW5wdXQgPSBkcml2ZXIuRHJpdmVySW5wdXQoJ2Zvby9iYXIvdGVzdC5odG1sJywgMTAsICdj aGVja3N1bScsIFRydWUpCg==