74281 2011-12-12 03:35:59 -0800 [Qt] Fix skip list search path and expected file search path in ORWT 2011-12-12 09:48:52 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kadam webkit-unassigned ossy webkit.review.bot oldest_to_newest 519106 0 kadam 2011-12-12 03:35:59 -0800 Expected file search path are incorrect and Qt version is not support in ORWT. (Qt 4.8, Qt 5.0) 519169 1 118781 kadam 2011-12-12 06:52:32 -0800 Created attachment 118781 proposed patch During searching the expected files' paths the general preference order on qt platform is: /(qt-mac/qt-win/qt-linux)/ , qt version /(qt-4.8/qt-5.0)/ , qt and generic by default. For example: qt-linux -> qt-5.0 -> qt -> generic If we call ORWT with -2 parameter the result is for example: qt-wk2 -> qt-linux -> qt-5.0 -> qt -> generic Now these things are similar to NRWT: * expected search path are correct * printing all used skipped list and expected search path in verbose mode. 519208 2 118781 ossy 2011-12-12 08:20:02 -0800 Comment on attachment 118781 proposed patch great work, r=me. 519284 3 118781 webkit.review.bot 2011-12-12 09:48:48 -0800 Comment on attachment 118781 proposed patch Clearing flags on attachment: 118781 Committed r102594: <http://trac.webkit.org/changeset/102594> 519285 4 webkit.review.bot 2011-12-12 09:48:52 -0800 All reviewed patches have been landed. Closing bug. 118781 2011-12-12 06:52:32 -0800 2011-12-12 09:48:48 -0800 proposed patch ORWT3.patch text/plain 4747 kadam ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiN2Q5 MjRiLi41ZDk3MDRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTItMTIgIMOBZMOhbSBLYWxsYWkgIDxLYWxs YWkuQWRhbUBzdHVkLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFtRdF0gRml4IHNraXAgbGlzdCBz ZWFyY2ggcGF0aCBhbmQgZXhwZWN0ZWQgZmlsZSBzZWFyY2ggcGF0aCBpbiBPUldUCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDI4MQorCisgICAgICAg IEV4cGVjdGVkIGZpbGUgc2VhcmNoIHBhdGggZml4ZWQuCisKKyAgICAgICAgUHJpbnQgYWxsIHVz ZWQgc2tpcHBlZCBsaXN0IGFuZCBleHBlY3RlZCBzZWFyY2ggcGF0aCBpbiB2ZXJib3NlIG1vZGUg c2ltaWxhciB0byBOUldULgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0czoKKyAgICAgICAgKGJ1aWxk UGxhdGZvcm1SZXN1bHRIaWVyYXJjaHkpOgorICAgICAgICAoYnVpbGRQbGF0Zm9ybVRlc3RIaWVy YXJjaHkpOgorICAgICAgICAocmVhZFNraXBwZWRGaWxlcyk6CisKIDIwMTEtMTItMDcgIFBldGVy IEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gRml4 IHByb2plY3QgZmlsZSBnZW5lcmF0aW9uIGZvciB0aGUgQW5kcm9pZCBib3QgYWZ0ZXIgcjEwMjIw MQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0cyBiL1Rvb2xz L1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKaW5kZXggNWQ1ZjBlZi4uNGQ4MTIzZCAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0cworKysgYi9Ub29scy9T Y3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCkBAIC0yMzIsMjEgKzIzMiw3IEBAIGlmIChpc0Fw cGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgJHBsYXRmb3JtID0gIm1hYyI7CiAgICAgfQogfSBl bHNpZiAoaXNRdCgpKSB7Ci0gICAgaWYgKGlzRGFyd2luKCkpIHsKLSAgICAgICAgJHBsYXRmb3Jt ID0gInF0LW1hYyI7Ci0gICAgfSBlbHNpZiAoaXNBUk0oKSkgewotICAgICAgICAkcGxhdGZvcm0g PSAicXQtYXJtIjsKLSAgICB9IGVsc2lmIChnZXRRdFZlcnNpb24oKSBlcSAiNC44IikgewotICAg ICAgICAkcGxhdGZvcm0gPSAicXQtNC44IjsKLSAgICB9IGVsc2lmIChnZXRRdFZlcnNpb24oKSBl cSAiNS4wIikgewotICAgICAgICAkcGxhdGZvcm0gPSAicXQtNS4wIjsKLSAgICB9IGVsc2lmIChp c0xpbnV4KCkpIHsKLSAgICAgICAgJHBsYXRmb3JtID0gInF0LWxpbnV4IjsKLSAgICB9IGVsc2lm IChpc1dpbmRvd3MoKSB8fCBpc0N5Z3dpbigpKSB7Ci0gICAgICAgICRwbGF0Zm9ybSA9ICJxdC13 aW4iOwotICAgIH0gZWxzZSB7Ci0gICAgICAgICRwbGF0Zm9ybSA9ICJxdCI7Ci0gICAgfQorICAg ICRwbGF0Zm9ybSA9ICJxdCI7CiB9IGVsc2lmIChpc0d0aygpKSB7CiAgICAgJHBsYXRmb3JtID0g Imd0ayI7CiB9IGVsc2lmIChpc1d4KCkpIHsKQEAgLTIxOTgsOCArMjE4NCwzMiBAQCBzdWIgYnVp bGRQbGF0Zm9ybVJlc3VsdEhpZXJhcmNoeSgpCiAgICAgICAgIGlmICgkcGxhdGZvcm0gZXEgIndp bmNhaXJvIikgewogICAgICAgICAgICAgQHBsYXRmb3JtcyA9ICRwbGF0Zm9ybTsKICAgICAgICAg fQotICAgIH0gZWxzaWYgKCRwbGF0Zm9ybSA9fiAvXnF0LS8pIHsKLSAgICAgICAgcHVzaCBAcGxh dGZvcm1zLCAkcGxhdGZvcm07CisgICAgfSBlbHNpZiAoJHBsYXRmb3JtID1+IC9ecXQvKSB7Cisg ICAgICAgIGlmICgkcGxhdGZvcm0gZXEgInF0LXdrMiIpIHsKKyAgICAgICAgICAgIHB1c2ggQHBs YXRmb3JtcywgJHBsYXRmb3JtOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGlzQVJNKCkgfHwg JHBsYXRmb3JtIGVxICJxdC1hcm0iKSB7CisgICAgICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICJx dC1hcm0iOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGlzRGFyd2luKCkgfHwgJHBsYXRmb3Jt IGVxICJxdC1tYWMiKSB7CisgICAgICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICJxdC1tYWMiOwor ICAgICAgICB9CisgICAgICAgIGVsc2lmIChpc1dpbmRvd3MoKSB8fCBpc0N5Z3dpbigpIHx8ICRw bGF0Zm9ybSBlcSAicXQtd2luIikgeworICAgICAgICAgICAgcHVzaCBAcGxhdGZvcm1zLCAicXQt d2luIjsKKyAgICAgICAgfQorICAgICAgICBlbHNpZiAoaXNMaW51eCgpIHx8ICRwbGF0Zm9ybSBl cSAicXQtbGludXgiKSB7CisgICAgICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICJxdC1saW51eCI7 CisgICAgICAgIH0KKworICAgICAgICBpZiAoZ2V0UXRWZXJzaW9uKCkgZXEgIjQuOCIgfHwgJHBs YXRmb3JtIGVxICJxdC00LjgiKSB7CisgICAgICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICJxdC00 LjgiOworICAgICAgICB9CisgICAgICAgIGVsc2lmIChnZXRRdFZlcnNpb24oKSBlcSAiNS4wIiB8 fCAkcGxhdGZvcm0gZXEgInF0LTUuMCIpIHsKKyAgICAgICAgICAgIHB1c2ggQHBsYXRmb3Jtcywg InF0LTUuMCI7CisgICAgICAgIH0KKwogICAgICAgICBwdXNoIEBwbGF0Zm9ybXMsICJxdCI7CiAg ICAgfSBlbHNpZiAoJHBsYXRmb3JtID1+IC9eZ3RrLS8pIHsKICAgICAgICAgcHVzaCBAcGxhdGZv cm1zLCAkcGxhdGZvcm07CkBAIC0yMjIzLDE4ICsyMjMzLDM0IEBAIHN1YiBidWlsZFBsYXRmb3Jt VGVzdEhpZXJhcmNoeShAKQogewogICAgIG15IChAcGxhdGZvcm1IaWVyYXJjaHkpID0gQF87CiAK LSAgICBteSAkd2syUGxhdGZvcm07Ci0gICAgZm9yIChteSAkaSA9IDA7ICRpIDwgQHBsYXRmb3Jt SGllcmFyY2h5OyArKyRpKSB7Ci0gICAgICAgIGlmICgkcGxhdGZvcm1IaWVyYXJjaHlbJGldID1+ IC8td2syLykgewotICAgICAgICAgICAgJHdrMlBsYXRmb3JtID0gc3BsaWNlIEBwbGF0Zm9ybUhp ZXJhcmNoeSwgJGksIDE7Ci0gICAgICAgICAgICBsYXN0OworICAgIG15IEByZXN1bHQ7CisgICAg aWYgKCRwbGF0Zm9ybSA9fiAvXnF0LykgeworICAgICAgICBmb3IgKG15ICRpID0gMDsgJGkgPCBA cGxhdGZvcm1IaWVyYXJjaHk7ICsrJGkpIHsKKyAgICAgICAgICAgcHVzaCBAcmVzdWx0LCAkcGxh dGZvcm1IaWVyYXJjaHlbJGldOworICAgICAgICB9CisgICAgfSBlbHNlIHsKKyAgICAgICAgbXkg JHdrMlBsYXRmb3JtOworICAgICAgICBmb3IgKG15ICRpID0gMDsgJGkgPCBAcGxhdGZvcm1IaWVy YXJjaHk7ICsrJGkpIHsKKyAgICAgICAgICAgIGlmICgkcGxhdGZvcm1IaWVyYXJjaHlbJGldID1+ IC8td2syLykgeworICAgICAgICAgICAgICAgICR3azJQbGF0Zm9ybSA9IHNwbGljZSBAcGxhdGZv cm1IaWVyYXJjaHksICRpLCAxOworICAgICAgICAgICAgICAgIGxhc3Q7CisgICAgICAgICAgICB9 CiAgICAgICAgIH0KKworICAgICAgIHB1c2ggQHJlc3VsdCwgJHBsYXRmb3JtSGllcmFyY2h5WzBd OworICAgICAgIHB1c2ggQHJlc3VsdCwgJHdrMlBsYXRmb3JtIGlmIGRlZmluZWQgJHdrMlBsYXRm b3JtOworICAgICAgIHB1c2ggQHJlc3VsdCwgJHBsYXRmb3JtSGllcmFyY2h5WyQjcGxhdGZvcm1I aWVyYXJjaHldIGlmIEBwbGF0Zm9ybUhpZXJhcmNoeSA+PSAyOwogICAgIH0KIAotICAgIG15IEBy ZXN1bHQ7Ci0gICAgcHVzaCBAcmVzdWx0LCAkcGxhdGZvcm1IaWVyYXJjaHlbMF07Ci0gICAgcHVz aCBAcmVzdWx0LCAkd2syUGxhdGZvcm0gaWYgZGVmaW5lZCAkd2syUGxhdGZvcm07Ci0gICAgcHVz aCBAcmVzdWx0LCAkcGxhdGZvcm1IaWVyYXJjaHlbJCNwbGF0Zm9ybUhpZXJhcmNoeV0gaWYgQHBs YXRmb3JtSGllcmFyY2h5ID49IDI7CisgICAgaWYgKCR2ZXJib3NlKSB7CisgICAgICAgIG15IEBz ZWFyY2hQYXRoczsKKyAgICAgICAgZm9yZWFjaCBteSAkc2VhcmNoUGF0aCAoQHJlc3VsdCkgewor ICAgICAgICAgICAgbXkgKCRkaXIsICRuYW1lKSA9IHNwbGl0cGF0aCgkc2VhcmNoUGF0aCk7Cisg ICAgICAgICAgICBwdXNoIEBzZWFyY2hQYXRocywgJG5hbWU7CisgICAgICAgIH0KKyAgICAgICAg bXkgJHNlYXJjaFBhdGhIaWVyYXJjaHkgPSBqb2luKCcgLT4gJywgQHNlYXJjaFBhdGhzKTsKKyAg ICAgICAgcHJpbnQgIkJhc2VsaW5lIHNlYXJjaCBwYXRoOiAkc2VhcmNoUGF0aEhpZXJhcmNoeVxu IjsKKyAgICB9CiAKICAgICByZXR1cm4gQHJlc3VsdDsKIH0KQEAgLTI0OTIsNiArMjUxOCwxMiBA QCBzdWIgcmVhZFNraXBwZWRGaWxlcygkKQogICAgICMgQWRkIFF0IFdLMS1vbmx5IHNraXBwZWQg dGVzdHMuCiAgICAgcHVzaChAc2tpcHBlZEZpbGVEaXJlY3RvcmllcywgY2F0ZGlyKCRwbGF0Zm9y bUJhc2VEaXJlY3RvcnksICJxdC13azEiKSkgaWYgKGlzUXQoKSAmJiAhJHVzZVdlYktpdFRlc3RS dW5uZXIpOwogCisgICAgaWYgKCR2ZXJib3NlKSB7CisgICAgICAgIGZvcmVhY2ggbXkgJHNraXBw ZWRQYXRoIChAc2tpcHBlZEZpbGVEaXJlY3RvcmllcykgeworICAgICAgICAgICAgcHJpbnQgIlVz aW5nIFNraXBwZWQgZmlsZTogJHNraXBwZWRQYXRoXG4iOworICAgICAgICB9CisgICAgfQorCiAg ICAgZm9yZWFjaCBteSAkbGV2ZWwgKEBza2lwcGVkRmlsZURpcmVjdG9yaWVzKSB7CiAgICAgICAg IGlmIChvcGVuIFNLSVBQRUQsICI8IiwgIiRsZXZlbC9Ta2lwcGVkIikgewogICAgICAgICAgICAg aWYgKCR2ZXJib3NlKSB7Cg==