87376 2012-05-24 05:17:34 -0700 [Qt] NRWT and ORWT checks only for Skipped in platform/qt-5.0-wk1 2012-05-29 23:38:40 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbadics webkit-unassigned abarth dpranke jbadics ojan ossy webkit.review.bot oldest_to_newest 632643 0 jbadics 2012-05-24 05:17:34 -0700 Running NRWT or ORWT with --platform qt[+ suffixes] uses a set of baseline search paths for expectations where qt-5.0-wk1 is not included. When run with qt5.0, it should be included to handle qt-5.0 + WebKit1 specific expectations. 632667 1 143798 jbadics 2012-05-24 05:42:33 -0700 Created attachment 143798 proposed patch 632678 2 143798 ossy 2012-05-24 05:49:32 -0700 Comment on attachment 143798 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=143798&action=review Please add/check unit test for the NRWT change. > Tools/ChangeLog:7 > + Reviewed by Csaba Osztrogonác. It isn't true now. :) > Tools/Scripts/old-run-webkit-tests:2168 > + if ($platform eq "qt-5.0-wk1" || $platform eq "qt-5.0" || ($platform eq "qt" && getQtVersion() eq "5.0")) { > + push @platforms, "qt-5.0-wk1"; > + } > + It's strange for me a little bit ... I should check this part of the code. 632737 3 143822 jbadics 2012-05-24 06:58:25 -0700 Created attachment 143822 proposed patch - Added unittest to the modifications of qt.py - Made baseline path determining more simple on orwt - Corrected changelog 632743 4 143823 jbadics 2012-05-24 07:02:52 -0700 Created attachment 143823 proposed patch see above (the previous patch contained trailing whitespace) 632775 5 143823 ossy 2012-05-24 07:31:04 -0700 Comment on attachment 143823 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=143823&action=review Could you check if my suggestions are correct? > Tools/Scripts/old-run-webkit-tests:2166 > if ($platform eq "qt-5.0-wk2") { > push @platforms, $platform; > } > + elsif (getQtVersion() eq "5.0") { > + push @platforms, "qt-5.0-wk1" > + } It isn't the best solution ... We don't want to use qt-5.0-wk1 Skipped list for Qt 4.8. What do you think about this one? if ($platform eq "qt-5.0-wk2" || getQtVersion() eq "5.0" && $useWebKitTestRunner) { push @platforms, "qt-5.0-wk2"; } elsif ($platform eq "qt-5.0-wk1" || getQtVersion() eq "5.0" && !$useWebKitTestRunner) { push @platforms, "qt-5.0-wk1" } > Tools/Scripts/webkitpy/layout_tests/port/qt.py:118 > if self.get_option('webkit_test_runner'): > search_paths.append(self._wk2_port_name()) > + elif '5.0' in version: > + search_paths.append('qt-5.0-wk1') It isn't so nice ... What do you think about this one? if '5.0' in version: if self.get_option('webkit_test_runner'): search_paths.append('qt-5.0-wk2') else: search_paths.append('qt-5.0-wk1') 633799 6 144034 jbadics 2012-05-25 03:36:21 -0700 Created attachment 144034 proposed patch Modified previous patch based on suggestions of Csaba Osztrogonác. 634149 7 144034 dpranke 2012-05-25 11:57:51 -0700 Comment on attachment 144034 proposed patch patch looks fine to me but one of the Qt folks might want to give the final approval. 636920 8 144034 ossy 2012-05-29 23:37:18 -0700 Comment on attachment 144034 proposed patch r=me 636922 9 ossy 2012-05-29 23:38:23 -0700 Landed in http://trac.webkit.org/changeset/118898 143798 2012-05-24 05:42:33 -0700 2012-05-24 06:58:25 -0700 proposed patch qt-5.0-wk1_blsp_1.patch text/plain 2106 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzY2Yz ZjkwLi44ZjY5NjVjOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA1LTI0ICBKw6Fub3MgQmFkaWNzICA8amJh ZGljc0BpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgW1F0XSBNb2RpZmllZCBPUldUIGFuZCBO UldUIHRvIGNoZWNrIGZvciB0ZXN0IGV4cGVjdGF0aW9ucyBpbiBwbGF0Zm9ybS9xdC01LjAtd2sx IHRvbworICAgICAgICAoVGhleSBvbmx5IHVzZWQgdG8gY2hlY2sgZm9yIFNraXBwZWQgaW4gcGxh dGZvcm0vcXQtNS4wLXdrMSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg3Mzc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6Fj LgorCisgICAgICAgICogU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0czoKKyAgICAgICAgKGJ1 aWxkUGxhdGZvcm1SZXN1bHRIaWVyYXJjaHkpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvcXQucHk6CisgICAgICAgIChRdFBvcnQuYmFzZWxpbmVfc2VhcmNo X3BhdGgpOgorCiAyMDEyLTA1LTIyICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAog ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9tb2RfcHl3ZWJzb2NrZXQ6IEFk ZGVkIHByb3BlcnR5IHN2bjppZ25vcmUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL29sZC1y dW4td2Via2l0LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0cwppbmRl eCA1YjMwOGFiLi44ZWI4ZWNkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Vi a2l0LXRlc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKQEAgLTIx NjIsNiArMjE2MiwxMCBAQCBzdWIgYnVpbGRQbGF0Zm9ybVJlc3VsdEhpZXJhcmNoeSgpCiAgICAg ICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICRwbGF0Zm9ybTsKICAgICAgICAgfQogCisgICAgICAg IGlmICgkcGxhdGZvcm0gZXEgInF0LTUuMC13azEiIHx8ICRwbGF0Zm9ybSBlcSAicXQtNS4wIiB8 fCAoJHBsYXRmb3JtIGVxICJxdCIgJiYgZ2V0UXRWZXJzaW9uKCkgZXEgIjUuMCIpKSB7CisgICAg ICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICJxdC01LjAtd2sxIjsKKyAgICAgICAgfQorCiAgICAg ICAgIGlmIChpc0FSTSgpIHx8ICRwbGF0Zm9ybSBlcSAicXQtYXJtIikgewogICAgICAgICAgICAg cHVzaCBAcGxhdGZvcm1zLCAicXQtYXJtIjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggZGU5M2JmNC4uYWZiMjVlMyAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBA IC0xMTEsMTAgKzExMSwxMiBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAKICAgICBkZWYg YmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CiAgICAgICAgIHNlYXJjaF9wYXRocyA9IFtdCisg ICAgICAgIHZlcnNpb24gPSBzZWxmLnF0X3ZlcnNpb24oKQogICAgICAgICBpZiBzZWxmLmdldF9v cHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgogICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFw cGVuZChzZWxmLl93azJfcG9ydF9uYW1lKCkpCisgICAgICAgIGVsaWYgJzUuMCcgaW4gdmVyc2lv bjoKKyAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTUuMC13azEnKQogICAgICAg ICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYubmFtZSgpKQotICAgICAgICB2ZXJzaW9uID0gc2Vs Zi5xdF92ZXJzaW9uKCkKICAgICAgICAgaWYgJzQuOCcgaW4gdmVyc2lvbjoKICAgICAgICAgICAg IHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTQuOCcpCiAgICAgICAgIGVsaWYgdmVyc2lvbjoK 143822 2012-05-24 06:58:25 -0700 2012-05-24 07:00:28 -0700 proposed patch qt-5.0-wk1_blsp_2.patch text/plain 3214 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzY2Yz ZjkwLi5jMzZjZDU5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMjQgIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBbUXRdIE1vZGlmaWVkIE9SV1QgYW5kIE5S V1QgdG8gY2hlY2sgZm9yIHRlc3QgZXhwZWN0YXRpb25zIGluIHBsYXRmb3JtL3F0LTUuMC13azEg dG9vCisgICAgICAgIChUaGV5IG9ubHkgdXNlZCB0byBjaGVjayBmb3IgU2tpcHBlZCBpbiBwbGF0 Zm9ybS9xdC01LjAtd2sxKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODczNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHM6CisgICAgICAgIChidWlsZFBs YXRmb3JtUmVzdWx0SGllcmFyY2h5KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRo KToKKwogMjAxMi0wNS0yMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvbW9kX3B5d2Vic29ja2V0OiBBZGRlZCBw cm9wZXJ0eSBzdm46aWdub3JlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdl YmtpdC10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKaW5kZXggNWIz MDhhYi4uN2ZhMmM3NSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10 ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCkBAIC0yMTYxLDYg KzIxNjEsOSBAQCBzdWIgYnVpbGRQbGF0Zm9ybVJlc3VsdEhpZXJhcmNoeSgpCiAgICAgICAgIGlm ICgkcGxhdGZvcm0gZXEgInF0LTUuMC13azIiKSB7CiAgICAgICAgICAgICBwdXNoIEBwbGF0Zm9y bXMsICRwbGF0Zm9ybTsKICAgICAgICAgfQorICAgICAgICBlbHNpZiAoZ2V0UXRWZXJzaW9uKCkg ZXEgIjUuMCIpIHsKKyAgICAgICAgICAgIHB1c2ggQHBsYXRmb3JtcywgInF0LTUuMC13azEiCisg ICAgICAgIH0KIAogICAgICAgICBpZiAoaXNBUk0oKSB8fCAkcGxhdGZvcm0gZXEgInF0LWFybSIp IHsKICAgICAgICAgICAgIHB1c2ggQHBsYXRmb3JtcywgInF0LWFybSI7CmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQppbmRleCBkZTkzYmY0Li5hZmIy NWUzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L3F0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQu cHkKQEAgLTExMSwxMCArMTExLDEyIEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToKIAogICAg IGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgc2VhcmNoX3BhdGhzID0g W10KKyAgICAgICAgdmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCiAgICAgICAgIGlmIHNlbGYu Z2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CiAgICAgICAgICAgICBzZWFyY2hfcGF0 aHMuYXBwZW5kKHNlbGYuX3drMl9wb3J0X25hbWUoKSkKKyAgICAgICAgZWxpZiAnNS4wJyBpbiB2 ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4wLXdrMScpCiAg ICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5uYW1lKCkpCi0gICAgICAgIHZlcnNpb24g PSBzZWxmLnF0X3ZlcnNpb24oKQogICAgICAgICBpZiAnNC44JyBpbiB2ZXJzaW9uOgogICAgICAg ICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNC44JykKICAgICAgICAgZWxpZiB2ZXJzaW9u OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9x dF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXRfdW5pdHRlc3QucHkKaW5kZXggMGNjNjk0Ny4uMWQ4NjExZSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CkBA IC03MSw2ICs3MSwxMCBAQCBjbGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RD YXNlKToKICAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdx dC1tYWMnLCAncXQtNS4wJywgJ3F0J10sICdtYWMnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJz aW9uPSc1LjAnKQogICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sy JywgJ3F0LXdpbicsICdxdC01LjAnLCAncXQnXSwgJ3dpbicsIHVzZV93ZWJraXQyPVRydWUsIHF0 X3ZlcnNpb249JzUuMCcpCiAgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUu MC13azInLCAncXQtbGludXgnLCAncXQtNS4wJywgJ3F0J10sICdsaW51eCcsIHVzZV93ZWJraXQy PVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIAorICAgICAgICBzZWxmLl9hc3NlcnRf c2VhcmNoX3BhdGgoWydxdC01LjAtd2sxJywgJ3F0LW1hYycsICdxdC01LjAnLCAncXQnXSwgJ21h YycsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9h c3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sxJywgJ3F0LXdpbicsICdxdC01LjAnLCAncXQn XSwgJ3dpbicsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBz ZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sxJywgJ3F0LWxpbnV4JywgJ3F0LTUu MCcsICdxdCddLCAnbGludXgnLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4wJykK IAogICAgIGRlZiB0ZXN0X3Nob3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZik6CiAgICAgICAgIHBv cnQgPSBzZWxmLm1ha2VfcG9ydCgpCg== 143823 2012-05-24 07:02:52 -0700 2012-05-25 03:36:21 -0700 proposed patch qt-5.0-wk1_blsp_2.patch text/plain 3145 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzY2Yz ZjkwLi5jMzZjZDU5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMjQgIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBbUXRdIE1vZGlmaWVkIE9SV1QgYW5kIE5S V1QgdG8gY2hlY2sgZm9yIHRlc3QgZXhwZWN0YXRpb25zIGluIHBsYXRmb3JtL3F0LTUuMC13azEg dG9vCisgICAgICAgIChUaGV5IG9ubHkgdXNlZCB0byBjaGVjayBmb3IgU2tpcHBlZCBpbiBwbGF0 Zm9ybS9xdC01LjAtd2sxKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODczNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHM6CisgICAgICAgIChidWlsZFBs YXRmb3JtUmVzdWx0SGllcmFyY2h5KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRo KToKKwogMjAxMi0wNS0yMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvbW9kX3B5d2Vic29ja2V0OiBBZGRlZCBw cm9wZXJ0eSBzdm46aWdub3JlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdl YmtpdC10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKaW5kZXggNWIz MDhhYi4uN2ZhMmM3NSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10 ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCkBAIC0yMTYxLDYg KzIxNjEsOSBAQCBzdWIgYnVpbGRQbGF0Zm9ybVJlc3VsdEhpZXJhcmNoeSgpCiAgICAgICAgIGlm ICgkcGxhdGZvcm0gZXEgInF0LTUuMC13azIiKSB7CiAgICAgICAgICAgICBwdXNoIEBwbGF0Zm9y bXMsICRwbGF0Zm9ybTsKICAgICAgICAgfQorICAgICAgICBlbHNpZiAoZ2V0UXRWZXJzaW9uKCkg ZXEgIjUuMCIpIHsKKyAgICAgICAgICAgIHB1c2ggQHBsYXRmb3JtcywgInF0LTUuMC13azEiCisg ICAgICAgIH0KIAogICAgICAgICBpZiAoaXNBUk0oKSB8fCAkcGxhdGZvcm0gZXEgInF0LWFybSIp IHsKICAgICAgICAgICAgIHB1c2ggQHBsYXRmb3JtcywgInF0LWFybSI7CmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQppbmRleCBkZTkzYmY0Li5hZmIy NWUzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L3F0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQu cHkKQEAgLTExMSwxMCArMTExLDEyIEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToKIAogICAg IGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgc2VhcmNoX3BhdGhzID0g W10KKyAgICAgICAgdmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCiAgICAgICAgIGlmIHNlbGYu Z2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CiAgICAgICAgICAgICBzZWFyY2hfcGF0 aHMuYXBwZW5kKHNlbGYuX3drMl9wb3J0X25hbWUoKSkKKyAgICAgICAgZWxpZiAnNS4wJyBpbiB2 ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4wLXdrMScpCiAg ICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5uYW1lKCkpCi0gICAgICAgIHZlcnNpb24g PSBzZWxmLnF0X3ZlcnNpb24oKQogICAgICAgICBpZiAnNC44JyBpbiB2ZXJzaW9uOgogICAgICAg ICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNC44JykKICAgICAgICAgZWxpZiB2ZXJzaW9u OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9x dF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXRfdW5pdHRlc3QucHkKaW5kZXggMGNjNjk0Ny4uNzI1MmI5OCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CkBA IC03Miw2ICs3MiwxMCBAQCBjbGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RD YXNlKToKICAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdx dC13aW4nLCAncXQtNS4wJywgJ3F0J10sICd3aW4nLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJz aW9uPSc1LjAnKQogICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sy JywgJ3F0LWxpbnV4JywgJ3F0LTUuMCcsICdxdCddLCAnbGludXgnLCB1c2Vfd2Via2l0Mj1UcnVl LCBxdF92ZXJzaW9uPSc1LjAnKQogCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J3F0LTUuMC13azEnLCAncXQtbWFjJywgJ3F0LTUuMCcsICdxdCddLCAnbWFjJywgdXNlX3dlYmtp dDI9RmFsc2UsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hf cGF0aChbJ3F0LTUuMC13azEnLCAncXQtd2luJywgJ3F0LTUuMCcsICdxdCddLCAnd2luJywgdXNl X3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aChbJ3F0LTUuMC13azEnLCAncXQtbGludXgnLCAncXQtNS4wJywgJ3F0J10sICds aW51eCcsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnKQorCiAgICAgZGVmIHRl c3Rfc2hvd19yZXN1bHRzX2h0bWxfZmlsZShzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFr ZV9wb3J0KCkKICAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZShzaG91bGRf bG9nPVRydWUpCg== 144034 2012-05-25 03:36:21 -0700 2012-05-29 23:38:40 -0700 proposed patch qt-5.0-wk1_blsp_3.patch text/plain 3513 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzY2Yz ZjkwLi5jMzZjZDU5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMjQgIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBbUXRdIE1vZGlmaWVkIE9SV1QgYW5kIE5S V1QgdG8gY2hlY2sgZm9yIHRlc3QgZXhwZWN0YXRpb25zIGluIHBsYXRmb3JtL3F0LTUuMC13azEg dG9vCisgICAgICAgIChUaGV5IG9ubHkgdXNlZCB0byBjaGVjayBmb3IgU2tpcHBlZCBpbiBwbGF0 Zm9ybS9xdC01LjAtd2sxKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODczNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHM6CisgICAgICAgIChidWlsZFBs YXRmb3JtUmVzdWx0SGllcmFyY2h5KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRo KToKKwogMjAxMi0wNS0yMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvbW9kX3B5d2Vic29ja2V0OiBBZGRlZCBw cm9wZXJ0eSBzdm46aWdub3JlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdl YmtpdC10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKaW5kZXggNWIz MDhhYi4uMTU0Y2Y0NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10 ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCkBAIC0yMTU4LDgg KzIxNTgsMTEgQEAgc3ViIGJ1aWxkUGxhdGZvcm1SZXN1bHRIaWVyYXJjaHkoKQogICAgICAgICAg ICAgQHBsYXRmb3JtcyA9ICRwbGF0Zm9ybTsKICAgICAgICAgfQogICAgIH0gZWxzaWYgKCRwbGF0 Zm9ybSA9fiAvXnF0LykgewotICAgICAgICBpZiAoJHBsYXRmb3JtIGVxICJxdC01LjAtd2syIikg ewotICAgICAgICAgICAgcHVzaCBAcGxhdGZvcm1zLCAkcGxhdGZvcm07CisgICAgICAgIGlmICgk cGxhdGZvcm0gZXEgInF0LTUuMC13azIiIHx8IGdldFF0VmVyc2lvbigpIGVxICI1LjAiICYmICR1 c2VXZWJLaXRUZXN0UnVubmVyKSB7CisgICAgICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICJxdC01 LjAtd2syIjsKKyAgICAgICAgfQorICAgICAgICBlbHNpZiAoJHBsYXRmb3JtIGVxICJxdC01LjAt d2sxIiB8fCBnZXRRdFZlcnNpb24oKSBlcSAiNS4wIiAmJiAhJHVzZVdlYktpdFRlc3RSdW5uZXIp IHsKKyAgICAgICAgICAgIHB1c2ggQHBsYXRmb3JtcywgInF0LTUuMC13azEiCiAgICAgICAgIH0K IAogICAgICAgICBpZiAoaXNBUk0oKSB8fCAkcGxhdGZvcm0gZXEgInF0LWFybSIpIHsKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CmluZGV4IGRlOTNi ZjQuLjUyMDU3NTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvcXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9xdC5weQpAQCAtMTExLDEwICsxMTEsMTMgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQp OgogCiAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICBzZWFyY2hf cGF0aHMgPSBbXQotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5l cicpOgotICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLl93azJfcG9ydF9uYW1l KCkpCi0gICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5uYW1lKCkpCiAgICAgICAgIHZl cnNpb24gPSBzZWxmLnF0X3ZlcnNpb24oKQorICAgICAgICBpZiAnNS4wJyBpbiB2ZXJzaW9uOgor ICAgICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAg ICAgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC01LjAtd2syJykKKyAgICAgICAg ICAgIGVsc2U6CisgICAgICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4wLXdr MScpCisgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5uYW1lKCkpCiAgICAgICAgIGlm ICc0LjgnIGluIHZlcnNpb246CiAgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC00 LjgnKQogICAgICAgICBlbGlmIHZlcnNpb246CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQppbmRleCAwY2M2OTQ3Li43 MjUyYjk4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKQEAgLTcyLDYgKzcyLDEwIEBAIGNsYXNzIFF0UG9ydFRl c3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICBzZWxmLl9hc3NlcnRfc2Vh cmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0LXdpbicsICdxdC01LjAnLCAncXQnXSwgJ3dpbics IHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCiAgICAgICAgIHNlbGYuX2Fzc2Vy dF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azInLCAncXQtbGludXgnLCAncXQtNS4wJywgJ3F0J10s ICdsaW51eCcsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCiAKKyAgICAgICAg c2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC1tYWMnLCAncXQtNS4w JywgJ3F0J10sICdtYWMnLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAg ICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC13aW4nLCAn cXQtNS4wJywgJ3F0J10sICd3aW4nLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4w JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC1s aW51eCcsICdxdC01LjAnLCAncXQnXSwgJ2xpbnV4JywgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3Zl cnNpb249JzUuMCcpCisKICAgICBkZWYgdGVzdF9zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYp OgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQogICAgICAgICBwb3J0Ll9leGVjdXRp dmUgPSBNb2NrRXhlY3V0aXZlKHNob3VsZF9sb2c9VHJ1ZSkK