57575 2011-03-31 14:03:58 -0700 NRWT shouldn't copy .checksum files if the checksum is in the png 2011-04-21 10:53:53 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED DUPLICATE 58402 P2 Normal --- 56286 1 tony webkit-unassigned dpranke ojan oldest_to_newest 377427 0 tony 2011-03-31 14:03:58 -0700 Currently running --reset-results and --new-baseline always copies over the .checksum file, even if the checksum is in the png comment. Once we don't need the .checksum file, we can remove this copy step. We also need to delete any old .checksum files that may exist from previous baselines. 385325 1 89482 tony 2011-04-13 15:54:54 -0700 Created attachment 89482 Patch 385876 2 tony 2011-04-14 10:58:28 -0700 Per discussion on 58402, I won't land this until I've updated all the existing pngs. 390157 3 tony 2011-04-21 10:53:53 -0700 I'm going to merge this into a single patch in bug 58402. *** This bug has been marked as a duplicate of bug 58402 *** 89482 2011-04-13 15:54:54 -0700 2011-04-13 16:44:10 -0700 Patch bug-57575-20110413155708.patch text/plain 4960 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODM3NzAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNWY1ZWU0ZTk4OTNjYWVlMjU1NGMyYjU0MjBmZmNlNWY3 YjIxNmJmLi4xMjk2NmMzNTliNjFiMjQ4ZGQxYmRmZmQwNzE3YTc1MDFmOTc1YzE5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDQtMTMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOUldUIHNob3VsZG4ndCBj b3B5IC5jaGVja3N1bSBmaWxlcyBpZiB0aGUgY2hlY2tzdW0gaXMgaW4gdGhlIHBuZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc1NzUKKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90 ZXN0X3J1bm5lci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5OgorCiAyMDExLTA0LTEzICBEaXJrIFByYW5rZSAg PGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1paGFpIFBhcnBh cml0YS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weQppbmRl eCAxMGYxOGE0NzU2ZWFmYzUwZWI2MTg5MGIwMWUxMTI4ZjMyMDIyMGExLi41OTQzZWMzODgwMGFl OWZkM2FhZDE5YjBkZjU3ZDA2NmI4NGY2YmY0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uv c2luZ2xlX3Rlc3RfcnVubmVyLnB5CkBAIC0xNDUsMTIgKzE0NSwxNiBAQCBjbGFzcyBTaW5nbGVU ZXN0UnVubmVyOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVfbmV3 X2Jhc2VsaW5lPXNlbGYuX29wdGlvbnMubmV3X2Jhc2VsaW5lKQogICAgICAgICBpZiBkcml2ZXJf b3V0cHV0LmF1ZGlvOgogICAgICAgICAgICAgc2VsZi5fc2F2ZV9iYXNlbGluZV9kYXRhKGRyaXZl cl9vdXRwdXQuYXVkaW8sICcud2F2JywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBnZW5lcmF0ZV9uZXdfYmFzZWxpbmU9c2VsZi5fb3B0aW9ucy5uZXdfYmFzZWxpbmUpCisg ICAgICAgICAgICAgICAgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lPXNlbGYuX29wdGlvbnMubmV3X2Jh c2VsaW5lKQogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnBpeGVsX3Rlc3RzIGFuZCBkcml2ZXJf b3V0cHV0LmltYWdlX2hhc2g6Ci0gICAgICAgICAgICBzZWxmLl9zYXZlX2Jhc2VsaW5lX2RhdGEo ZHJpdmVyX291dHB1dC5pbWFnZSwgIi5wbmciLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxmLl9vcHRpb25zLm5ld19iYXNlbGlu ZSkKLSAgICAgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShkcml2ZXJfb3V0cHV0Lmlt YWdlX2hhc2gsICIuY2hlY2tzdW0iLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxmLl9vcHRpb25zLm5ld19iYXNlbGluZSkKKyAg ICAgICAgICAgIG91dHB1dF9wYXRoID0gc2VsZi5fc2F2ZV9iYXNlbGluZV9kYXRhKGRyaXZlcl9v dXRwdXQuaW1hZ2UsICIucG5nIiwKKyAgICAgICAgICAgICAgICBnZW5lcmF0ZV9uZXdfYmFzZWxp bmU9c2VsZi5fb3B0aW9ucy5uZXdfYmFzZWxpbmUpCisKKyAgICAgICAgICAgICMgRGVsZXRlIHRo ZSAuY2hlY2tzdW0gZmlsZSBpZiBpdCBleGlzdHMuCisgICAgICAgICAgICBmcyA9IHNlbGYuX3Bv cnQuX2ZpbGVzeXN0ZW0KKyAgICAgICAgICAgIGNoZWNrc3VtX3BhdGggPSBmcy5zcGxpdGV4dChv dXRwdXRfcGF0aClbMF0gKyAnLmNoZWNrc3VtJworICAgICAgICAgICAgaWYgZnMuZXhpc3RzKGNo ZWNrc3VtX3BhdGgpOgorICAgICAgICAgICAgICAgIGZzLnJlbW92ZShjaGVja3N1bV9wYXRoKQog CiAgICAgZGVmIF9zYXZlX2Jhc2VsaW5lX2RhdGEoc2VsZiwgZGF0YSwgbW9kaWZpZXIsIGdlbmVy YXRlX25ld19iYXNlbGluZT1UcnVlKToKICAgICAgICAgIiIiU2F2ZXMgYSBuZXcgYmFzZWxpbmUg ZmlsZSBpbnRvIHRoZSBwb3J0J3MgYmFzZWxpbmUgZGlyZWN0b3J5LgpAQCAtMTgxLDYgKzE4NSw3 IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCdyZXNl dHRpbmcgYmFzZWxpbmUgcmVzdWx0ICIlcyInICUgb3V0cHV0X3BhdGgpCiAKICAgICAgICAgcG9y dC51cGRhdGVfYmFzZWxpbmUob3V0cHV0X3BhdGgsIGRhdGEpCisgICAgICAgIHJldHVybiBvdXRw dXRfcGF0aAogCiAgICAgZGVmIF9oYW5kbGVfZXJyb3Ioc2VsZiwgZHJpdmVyX291dHB1dCwgcmVm ZXJlbmNlX2ZpbGVuYW1lPU5vbmUpOgogICAgICAgICAiIiJSZXR1cm5zIHRlc3QgZmFpbHVyZXMg aWYgc29tZSB1bnVzdWFsIGVycm9ycyBoYXBwZW4gaW4gZHJpdmVyJ3MgcnVuLgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191 bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfdW5pdHRlc3QucHkKaW5kZXggYTY0OTFlOTZhYzQ0ZDFhMTM2ZTBmNzc1ZjM4NzA5 NDQxYWU3M2E2Yy4uMzM5NWE1MTAwOThjM2U5Mzg5ZGFmMGU4MGI4N2MzNmI2Yjc5ODkyMCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90 ZXN0c191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC01OTMsNyArNTkzLDcgQEAgTWFpblRl c3QgPSBza2lwX2lmKE1haW5UZXN0LCBzeXMucGxhdGZvcm0gPT0gJ2N5Z3dpbicgYW5kIGNvbXBh cmVfdmVyc2lvbihzeXMsICcKIGNsYXNzIFJlYmFzZWxpbmVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICBkZWYgYXNzZXJ0QmFzZWxpbmVzKHNlbGYsIGZpbGVfbGlzdCwgZmlsZSk6CiAgICAg ICAgICJhc3NlcnQgdGhhdCB0aGUgZmlsZV9saXN0IGNvbnRhaW5zIHRoZSBiYXNlbGluZXMuIiIi Ci0gICAgICAgIGZvciBleHQgaW4gWyIudHh0IiwgIi5wbmciLCAiLmNoZWNrc3VtIl06CisgICAg ICAgIGZvciBleHQgaW4gKCIudHh0IiwgIi5wbmciKToKICAgICAgICAgICAgIGJhc2VsaW5lID0g ZmlsZSArICItZXhwZWN0ZWQiICsgZXh0CiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoYW55 KGYuZmluZChiYXNlbGluZSkgIT0gLTEgZm9yIGYgaW4gZmlsZV9saXN0KSkKIApAQCAtNjEyLDEw ICs2MTIsMTIgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICBmaWxlX2xpc3QgPSBmcy53cml0dGVuX2ZpbGVzLmtleXMoKQogICAgICAgICBmaWxlX2xp c3QucmVtb3ZlKCcvdG1wL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdHNfcnVuMC50eHQnKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihmaWxlX2xpc3QpLCA2KQotICAgICAgICBzZWxmLmFz c2VydEJhc2VsaW5lcyhmaWxlX2xpc3QsCi0gICAgICAgICAgICAiL3Bhc3Nlcy9pbWFnZSIpCi0g ICAgICAgIHNlbGYuYXNzZXJ0QmFzZWxpbmVzKGZpbGVfbGlzdCwKLSAgICAgICAgICAgICIvZmFp bHVyZXMvZXhwZWN0ZWQvbWlzc2luZ19pbWFnZSIpCisgICAgICAgICMgVmVyaWZ5IHRoYXQgdGhl IC5jaGVja3N1bSBmaWxlcyB3ZXJlIGRlbGV0ZWQuCisgICAgICAgIGZvciBmaWxlbmFtZSwgZmls ZV9jb250ZW50cyBpbiBmcy53cml0dGVuX2ZpbGVzLml0ZXJpdGVtcygpOgorICAgICAgICAgICAg aWYgZmlsZW5hbWUuZW5kc3dpdGgoJy5jaGVja3N1bScpOgorICAgICAgICAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKE5vbmUsIGZpbGVfY29udGVudHMpCisgICAgICAgIHNlbGYuYXNzZXJ0QmFz ZWxpbmVzKGZpbGVfbGlzdCwgIi9wYXNzZXMvaW1hZ2UiKQorICAgICAgICBzZWxmLmFzc2VydEJh c2VsaW5lcyhmaWxlX2xpc3QsICIvZmFpbHVyZXMvZXhwZWN0ZWQvbWlzc2luZ19pbWFnZSIpCiAK ICAgICBkZWYgdGVzdF9uZXdfYmFzZWxpbmUoc2VsZik6CiAgICAgICAgICMgVGVzdCB0aGF0IHdl IHVwZGF0ZSB0aGUgcGxhdGZvcm0gZXhwZWN0YXRpb25zLiBJZiB0aGUgZXhwZWN0YXRpb24KQEAg LTYyOCw3ICs2MzAsNyBAQCBjbGFzcyBSZWJhc2VsaW5lVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgICAgICAgICAgICAgIHRlc3RzX2luY2x1ZGVkPVRydWUsIGZpbGVzeXN0ZW09ZnMp CiAgICAgICAgIGZpbGVfbGlzdCA9IGZzLndyaXR0ZW5fZmlsZXMua2V5cygpCiAgICAgICAgIGZp bGVfbGlzdC5yZW1vdmUoJy90bXAvbGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0c19ydW4wLnR4dCcp Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGZpbGVfbGlzdCksIDYpCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwobGVuKGZpbGVfbGlzdCksIDQpCiAgICAgICAgIHNlbGYuYXNzZXJ0QmFz ZWxpbmVzKGZpbGVfbGlzdCwKICAgICAgICAgICAgICIvcGxhdGZvcm0vdGVzdC1tYWMtbGVvcGFy ZC9wYXNzZXMvaW1hZ2UiKQogICAgICAgICBzZWxmLmFzc2VydEJhc2VsaW5lcyhmaWxlX2xpc3Qs Cg==