90555 2012-07-04 08:08:24 -0700 [NRWT] Compare results between different platforms 2012-08-14 01:48:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED NRWT P2 Normal --- 92122 64491 1 kkristof kkristof abarth bank dpranke kadam kkristof ojan ossy webkit.review.bot oldest_to_newest 662958 0 kkristof 2012-07-04 08:08:24 -0700 It would be useful for gardening if we could compare our results to different ports. Now we use the orwt for this because the port detection is very simple: e.g. if we pass --platform mac this will set the baselines for the mac port and run the tests with the already built drt. 666964 1 dpranke 2012-07-11 12:47:46 -0700 I'm not sure I understand what you're asking for. Do you want to be able to run the Qt port's binary and compare against the apple mac baselines? Or something else? 667399 2 ossy 2012-07-11 22:24:12 -0700 (In reply to comment #1) > I'm not sure I understand what you're asking for. Do you want to be able to run the Qt port's binary and compare against the apple mac baselines? Or something else? Exactly. Comparing our results for to Mac/GTK/Chromium can be useful. For example for new tests, tests were skipped long time, when results changed at night and other ports updated their results before we get up :), ... We usually do it with ORWT long time ago and it is really useful. ;-) Kristóf, as far as I know, you started working on this bug. Could you submit a preliminary patch? 668170 3 152048 kkristof 2012-07-12 13:46:22 -0700 Created attachment 152048 work in progress Yes, as Ossy said we would like to test with our binary and use the other ports baselines for check the results. I think the baselineoptimizer give the most general approach because it knows almost every ports baseline paths. 668225 4 152048 dpranke 2012-07-12 14:34:59 -0700 Comment on attachment 152048 work in progress Okay, if this feature is useful to you I have no argument against it (although I wonder if it would be better to have a separate tool that compared the results, or integrated this into results.html or something). A few comments on the approach, though. View in context: https://bugs.webkit.org/attachment.cgi?id=152048&action=review > Tools/Scripts/webkitpy/layout_tests/port/base.py:366 > + baseline_search_path = self.get_option('additional_platform_directory', []) + compare_baseline(self) + self.baseline_search_path() 1) It's a bug that we are creating a "baseline_search_path" different from what baseline_search_path() actually returns. There's two different uses of the baseline path here ... the one the port wants, and the one the user wants, which is the port's path + --additional-platform-directory + (now) --compare-port's path. We should rename baseline_search_path (the port's version) to default_baseline_search_path(), and move this line into baseline_search_path(). That way callers get a single consistent view. 2) I don't think going through baseline optimizer buys you anything. You should be able to call host.port_factory.get(self.get_option('compare_port')).default_baseline_search_path() to get the same result, without the dependency, except ... 3) Port isn't allowed to depend on Host, just SystemHost, so you can't assume that host.port_factory exists. You need to create a PortFactory() and pass it the host. This should work in most (if not all) cases, but could cause weirdness if a caller is using a custom/mocked port factory object. > Tools/Scripts/webkitpy/layout_tests/port/compare.py:1 > +# Copyright (C) 2010 Google Inc. All rights reserved. This copyright claim is probably wrong :). > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:327 > + help="Compare the results with the specified port."), I'm not sure about the command line flag name here, but I haven't thought of anything that is grammatically much better. I might at least change the help text to "Use the specified port's baselines first". 683074 5 155539 kkristof 2012-07-31 08:01:08 -0700 Created attachment 155539 proposed fix 690919 6 155539 dpranke 2012-08-08 16:46:37 -0700 Comment on attachment 155539 proposed fix sorry, this must've slipped through the cracks ... can you just add compare_baseline() into the Port class? I can't see an advantage to having another file for one 6-line function :) Looks fine otherwise. 692508 7 157721 kkristof 2012-08-10 06:02:40 -0700 Created attachment 157721 proposed fix 692727 8 157721 dpranke 2012-08-10 11:35:18 -0700 Comment on attachment 157721 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=157721&action=review looks great! thanks! > Tools/Scripts/webkitpy/layout_tests/port/base.py:216 > + def compare_baseline(self): minor nit: I might name this _compare_baseline() since I don't want this to be public ... 694676 9 kkristof 2012-08-14 01:48:55 -0700 Committed r125524: <http://trac.webkit.org/changeset/125524> 152048 2012-07-12 13:46:22 -0700 2012-07-31 08:01:08 -0700 work in progress compare.diff text/plain 4591 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFz ZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpp bmRleCBmYmYwYjkzLi45NTgyYjVhIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC01NSw2ICs1NSw3IEBAIGZyb20gd2Via2l0cHku bGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RDb25maWd1 cmF0aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBjb25maWcgYXMg cG9ydF9jb25maWcKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGRyaXZl cgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgaHR0cF9sb2NrCitmcm9t IHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0LmNvbXBhcmUgaW1wb3J0IGNvbXBhcmVfYmFzZWxp bmUKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnNlcnZlcnMgaW1wb3J0IGFwYWNoZV9odHRw X3NlcnZlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuc2VydmVycyBpbXBvcnQgaHR0cF9z ZXJ2ZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnNlcnZlcnMgaW1wb3J0IHdlYnNvY2tl dF9zZXJ2ZXIKQEAgLTM2Miw3ICszNjMsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAg IHBsYXRmb3JtIHNwZWNpZmljLgogICAgICAgICAiIiIKICAgICAgICAgYmFzZWxpbmVfZmlsZW5h bWUgPSBzZWxmLl9maWxlc3lzdGVtLnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0gKyAnLWV4cGVjdGVk JyArIHN1ZmZpeAotICAgICAgICBiYXNlbGluZV9zZWFyY2hfcGF0aCA9IHNlbGYuZ2V0X29wdGlv bignYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3RvcnknLCBbXSkgKyBzZWxmLmJhc2VsaW5lX3Nl YXJjaF9wYXRoKCkKKyAgICAgICAgYmFzZWxpbmVfc2VhcmNoX3BhdGggPSBzZWxmLmdldF9vcHRp b24oJ2FkZGl0aW9uYWxfcGxhdGZvcm1fZGlyZWN0b3J5JywgW10pICsgY29tcGFyZV9iYXNlbGlu ZShzZWxmKSArIHNlbGYuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQogCiAgICAgICAgIGJhc2VsaW5l cyA9IFtdCiAgICAgICAgIGZvciBwbGF0Zm9ybV9kaXIgaW4gYmFzZWxpbmVfc2VhcmNoX3BhdGg6 CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nv bXBhcmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbXBh cmUucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWU2OGYxNAotLS0gL2Rl di9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29t cGFyZS5weQpAQCAtMCwwICsxLDQ2IEBACisjIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQor IyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAgICogUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy CisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAgKiBOZWl0aGVyIHRoZSBHb29nbGUgbmFt ZSBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5k b3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdp dGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JT CisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUg RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBD T05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBsb2dnaW5nCitpbXBv cnQgcmUKKworZnJvbSB3ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCitm cm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5iYXNlbGluZW9wdGltaXplciBpbXBvcnQgX2Jh c2VsaW5lX3NlYXJjaF9oeXBlcmdyYXBoCisKK19sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25h bWVfXykKKworQG1lbW9pemVkCitkZWYgY29tcGFyZV9iYXNlbGluZShwb3J0KToKKyAgICBpZiBu b3QgcG9ydC5nZXRfb3B0aW9uKCdjb21wYXJlX3BvcnQnKToKKyAgICAgICAgcmV0dXJuIFtdCisg ICAgaHlwZXJncmFwaCA9IF9iYXNlbGluZV9zZWFyY2hfaHlwZXJncmFwaChwb3J0Lmhvc3QpCisg ICAgZm9yIGtleSBpbiBoeXBlcmdyYXBoLmtleXMoKToKKyAgICAgICAgaWYgcmUubWF0Y2gocG9y dC5nZXRfb3B0aW9uKCdjb21wYXJlX3BvcnQnKSwga2V5KToKKyAgICAgICAgICAgIHJldHVybiBt YXAocG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIGh5cGVyZ3JhcGhba2V5XSkKKyAgICBfbG9n LmVycm9yKCdOb3QgZm91bmQgdGhlIHBvcnQnKQorICAgIHJldHVybiBbXQpcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IGUzYTEzYzIuLjRmOWMyOWYgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weQpAQCAtMzIzLDYgKzMyMyw4IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9uZSk6 CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWFkZGl0aW9uYWwtZXhwZWN0YXRpb25z IiwgYWN0aW9uPSJhcHBlbmQiLCBkZWZhdWx0PVtdLAogICAgICAgICAgICAgaGVscD0iUGF0aCB0 byBhIHRlc3RfZXhwZWN0YXRpb25zIGZpbGUgdGhhdCB3aWxsIG92ZXJyaWRlIHByZXZpb3VzIGV4 cGVjdGF0aW9ucy4gIgogICAgICAgICAgICAgICAgICAiU3BlY2lmeSBtdWx0aXBsZSB0aW1lcyBm b3IgbXVsdGlwbGUgc2V0cyBvZiBvdmVycmlkZXMuIiksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vf b3B0aW9uKCItLWNvbXBhcmUtcG9ydCIsIGFjdGlvbj0ic3RvcmUiLCBkZWZhdWx0PU5vbmUsCisg ICAgICAgICAgICBoZWxwPSJDb21wYXJlIHRoZSByZXN1bHRzIHdpdGggdGhlIHNwZWNpZmllZCBw b3J0LiIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1zaG93LXJlc3VsdHMi LCBhY3Rpb249InN0b3JlX2ZhbHNlIiwKICAgICAgICAgICAgIGRlZmF1bHQ9VHJ1ZSwgZGVzdD0i c2hvd19yZXN1bHRzIiwKICAgICAgICAgICAgIGhlbHA9IkRvbid0IGxhdW5jaCBhIGJyb3dzZXIg d2l0aCByZXN1bHRzIGFmdGVyIHRoZSB0ZXN0cyAiCg== 155539 2012-07-31 08:01:08 -0700 2012-08-10 06:02:40 -0700 proposed fix compare.patch text/plain 5053 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZWFl ZDc1Li43M2Y2ZGM2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMzEgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFtOUldUXSBDb21wYXJlIHJlc3Vs dHMgYmV0d2VlbiBkaWZmZXJlbnQgcGxhdGZvcm1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDU1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb21wYXJlLnB5OiBBZGRlZC4K KyAgICAgICAgKGNvbXBhcmVfYmFzZWxpbmUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgIChwYXJzZV9hcmdzKToK KwogMjAxMi0wNy0zMSAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBbY2hyb21pdW1dIG1vdmUgRXZlbnRTZW5kZXIgaW50byBUZXN0UnVubmVyLmEKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRl eCBhZDcwZjA0Li45MTgxZThlIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC01Niw2ICs1Niw3IEBAIGZyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uc3lzdGVtaG9zdCBpbXBvcnQgU3lzdGVtSG9zdAogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfY29uZmlndXJhdGlvbiBpbXBvcnQgVGVzdENvbmZpZ3Vy YXRpb24KIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGNvbmZpZyBhcyBw b3J0X2NvbmZpZworZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5jb21wYXJlIGltcG9y dCBjb21wYXJlX2Jhc2VsaW5lCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9y dCBkcml2ZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGh0dHBfbG9j awogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgaW1hZ2VfZGlmZgpAQCAt MTkwLDcgKzE5MSw3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogCiAgICAgZGVmIGJhc2VsaW5l X3NlYXJjaF9wYXRoKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5nZXRfb3B0aW9uKCdhZGRp dGlvbmFsX3BsYXRmb3JtX2RpcmVjdG9yeScsIFtdKSArIHNlbGYuZGVmYXVsdF9iYXNlbGluZV9z ZWFyY2hfcGF0aCgpCisgICAgICAgIHJldHVybiBzZWxmLmdldF9vcHRpb24oJ2FkZGl0aW9uYWxf cGxhdGZvcm1fZGlyZWN0b3J5JywgW10pICsgY29tcGFyZV9iYXNlbGluZShzZWxmKSArIHNlbGYu ZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCgpCiAKICAgICBkZWYgZGVmYXVsdF9iYXNlbGlu ZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgIiIiUmV0dXJuIGEgbGlzdCBvZiBhYnNvbHV0 ZSBwYXRocyB0byBkaXJlY3RvcmllcyB0byBzZWFyY2ggdW5kZXIgZm9yCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbXBhcmUucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbXBhcmUucHkKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWYxYjgwMwotLS0gL2Rldi9udWxsCisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29tcGFyZS5weQpAQCAtMCww ICsxLDQ0IEBACisjIENvcHlyaWdodCAoQykgMjAxMiBVbml2ZXJzaXR5IG9mIFN6ZWdlZAorIwor IyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Cisj IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyMgICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgor IyAgICAgKiBOZWl0aGVyIHRoZSBHb29nbGUgbmFtZSBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBj b250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRl cml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRl biBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZ UklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8s IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBP UiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCisKK2ltcG9ydCBsb2dnaW5nCitpbXBvcnQgcmUKKworZnJvbSB3ZWJraXRweS5jb21t b24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCitmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5w b3J0LmZhY3RvcnkgaW1wb3J0IFBvcnRGYWN0b3J5CisKK19sb2cgPSBsb2dnaW5nLmdldExvZ2dl cihfX25hbWVfXykKKworCitAbWVtb2l6ZWQKK2RlZiBjb21wYXJlX2Jhc2VsaW5lKHBvcnQpOgor ICAgIGZhY3RvcnkgPSBQb3J0RmFjdG9yeShwb3J0Lmhvc3QpCisgICAgdGFyZ2V0X3BvcnQgPSBw b3J0LmdldF9vcHRpb24oJ2NvbXBhcmVfcG9ydCcpCisgICAgaWYgdGFyZ2V0X3BvcnQ6CisgICAg ICAgIHJldHVybiBmYWN0b3J5LmdldCh0YXJnZXRfcG9ydCkuZGVmYXVsdF9iYXNlbGluZV9zZWFy Y2hfcGF0aCgpCisgICAgcmV0dXJuIFtdCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBjNGY0ZjI0Li5iNmEx YTFkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTMzMiw2ICszMzIsOCBAQCBkZWYgcGFyc2VfYXJncyhh cmdzPU5vbmUpOgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1hZGRpdGlvbmFsLWV4 cGVjdGF0aW9ucyIsIGFjdGlvbj0iYXBwZW5kIiwgZGVmYXVsdD1bXSwKICAgICAgICAgICAgIGhl bHA9IlBhdGggdG8gYSB0ZXN0X2V4cGVjdGF0aW9ucyBmaWxlIHRoYXQgd2lsbCBvdmVycmlkZSBw cmV2aW91cyBleHBlY3RhdGlvbnMuICIKICAgICAgICAgICAgICAgICAgIlNwZWNpZnkgbXVsdGlw bGUgdGltZXMgZm9yIG11bHRpcGxlIHNldHMgb2Ygb3ZlcnJpZGVzLiIpLAorICAgICAgICBvcHRw YXJzZS5tYWtlX29wdGlvbigiLS1jb21wYXJlLXBvcnQiLCBhY3Rpb249InN0b3JlIiwgZGVmYXVs dD1Ob25lLAorICAgICAgICAgICAgaGVscD0iVXNlIHRoZSBzcGVjaWZpZWQgcG9ydCdzIGJhc2Vs aW5lcyBmaXJzdCIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1zaG93LXJl c3VsdHMiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwKICAgICAgICAgICAgIGRlZmF1bHQ9VHJ1ZSwg ZGVzdD0ic2hvd19yZXN1bHRzIiwKICAgICAgICAgICAgIGhlbHA9IkRvbid0IGxhdW5jaCBhIGJy b3dzZXIgd2l0aCByZXN1bHRzIGFmdGVyIHRoZSB0ZXN0cyAiCg== 157721 2012-08-10 06:02:40 -0700 2012-08-10 11:35:18 -0700 proposed fix compare.patch text/plain 3391 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMjNl OTJiLi4zOWUyNzA5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDgtMTAgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFtOUldUXSBDb21wYXJlIHJlc3Vs dHMgYmV0d2VlbiBkaWZmZXJlbnQgcGxhdGZvcm1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDU1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCk6CisgICAgICAg IChQb3J0KToKKyAgICAgICAgKFBvcnQuY29tcGFyZV9iYXNlbGluZSk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAg KHBhcnNlX2FyZ3MpOgorCiAyMDEyLTA4LTA5ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFNraXAgbGF5b3V0IHRl c3RzIGRpcmVjdG9yaWVzIHRoYXQgYXJlIG5vdCBhcHBsaWNhYmxlCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggY2Y3MTA0Yy4uODY5 MDMwYSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZS5weQpAQCAtNjAsNiArNjAsNyBAQCBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0 IGltcG9ydCBkcml2ZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGh0 dHBfbG9jawogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgaW1hZ2VfZGlm ZgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgc2VydmVyX3Byb2Nlc3MK K2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQuZmFjdG9yeSBpbXBvcnQgUG9ydEZhY3Rv cnkKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnNlcnZlcnMgaW1wb3J0IGFwYWNoZV9odHRw X3NlcnZlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuc2VydmVycyBpbXBvcnQgaHR0cF9z ZXJ2ZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnNlcnZlcnMgaW1wb3J0IHdlYnNvY2tl dF9zZXJ2ZXIKQEAgLTE5OCw3ICsxOTksNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAKIAogICAg IGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuZ2V0 X29wdGlvbignYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3RvcnknLCBbXSkgKyBzZWxmLmRlZmF1 bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQorICAgICAgICByZXR1cm4gc2VsZi5nZXRfb3B0aW9u KCdhZGRpdGlvbmFsX3BsYXRmb3JtX2RpcmVjdG9yeScsIFtdKSArIHNlbGYuY29tcGFyZV9iYXNl bGluZSgpICsgc2VsZi5kZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKCkKIAogICAgIGRlZiBk ZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICAiIiJSZXR1cm4gYSBs aXN0IG9mIGFic29sdXRlIHBhdGhzIHRvIGRpcmVjdG9yaWVzIHRvIHNlYXJjaCB1bmRlciBmb3IK QEAgLTIxMSw2ICsyMTIsMTQgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAgICAgc2Vh cmNoX3BhdGhzLmFwcGVuZChzZWxmLnBvcnRfbmFtZSkKICAgICAgICAgcmV0dXJuIG1hcChzZWxm Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCwgc2VhcmNoX3BhdGhzKQogCisgICAgQG1lbW9pemVkCisg ICAgZGVmIGNvbXBhcmVfYmFzZWxpbmUoc2VsZik6CisgICAgICAgIGZhY3RvcnkgPSBQb3J0RmFj dG9yeShzZWxmLmhvc3QpCisgICAgICAgIHRhcmdldF9wb3J0ID0gc2VsZi5nZXRfb3B0aW9uKCdj b21wYXJlX3BvcnQnKQorICAgICAgICBpZiB0YXJnZXRfcG9ydDoKKyAgICAgICAgICAgIHJldHVy biBmYWN0b3J5LmdldCh0YXJnZXRfcG9ydCkuZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCgp CisgICAgICAgIHJldHVybiBbXQorCiAgICAgZGVmIGNoZWNrX2J1aWxkKHNlbGYsIG5lZWRzX2h0 dHApOgogICAgICAgICAiIiJUaGlzIHJvdXRpbmUgaXMgdXNlZCB0byBlbnN1cmUgdGhhdCB0aGUg YnVpbGQgaXMgdXAgdG8gZGF0ZQogICAgICAgICBhbmQgYWxsIHRoZSBuZWVkZWQgYmluYXJpZXMg YXJlIHByZXNlbnQuIiIiCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCAwNmIzMDMyLi5kZGIwMTA1IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rl c3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHMucHkKQEAgLTMzMSw2ICszMzEsOCBAQCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUp OgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1hZGRpdGlvbmFsLWV4cGVjdGF0aW9u cyIsIGFjdGlvbj0iYXBwZW5kIiwgZGVmYXVsdD1bXSwKICAgICAgICAgICAgIGhlbHA9IlBhdGgg dG8gYSB0ZXN0X2V4cGVjdGF0aW9ucyBmaWxlIHRoYXQgd2lsbCBvdmVycmlkZSBwcmV2aW91cyBl eHBlY3RhdGlvbnMuICIKICAgICAgICAgICAgICAgICAgIlNwZWNpZnkgbXVsdGlwbGUgdGltZXMg Zm9yIG11bHRpcGxlIHNldHMgb2Ygb3ZlcnJpZGVzLiIpLAorICAgICAgICBvcHRwYXJzZS5tYWtl X29wdGlvbigiLS1jb21wYXJlLXBvcnQiLCBhY3Rpb249InN0b3JlIiwgZGVmYXVsdD1Ob25lLAor ICAgICAgICAgICAgaGVscD0iVXNlIHRoZSBzcGVjaWZpZWQgcG9ydCdzIGJhc2VsaW5lcyBmaXJz dCIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1zaG93LXJlc3VsdHMiLCBh Y3Rpb249InN0b3JlX2ZhbHNlIiwKICAgICAgICAgICAgIGRlZmF1bHQ9VHJ1ZSwgZGVzdD0ic2hv d19yZXN1bHRzIiwKICAgICAgICAgICAgIGhlbHA9IkRvbid0IGxhdW5jaCBhIGJyb3dzZXIgd2l0 aCByZXN1bHRzIGFmdGVyIHRoZSB0ZXN0cyAiCg==