95370 2012-08-29 13:20:55 -0700 NRWT should look in mac-wk2 for a TestExpecations file 2012-08-30 13:54:37 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jberlin dpranke abarth dpranke jberlin ojan thorton webkit.review.bot oldest_to_newest 707790 0 jberlin 2012-08-29 13:20:55 -0700 I attempted to add a TestExpectations file for mac-wk2 today and NRWT wasn't picking it up when I ran the WK2 tests on Lion unless I passed it as the value for --additional-expectations. 708018 1 161352 dpranke 2012-08-29 16:21:56 -0700 Created attachment 161352 Patch 708178 2 161352 jberlin 2012-08-29 18:37:44 -0700 Comment on attachment 161352 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161352&action=review > Tools/Scripts/webkitpy/layout_tests/port/mac.py:279 > + files.append(self._filesystem.join(self._webkit_baseline_path('mac-wk2'), 'TestExpectations')) What about qt-wk2 gtk-wk2? Is there a way to make this generic for them and future wk2 ports? 708200 3 dpranke 2012-08-29 18:58:00 -0700 qt has their own logic which already handles this (the qt search path is more complicated). we could add this for gtk, efl, etc. if they wanted it but right now they haven't indicated a need. chromium doesn't :). I can push this up into apple.py if you want the same logic across apple mac and apple win, at least. 708792 4 jberlin 2012-08-30 10:24:38 -0700 (In reply to comment #3) > qt has their own logic which already handles this (the qt search path is more complicated). > > we could add this for gtk, efl, etc. if they wanted it but right now they haven't indicated a need. chromium doesn't :). > > I can push this up into apple.py if you want the same logic across apple mac and apple win, at least. Pushing it up into apple.py would be better, so that it just works when you get NRWT working on Windows :) 708896 5 161529 dpranke 2012-08-30 12:21:16 -0700 Created attachment 161529 Patch 708898 6 dpranke 2012-08-30 12:22:19 -0700 Okay, added win-wk2 support as well. Note that we will still only search in platform/mac and platform/mac-wk2 . Do you want to add support for platform/mac-$VERSION as well? 708899 7 161531 dpranke 2012-08-30 12:23:50 -0700 Created attachment 161531 fix mac.py 708934 8 dpranke 2012-08-30 13:01:57 -0700 committed in http://trac.webkit.org/changeset/127174 . (If you do want mac-$VERSION, let me know and I'll file a separate bug w/ a patch). 708947 9 jberlin 2012-08-30 13:16:47 -0700 (In reply to comment #6) > Okay, added win-wk2 support as well. > > Note that we will still only search in platform/mac and platform/mac-wk2 . Do you want to add support for platform/mac-$VERSION as well? I am not sure what you mean by mac-$VERSION. For example, do you mean mac-lion-wk2? Or just mac-lion? 708954 10 dpranke 2012-08-30 13:21:08 -0700 (In reply to comment #9) > (In reply to comment #6) > > Okay, added win-wk2 support as well. > > > > Note that we will still only search in platform/mac and platform/mac-wk2 . Do you want to add support for platform/mac-$VERSION as well? > > I am not sure what you mean by mac-$VERSION. For example, do you mean mac-lion-wk2? Or just mac-lion? just mac-lion. 709002 11 jberlin 2012-08-30 13:54:37 -0700 (In reply to comment #8) > committed in http://trac.webkit.org/changeset/127174 . > > (If you do want mac-$VERSION, let me know and I'll file a separate bug w/ a patch). For those watching at home, this broke the layout tests because no TestExpectations file existed for mac-wk2. Dirk is fixing this by adding that file. 161352 2012-08-29 16:21:56 -0700 2012-08-30 12:21:14 -0700 Patch bug-95370-20120829162145.patch text/plain 3585 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MDU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDljMGE3ZDNhZmZjNmE3NmYwMzkzNmE2Y2RjYzgzNjVj ODYzZWE2Ny4uMWEyM2VlODE3NDdkNDA1OTNjMDIzOTc0NTU0MzhlNTU1NTk0Mjc5NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIy IEBACiAyMDEyLTA4LTI5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIE5SV1Qgc2hvdWxkIGxvb2sgaW4gbWFjLXdrMiBmb3IgYSBUZXN0RXhwZWNhdGlvbnMg ZmlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUz NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5OgorICAgICAgICAoTWFjUG9y dC5ubV9jb21tYW5kKToKKyAgICAgICAgKE1hY1BvcnQpOgorICAgICAgICAoTWFjUG9ydC5leHBl Y3RhdGlvbnNfZmlsZXMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFjVGVzdC50ZXN0X2V4cGVjdGF0aW9u c19maWxlcyk6CisgICAgICAgIChNYWNUZXN0LnRlc3Rfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRo cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rl c3RjYXNlLnB5OgorICAgICAgICAoUG9ydFRlc3RDYXNlLnRlc3RfZXhwZWN0YXRpb25zX2ZpbGVz KToKKworMjAxMi0wOC0yOSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwog ICAgICAgICB3ZWJraXQtcGF0Y2ggcmViYXNlbGluZS1leHBlY3RhdGlvbnMgd3JvbmdseSB0b3Vj aGVzIG90aGVyIHBsYXRmb3JtcycgVGVzdEV4cGVjdGF0aW9ucwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUyMjIKIApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQppbmRleCA0MDA5NTljZmQ5YWZkYzBj ZDNhNjQ1ZGVkYjMxZjM2YmY2N2YyZmZhLi5lNjFhYjc5ZmFmNDdmMDY5OTQ1NzhhNDdkZjg3MWFl NTJhYzhlZTc5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hYy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L21hYy5weQpAQCAtMjcyLDMgKzI3Miw5IEBAIGNsYXNzIE1hY1BvcnQoQXBwbGVQb3J0KToK ICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgogICAgICAgICAgICAgX2xvZy53YXJuKCJ4 Y3J1biBmYWlsZWQ7IGZhbGxpbmcgYmFjayB0byAnbm0nLiIpCiAgICAgICAgICAgICByZXR1cm4g J25tJworCisgICAgZGVmIGV4cGVjdGF0aW9uc19maWxlcyhzZWxmKToKKyAgICAgICAgZmlsZXMg PSBbc2VsZi5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKV0KKyAgICAgICAgaWYgc2Vs Zi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAgIGZpbGVzLmFw cGVuZChzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ21h Yy13azInKSwgJ1Rlc3RFeHBlY3RhdGlvbnMnKSkKKyAgICAgICAgcmV0dXJuIGZpbGVzCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3Vu aXR0ZXN0LnB5CmluZGV4IGU3NWFlZWZmNzcwYTg3YmYxZTQyNTU0OWU0MjNkYzhiMTE5NjFiMDAu Ljk2YWFkZGFhOTU4NTU3MTc0ZGY2NjM0Y2UzMzNhYzM2NjQ4ZGM0YTIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0 LnB5CkBAIC00OSw2ICs0OSwxMCBAQCBjbGFzcyBNYWNUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRl c3RDYXNlKToKICAgICAgICAgc3VwZXIoTWFjVGVzdCwgc2VsZikudGVzdF9kZWZhdWx0X3RpbWVv dXRfbXMoKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLm1ha2VfcG9ydChvcHRpb25z PU1vY2tPcHRpb25zKGd1YXJkX21hbGxvYz1UcnVlKSkuZGVmYXVsdF90aW1lb3V0X21zKCksIDM1 MDAwMCkKIAorICAgIGRlZiB0ZXN0X2V4cGVjdGF0aW9uc19maWxlcyhzZWxmKToKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMobGVuKHNlbGYubWFrZV9wb3J0KCkuZXhwZWN0YXRpb25zX2ZpbGVz KCkpLCAxKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4oc2VsZi5tYWtlX3BvcnQob3B0 aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9VHJ1ZSkpLmV4cGVjdGF0aW9uc19m aWxlcygpKSwgMikKKwogICAgIGRlZiB0ZXN0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2Vs Zik6CiAgICAgICAgICMgV2Ugc2hvdWxkIGhhdmUgdHdvIHNraXBwZWQgZmlsZXMgLSBwbGF0Zm9y bSt2ZXJzaW9uIGFuZCBwbGF0Zm9ybTsgaG93ZXZlciwgd2UgZG9uJ3QKICAgICAgICAgIyBoYXZl IHBsYXRmb3JtK3ZlcnNpb24gZm9yIGVpdGhlciB0aGUgbW9zdCByZWNlbnQgdmVyc2lvbiBvciBt YWMtZnV0dXJlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CmluZGV4IDQ0YmYxNjc2ODQ3NjEwNzk4ZmM2MDBi NDQyZjYwYzc5ZDdjN2E3OTguLmUxMmI2ODc3M2MyYTBlYzQ0YzEwNjhiNjQ1Y2FhMzMxYjRhZjcw ZDQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cG9ydF90ZXN0Y2FzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKQEAgLTEwNiw2ICsxMDYsOSBAQCBjbGFzcyBQb3J0VGVz dENhc2UodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0tZm9v PWJhcicgaW4gY21kX2xpbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1mb289YmF6JyBp biBjbWRfbGluZSkKIAorICAgIGRlZiB0ZXN0X2V4cGVjdGF0aW9uc19maWxlcyhzZWxmKToKKyAg ICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbHMoc2VsZi5tYWtlX3BvcnQoKS5leHBlY3RhdGlvbnNf ZmlsZXMoKSwgW10pCisKICAgICBkZWYgdGVzdF91c2VzX2FwYWNoZShzZWxmKToKICAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHNlbGYubWFrZV9wb3J0KCkuX3VzZXNfYXBhY2hlKCkpCiAK 161529 2012-08-30 12:21:16 -0700 2012-08-30 12:23:48 -0700 Patch bug-95370-20120830122105.patch text/plain 5525 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MDU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDljMGE3ZDNhZmZjNmE3NmYwMzkzNmE2Y2RjYzgzNjVj ODYzZWE2Ny4uZTM4NGFhN2Y0NGJiNjAzYTc2MmJjMDhmYjE2NmIzZjQ5MTBiMTVhMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0 IEBACiAyMDEyLTA4LTI5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIE5SV1Qgc2hvdWxkIGxvb2sgaW4gbWFjLXdrMiBmb3IgYSBUZXN0RXhwZWNhdGlvbnMg ZmlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUz NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRz IHN1cHBvcnQgZm9yIG1hYy13azIgYW5kIHdpbi13azIgdG8gZXhwZWN0YXRpb25zX2ZpbGVzKCkK KyAgICAgICAgZm9yIHRoZSBhcHBsZSBtYWMgYW5kIGFwcGxlIHdpbiBwb3J0cy4KKyAgICAgICAg CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBsZS5weToK KyAgICAgICAgKEFwcGxlUG9ydC5leHBlY3RhdGlvbnNfZmlsZXMpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorICAgICAgICAo TWFjVGVzdC50ZXN0X2V4cGVjdGF0aW9uc19maWxlcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRlc3QucHk6CisgICAgICAgIChXaW5UZXN0 LnRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAgIChQb3J0VGVzdENhc2Uu dGVzdF9leHBlY3RhdGlvbnNfZmlsZXMpOgorCisyMDEyLTA4LTI5ICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4 cGVjdGF0aW9ucyB3cm9uZ2x5IHRvdWNoZXMgb3RoZXIgcGxhdGZvcm1zJyBUZXN0RXhwZWN0YXRp b25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTIy MgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2FwcGxlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBs ZS5weQppbmRleCA1OGI1YjY0YjY2MTM0NTYxNjBiZGU0ZDllMjk4MDcwOWY5ZDYxNDAzLi4xNzcw NWNhNDU2NDNjOTFhYWM1ZDYyZGNiNGU3NWUyMzE1ZWQ1MWRjIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwcGxlLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHkKQEAgLTk3LDMgKzk3LDkg QEAgY2xhc3MgQXBwbGVQb3J0KFBvcnQpOgogICAgICAgICAgICAgICAgIGZvciBhcmNoaXRlY3R1 cmUgaW4gc2VsZi5BUkNISVRFQ1RVUkVTOgogICAgICAgICAgICAgICAgICAgICBjb25maWd1cmF0 aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3VyYXRpb24odmVyc2lvbj1zZWxmLl9zdHJpcF9wb3J0X25h bWVfcHJlZml4KHBvcnRfbmFtZSksIGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkX3R5 cGU9YnVpbGRfdHlwZSkpCiAgICAgICAgIHJldHVybiBjb25maWd1cmF0aW9ucworCisgICAgZGVm IGV4cGVjdGF0aW9uc19maWxlcyhzZWxmKToKKyAgICAgICAgZmlsZXMgPSBbc2VsZi5wYXRoX3Rv X3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKV0KKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3 ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAgIGZpbGVzLmFwcGVuZChzZWxmLl9maWxl c3lzdGVtLmpvaW4oc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoc2VsZi5wb3J0X25hbWUgKyAn LXdrMicpLCAnVGVzdEV4cGVjdGF0aW9ucycpKQorICAgICAgICByZXR1cm4gZmlsZXMKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKaW5kZXggNDAw OTU5Y2ZkOWFmZGMwY2QzYTY0NWRlZGIzMWYzNmJmNjdmMmZmYS4uZTYxYWI3OWZhZjQ3ZjA2OTk0 NTc4YTQ3ZGY4NzFhZTUyYWM4ZWU3OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKQEAgLTI3MiwzICsyNzIsOSBAQCBjbGFzcyBNYWNQb3J0 KEFwcGxlUG9ydCk6CiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKICAgICAgICAgICAg IF9sb2cud2FybigieGNydW4gZmFpbGVkOyBmYWxsaW5nIGJhY2sgdG8gJ25tJy4iKQogICAgICAg ICAgICAgcmV0dXJuICdubScKKworICAgIGRlZiBleHBlY3RhdGlvbnNfZmlsZXMoc2VsZik6Cisg ICAgICAgIGZpbGVzID0gW3NlbGYucGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKCldCisg ICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAg ICAgICBmaWxlcy5hcHBlbmQoc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3dlYmtpdF9iYXNl bGluZV9wYXRoKCdtYWMtd2syJyksICdUZXN0RXhwZWN0YXRpb25zJykpCisgICAgICAgIHJldHVy biBmaWxlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tYWNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hY191bml0dGVzdC5weQppbmRleCBlNzVhZWVmZjc3MGE4N2JmMWU0MjU1NDllNDIz ZGM4YjExOTYxYjAwLi45NmFhZGRhYTk1ODU1NzE3NGRmNjYzNGNlMzMzYWMzNjY0OGRjNGEyIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191 bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L21hY191bml0dGVzdC5weQpAQCAtNDksNiArNDksMTAgQEAgY2xhc3MgTWFjVGVzdChwb3J0X3Rl c3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgIHN1cGVyKE1hY1Rlc3QsIHNlbGYpLnRlc3Rf ZGVmYXVsdF90aW1lb3V0X21zKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5tYWtl X3BvcnQob3B0aW9ucz1Nb2NrT3B0aW9ucyhndWFyZF9tYWxsb2M9VHJ1ZSkpLmRlZmF1bHRfdGlt ZW91dF9tcygpLCAzNTAwMDApCiAKKyAgICBkZWYgdGVzdF9leHBlY3RhdGlvbnNfZmlsZXMoc2Vs Zik6CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGxlbihzZWxmLm1ha2VfcG9ydCgpLmV4cGVj dGF0aW9uc19maWxlcygpKSwgMSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMobGVuKHNlbGYu bWFrZV9wb3J0KG9wdGlvbnM9TW9ja09wdGlvbnMod2Via2l0X3Rlc3RfcnVubmVyPVRydWUpKS5l eHBlY3RhdGlvbnNfZmlsZXMoKSksIDIpCisKICAgICBkZWYgdGVzdF9za2lwcGVkX2ZpbGVfc2Vh cmNoX3BhdGhzKHNlbGYpOgogICAgICAgICAjIFdlIHNob3VsZCBoYXZlIHR3byBza2lwcGVkIGZp bGVzIC0gcGxhdGZvcm0rdmVyc2lvbiBhbmQgcGxhdGZvcm07IGhvd2V2ZXIsIHdlIGRvbid0CiAg ICAgICAgICMgaGF2ZSBwbGF0Zm9ybSt2ZXJzaW9uIGZvciBlaXRoZXIgdGhlIG1vc3QgcmVjZW50 IHZlcnNpb24gb3IgbWFjLWZ1dHVyZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weQppbmRleCA0NGJmMTY3Njg0 NzYxMDc5OGZjNjAwYjQ0MmY2MGM3OWQ3YzdhNzk4Li5lMTJiNjg3NzNjMmEwZWM0NGMxMDY4YjY0 NWNhYTMzMWI0YWY3MGQ0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CkBAIC0xMDYsNiArMTA2LDkgQEAg Y2xhc3MgUG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3Nl cnRUcnVlKCctLWZvbz1iYXInIGluIGNtZF9saW5lKQogICAgICAgICBzZWxmLmFzc2VydFRydWUo Jy0tZm9vPWJheicgaW4gY21kX2xpbmUpCiAKKyAgICBkZWYgdGVzdF9leHBlY3RhdGlvbnNfZmls ZXMoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0Tm90RXF1YWxzKHNlbGYubWFrZV9wb3J0KCku ZXhwZWN0YXRpb25zX2ZpbGVzKCksIFtdKQorCiAgICAgZGVmIHRlc3RfdXNlc19hcGFjaGUoc2Vs Zik6CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLm1ha2VfcG9ydCgpLl91c2VzX2FwYWNo ZSgpKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dpbl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2luX3VuaXR0ZXN0LnB5CmluZGV4IGM1MTFjODcyZTJiNTg4ODFhMmY2ZGQ1ZjgyMWQ5 MzE0NmY4YzI3MGQuLjdjMjViNmU0ZWM5NmE5YjQ4ZjcwNGVhZjZjNDY3ZDk3MTE3NzRlYzAgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luX3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv d2luX3VuaXR0ZXN0LnB5CkBAIC0xMDMsMyArMTAzLDcgQEAgY2xhc3MgV2luUG9ydFRlc3QocG9y dF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0 Ll9ydW50aW1lX2ZlYXR1cmVfbGlzdCgpLCBOb25lKQogICAgICAgICBwb3J0Ll9leGVjdXRpdmUu cnVuX2NvbW1hbmQgPSBsYW1iZGEgY29tbWFuZCwgY3dkPU5vbmUsIGVycm9yX2hhbmRsZXI9Tm9u ZTogIlN1cHBvcnRlZEZlYXR1cmVzOmZvbyBiYXIiCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHBvcnQuX3J1bnRpbWVfZmVhdHVyZV9saXN0KCksIFsnZm9vJywgJ2JhciddKQorCisgICAgZGVm IHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhsZW4oc2VsZi5tYWtlX3BvcnQoKS5leHBlY3RhdGlvbnNfZmlsZXMoKSksIDEpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKGxlbihzZWxmLm1ha2VfcG9ydChvcHRpb25zPU1vY2tPcHRpb25z KHdlYmtpdF90ZXN0X3J1bm5lcj1UcnVlKSkuZXhwZWN0YXRpb25zX2ZpbGVzKCkpLCAyKQo= 161531 2012-08-30 12:23:50 -0700 2012-08-30 12:25:12 -0700 fix mac.py bug-95370-20120830122338.patch text/plain 4770 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MDU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDljMGE3ZDNhZmZjNmE3NmYwMzkzNmE2Y2RjYzgzNjVj ODYzZWE2Ny4uZTM4NGFhN2Y0NGJiNjAzYTc2MmJjMDhmYjE2NmIzZjQ5MTBiMTVhMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0 IEBACiAyMDEyLTA4LTI5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIE5SV1Qgc2hvdWxkIGxvb2sgaW4gbWFjLXdrMiBmb3IgYSBUZXN0RXhwZWNhdGlvbnMg ZmlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUz NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRz IHN1cHBvcnQgZm9yIG1hYy13azIgYW5kIHdpbi13azIgdG8gZXhwZWN0YXRpb25zX2ZpbGVzKCkK KyAgICAgICAgZm9yIHRoZSBhcHBsZSBtYWMgYW5kIGFwcGxlIHdpbiBwb3J0cy4KKyAgICAgICAg CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBsZS5weToK KyAgICAgICAgKEFwcGxlUG9ydC5leHBlY3RhdGlvbnNfZmlsZXMpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorICAgICAgICAo TWFjVGVzdC50ZXN0X2V4cGVjdGF0aW9uc19maWxlcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRlc3QucHk6CisgICAgICAgIChXaW5UZXN0 LnRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAgIChQb3J0VGVzdENhc2Uu dGVzdF9leHBlY3RhdGlvbnNfZmlsZXMpOgorCisyMDEyLTA4LTI5ICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4 cGVjdGF0aW9ucyB3cm9uZ2x5IHRvdWNoZXMgb3RoZXIgcGxhdGZvcm1zJyBUZXN0RXhwZWN0YXRp b25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTIy MgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2FwcGxlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBs ZS5weQppbmRleCA1OGI1YjY0YjY2MTM0NTYxNjBiZGU0ZDllMjk4MDcwOWY5ZDYxNDAzLi4xNzcw NWNhNDU2NDNjOTFhYWM1ZDYyZGNiNGU3NWUyMzE1ZWQ1MWRjIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwcGxlLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHkKQEAgLTk3LDMgKzk3LDkg QEAgY2xhc3MgQXBwbGVQb3J0KFBvcnQpOgogICAgICAgICAgICAgICAgIGZvciBhcmNoaXRlY3R1 cmUgaW4gc2VsZi5BUkNISVRFQ1RVUkVTOgogICAgICAgICAgICAgICAgICAgICBjb25maWd1cmF0 aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3VyYXRpb24odmVyc2lvbj1zZWxmLl9zdHJpcF9wb3J0X25h bWVfcHJlZml4KHBvcnRfbmFtZSksIGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkX3R5 cGU9YnVpbGRfdHlwZSkpCiAgICAgICAgIHJldHVybiBjb25maWd1cmF0aW9ucworCisgICAgZGVm IGV4cGVjdGF0aW9uc19maWxlcyhzZWxmKToKKyAgICAgICAgZmlsZXMgPSBbc2VsZi5wYXRoX3Rv X3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKV0KKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3 ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAgIGZpbGVzLmFwcGVuZChzZWxmLl9maWxl c3lzdGVtLmpvaW4oc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoc2VsZi5wb3J0X25hbWUgKyAn LXdrMicpLCAnVGVzdEV4cGVjdGF0aW9ucycpKQorICAgICAgICByZXR1cm4gZmlsZXMKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5p dHRlc3QucHkKaW5kZXggZTc1YWVlZmY3NzBhODdiZjFlNDI1NTQ5ZTQyM2RjOGIxMTk2MWIwMC4u OTZhYWRkYWE5NTg1NTcxNzRkZjY2MzRjZTMzM2FjMzY2NDhkYzRhMiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3Qu cHkKQEAgLTQ5LDYgKzQ5LDEwIEBAIGNsYXNzIE1hY1Rlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVz dENhc2UpOgogICAgICAgICBzdXBlcihNYWNUZXN0LCBzZWxmKS50ZXN0X2RlZmF1bHRfdGltZW91 dF9tcygpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYubWFrZV9wb3J0KG9wdGlvbnM9 TW9ja09wdGlvbnMoZ3VhcmRfbWFsbG9jPVRydWUpKS5kZWZhdWx0X3RpbWVvdXRfbXMoKSwgMzUw MDAwKQogCisgICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYpOgorICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhsZW4oc2VsZi5tYWtlX3BvcnQoKS5leHBlY3RhdGlvbnNfZmlsZXMo KSksIDEpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGxlbihzZWxmLm1ha2VfcG9ydChvcHRp b25zPU1vY2tPcHRpb25zKHdlYmtpdF90ZXN0X3J1bm5lcj1UcnVlKSkuZXhwZWN0YXRpb25zX2Zp bGVzKCkpLCAyKQorCiAgICAgZGVmIHRlc3Rfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocyhzZWxm KToKICAgICAgICAgIyBXZSBzaG91bGQgaGF2ZSB0d28gc2tpcHBlZCBmaWxlcyAtIHBsYXRmb3Jt K3ZlcnNpb24gYW5kIHBsYXRmb3JtOyBob3dldmVyLCB3ZSBkb24ndAogICAgICAgICAjIGhhdmUg cGxhdGZvcm0rdmVyc2lvbiBmb3IgZWl0aGVyIHRoZSBtb3N0IHJlY2VudCB2ZXJzaW9uIG9yIG1h Yy1mdXR1cmUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKaW5kZXggNDRiZjE2NzY4NDc2MTA3OThmYzYwMGI0 NDJmNjBjNzlkN2M3YTc5OC4uZTEyYjY4NzczYzJhMGVjNDRjMTA2OGI2NDVjYWEzMzFiNGFmNzBk NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9w b3J0X3Rlc3RjYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvcG9ydF90ZXN0Y2FzZS5weQpAQCAtMTA2LDYgKzEwNiw5IEBAIGNsYXNzIFBvcnRUZXN0 Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1mb289 YmFyJyBpbiBjbWRfbGluZSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCctLWZvbz1iYXonIGlu IGNtZF9saW5lKQogCisgICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYpOgorICAg ICAgICBzZWxmLmFzc2VydE5vdEVxdWFscyhzZWxmLm1ha2VfcG9ydCgpLmV4cGVjdGF0aW9uc19m aWxlcygpLCBbXSkKKwogICAgIGRlZiB0ZXN0X3VzZXNfYXBhY2hlKHNlbGYpOgogICAgICAgICBz ZWxmLmFzc2VydFRydWUoc2VsZi5tYWtlX3BvcnQoKS5fdXNlc19hcGFjaGUoKSkKIApkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRl c3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0 dGVzdC5weQppbmRleCBjNTExYzg3MmUyYjU4ODgxYTJmNmRkNWY4MjFkOTMxNDZmOGMyNzBkLi43 YzI1YjZlNGVjOTZhOWI0OGY3MDRlYWY2YzQ2N2Q5NzExNzc0ZWMwIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5w eQpAQCAtMTAzLDMgKzEwMyw3IEBAIGNsYXNzIFdpblBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9y dFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fcnVudGltZV9mZWF0 dXJlX2xpc3QoKSwgTm9uZSkKICAgICAgICAgcG9ydC5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kID0g bGFtYmRhIGNvbW1hbmQsIGN3ZD1Ob25lLCBlcnJvcl9oYW5kbGVyPU5vbmU6ICJTdXBwb3J0ZWRG ZWF0dXJlczpmb28gYmFyIgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9ydW50aW1l X2ZlYXR1cmVfbGlzdCgpLCBbJ2ZvbycsICdiYXInXSkKKworICAgIGRlZiB0ZXN0X2V4cGVjdGF0 aW9uc19maWxlcyhzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMobGVuKHNlbGYubWFr ZV9wb3J0KCkuZXhwZWN0YXRpb25zX2ZpbGVzKCkpLCAxKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhsZW4oc2VsZi5tYWtlX3BvcnQob3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9y dW5uZXI9VHJ1ZSkpLmV4cGVjdGF0aW9uc19maWxlcygpKSwgMikK