77466 2012-01-31 12:37:29 -0800 [Qt][WK2] run-webkit-tests --qt crashes if WEBKIT_TESTFONTS is not set 2012-02-09 12:19:07 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 77552 1 jesus jesus abarth aroben cmarcelo dpranke eric ojan ossy webkit.review.bot oldest_to_newest 546374 0 jesus 2012-01-31 12:37:29 -0800 Unlike old-run-webkit-tests, running "run-webkit-tests --qt" with WEBKIT_TESTFONTS unset causes a crash in the dump render tree. We should check for env variable and raise an error if needed. Patch is coming. 546393 1 124800 jesus 2012-01-31 12:53:45 -0800 Created attachment 124800 Patch 546881 2 124800 ossy 2012-02-01 01:13:30 -0800 Comment on attachment 124800 Patch Cool, it should be landed as soon as possible. ;) 546949 3 124800 webkit.review.bot 2012-02-01 02:37:29 -0800 Comment on attachment 124800 Patch Clearing flags on attachment: 124800 Committed r106460: <http://trac.webkit.org/changeset/106460> 546951 4 webkit.review.bot 2012-02-01 02:37:33 -0800 All reviewed patches have been landed. Closing bug. 547053 5 124800 aroben 2012-02-01 06:40:22 -0800 Comment on attachment 124800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124800&action=review > Tools/Scripts/webkitpy/layout_tests/port/qt.py:140 > + if not 'WEBKIT_TESTFONTS' in os.environ: > + print "\n\nThe WEBKIT_TESTFONTS environment variable is not defined or not set properly" > + print "You must set it before running the tests." > + print "Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts\n" > + sys.exit(1) Calling sys.exit is not appropriate. This is causing test-webkitpy to abort in the middle of testing! See http://build.webkit.org/builders/Lion%20Intel%20Debug%20%28Tests%29/builds/3138/steps/webkitpy-test/logs/stdio 547064 6 ossy 2012-02-01 06:55:32 -0800 Reopen, because it was rolled out: http://trac.webkit.org/changeset/106466 547140 7 jesus 2012-02-01 09:53:13 -0800 (In reply to comment #5) > Calling sys.exit is not appropriate. This is causing test-webkitpy to abort in the middle of testing! See http://build.webkit.org/builders/Lion%20Intel%20Debug%20%28Tests%29/builds/3138/steps/webkitpy-test/logs/stdio Would it be fine to raise a RuntimeError instead ? When I run test-webkitpy locally (a linux machine) it doesn't abort, either with sys.exit or the exception. If we just return then we'll still have the crash when the var is not set. The other solution would be to check if we are running unittests and then avoid checking if the variable is set or not, but I couldn't find a way to do this inside qt.py . Thanks for helping! 547147 8 aroben 2012-02-01 10:03:11 -0800 Throwing an exception and catching it at an appropriate level seems like the way to go. I've CCed some more folks who might have better ideas. 547272 9 124987 jesus 2012-02-01 12:15:07 -0800 Created attachment 124987 Patch 547274 10 124987 aroben 2012-02-01 12:22:21 -0800 Comment on attachment 124987 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124987&action=review > Tools/Scripts/webkitpy/layout_tests/port/qt.py:140 > + if not 'WEBKIT_TESTFONTS' in os.environ: > + print "\n\nThe WEBKIT_TESTFONTS environment variable is not defined or not set properly" > + print "You must set it before running the tests." > + print "Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts\n" > + raise RuntimeError('WEBKIT_TESTFONTS not set') You should add tests that show that this exception is/isn't thrown in the appropriate cases. > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:86 > + try: > + port = self.make_port() > + env = port.setup_environ_for_server(port.driver_name()) > + self.assertEquals(env['QTWEBKIT_PLUGIN_PATH'], 'MOCK output of child process/lib/plugins') > + except RuntimeError, e: > + print e I don't think we want to add extra output to test-webkitpy. The test should set things up so that the exception doesn't get thrown. 547303 11 124987 dpranke 2012-02-01 12:51:13 -0800 Comment on attachment 124987 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124987&action=review >> Tools/Scripts/webkitpy/layout_tests/port/qt.py:140 >> + raise RuntimeError('WEBKIT_TESTFONTS not set') > > You should add tests that show that this exception is/isn't thrown in the appropriate cases. More importantly, this is the wrong place for this code. You should override check_sys_deps() and implement this check there. Use _log.error() to report the error, and return False if the variable isn't set up properly. Look at chromium.py for an example of this. >> Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:86 >> + print e > > I don't think we want to add extra output to test-webkitpy. The test should set things up so that the exception doesn't get thrown. See above. 548090 12 125168 jesus 2012-02-02 12:57:29 -0800 Created attachment 125168 Patch 548950 13 125168 aroben 2012-02-03 12:33:54 -0800 Comment on attachment 125168 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125168&action=review Still need a unit test for this. And Dirk should probably give it the final r+. > Tools/Scripts/webkitpy/layout_tests/port/qt.py:158 > + _log.error('\nThe WEBKIT_TESTFONTS environment variable is not defined or not set properly.') > + _log.error('You must set it before running the tests.') > + _log.error('Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts') Do we normally use multiple _log.error calls to log multiple lines? Dirk would know. 548955 14 jesus 2012-02-03 12:39:59 -0800 (In reply to comment #13) > Still need a unit test for this. And Dirk should probably give it the final r+. > Ok, thanks. I will have a look at the unit tests we already have and prepare one for this check. > > Tools/Scripts/webkitpy/layout_tests/port/qt.py:158 > > + _log.error('\nThe WEBKIT_TESTFONTS environment variable is not defined or not set properly.') > > + _log.error('You must set it before running the tests.') > > + _log.error('Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts') > > Do we normally use multiple _log.error calls to log multiple lines? Dirk would know. I will wait for Dirk's comments then and address it all later, but I believe I saw multiple _log.error calls in chromium.py as well. Thanks for the reviews. 548966 15 dpranke 2012-02-03 12:50:27 -0800 (In reply to comment #13) > > Tools/Scripts/webkitpy/layout_tests/port/qt.py:158 > > + _log.error('\nThe WEBKIT_TESTFONTS environment variable is not defined or not set properly.') > > + _log.error('You must set it before running the tests.') > > + _log.error('Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts') > > Do we normally use multiple _log.error calls to log multiple lines? Dirk would know. Yes, we normally use multiple calls for multiple lines (one line per call ensures that timestamps and other information are always logged). 550268 16 125706 jesus 2012-02-06 14:06:02 -0800 Created attachment 125706 Patch 553045 17 jesus 2012-02-09 04:16:30 -0800 (In reply to comment #16) > Created an attachment (id=125706) [details] > Patch Hi Dirk, would you mind to have a look at this patch? Thanks and sorry for bothering you! :) 553293 18 dpranke 2012-02-09 10:33:42 -0800 sorry for the delay ... you can always feel free to bug me right away for a review. 553311 19 125706 jesus 2012-02-09 10:50:59 -0800 Comment on attachment 125706 Patch Thanks, Dirk! 553402 20 125706 webkit.review.bot 2012-02-09 12:19:01 -0800 Comment on attachment 125706 Patch Clearing flags on attachment: 125706 Committed r107273: <http://trac.webkit.org/changeset/107273> 553403 21 webkit.review.bot 2012-02-09 12:19:07 -0800 All reviewed patches have been landed. Closing bug. 124800 2012-01-31 12:53:45 -0800 2012-02-01 12:14:48 -0800 Patch bug-77466-20120131175318.patch text/plain 1947 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MzczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWU4ZTc0ZjE2NTAxZDA2N2UxNzE4YzM1ZGExOTVhMWQx MDQ3NGZkYS4uZWFiZjEyMzkwMDBiYTQ4M2NmYzM0YjU3ZTA3YWY4NDY4OGJjM2Q0ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTAxLTMxICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFA b3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdW1dLMl0gcnVuLXdlYmtpdC10ZXN0cyAtLXF0 ICBjcmFzaGVzIGlmIFdFQktJVF9URVNURk9OVFMgaXMgbm90IHNldAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc0NjYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsaWNhdGUgdGhlIGJlaGF2aW9yIG9m IG9sZC1ydW4td2Via2l0LXRlc3RzIGFuZCBjaGVjayBpZiBXRUJLSVRfVEVTVEZPTlRTCisgICAg ICAgIGlzIHNldCBvciBpZiB3ZSBzaG91bGQgcmFpc2UgYW4gZXJyb3IuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0 LnNldHVwX2Vudmlyb25fZm9yX3NlcnZlcik6CisKIDIwMTItMDEtMzEgIEFudG9pbmUgTGFib3Vy ICA8cGltYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1lcmdlIFdlYkdyYXBoaWNzQ29udGV4 dDNEIGNyZWF0aW9uIGFuZCBpbml0aWFsaXphdGlvbiwgYW5kIG1vdmUgaXQgdG8KZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CmluZGV4IDI0NDU4NzY4 YzcxODM2ZGYyM2ZlZDUxZDViMzg2NzNiN2U4NzJiODAuLjc5YzM1ODUwYjY3MWI3OWQyZjIyZjdh NDBiMzYzNDFiYzRkYTVhNTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9xdC5weQpAQCAtMzEsNiArMzEsNyBAQAogaW1wb3J0IGxvZ2dpbmcKIGltcG9y dCByZQogaW1wb3J0IHN5cworaW1wb3J0IG9zCiAKIGltcG9ydCB3ZWJraXQKIApAQCAtMTMyLDYg KzEzMywxMSBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAgIHJldHVybiBOb25l CiAKICAgICBkZWYgc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlbGYsIHNlcnZlcl9uYW1lPU5v bmUpOgorICAgICAgICBpZiBub3QgJ1dFQktJVF9URVNURk9OVFMnIGluIG9zLmVudmlyb246Cisg ICAgICAgICAgICBwcmludCAiXG5cblRoZSBXRUJLSVRfVEVTVEZPTlRTIGVudmlyb25tZW50IHZh cmlhYmxlIGlzIG5vdCBkZWZpbmVkIG9yIG5vdCBzZXQgcHJvcGVybHkiCisgICAgICAgICAgICBw cmludCAiWW91IG11c3Qgc2V0IGl0IGJlZm9yZSBydW5uaW5nIHRoZSB0ZXN0cy4iCisgICAgICAg ICAgICBwcmludCAiVXNlIGdpdCB0byBncmFiIHRoZSBhY3R1YWwgZm9udHMgZnJvbSBodHRwOi8v Z2l0b3Jpb3VzLm9yZy9xdHdlYmtpdC90ZXN0Zm9udHNcbiIKKyAgICAgICAgICAgIHN5cy5leGl0 KDEpCiAgICAgICAgIGNsZWFuX2VudiA9IFdlYktpdFBvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2Vy dmVyKHNlbGYsIHNlcnZlcl9uYW1lKQogICAgICAgICBjbGVhbl9lbnZbJ1FUV0VCS0lUX1BMVUdJ Tl9QQVRIJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdsaWIvcGx1Z2lucycpCiAgICAgICAgIHNlbGYu X2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChjbGVhbl9lbnYsICdRVF9EUlRfV0VCVklF V19NT0RFJykK 124987 2012-02-01 12:15:07 -0800 2012-02-02 12:57:21 -0800 Patch bug-77466-20120201171440.patch text/plain 3278 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NDc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGU2MDhkMDMyZWVhYjQ3NjZlMjhiZDRlZDk3MjBkNmEw M2Y3ODA2Mi4uN2Y0Mjc2MzdjZDVlZTBkNTQwNTBiYjhlMzA3ZWY5ZjZiOGQ4NTJjNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTAxLTMxICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFA b3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdW1dLMl0gcnVuLXdlYmtpdC10ZXN0cyAtLXF0 ICBjcmFzaGVzIGlmIFdFQktJVF9URVNURk9OVFMgaXMgbm90IHNldAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc0NjYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsaWNhdGUgdGhlIGJlaGF2aW9yIG9m IG9sZC1ydW4td2Via2l0LXRlc3RzIGFuZCBjaGVjayBpZiBXRUJLSVRfVEVTVEZPTlRTCisgICAg ICAgIGlzIHNldCBvciBpZiB3ZSBzaG91bGQgcmFpc2UgYW4gZXJyb3IuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0 LnNldHVwX2Vudmlyb25fZm9yX3NlcnZlcik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weToKKyAgICAgICAgKFF0UG9ydFRlc3QudGVz dF9zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIpCisKIDIwMTItMDItMDEgIEhhbnMgV2VubmJvcmcg IDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW5hbWUgV2ViU3BlZWNoSW5wdXRSZXN1 bHQ6OnNldCgpIHRvIGFzc2lnbigpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9xdC5weQppbmRleCAyNDQ1ODc2OGM3MTgzNmRmMjNmZWQ1MWQ1YjM4NjczYjdl ODcyYjgwLi40NmRkZmJhNWE4MTVhZTNiMThjY2IyZmUyOGMxYjg2MmFjNTA4ZTRjIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKQEAgLTMxLDYg KzMxLDcgQEAKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUKIGltcG9ydCBzeXMKK2ltcG9ydCBv cwogCiBpbXBvcnQgd2Via2l0CiAKQEAgLTEzMiw2ICsxMzMsMTEgQEAgY2xhc3MgUXRQb3J0KFdl YktpdFBvcnQpOgogICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIHNldHVwX2Vudmlyb25f Zm9yX3NlcnZlcihzZWxmLCBzZXJ2ZXJfbmFtZT1Ob25lKToKKyAgICAgICAgaWYgbm90ICdXRUJL SVRfVEVTVEZPTlRTJyBpbiBvcy5lbnZpcm9uOgorICAgICAgICAgICAgcHJpbnQgIlxuXG5UaGUg V0VCS0lUX1RFU1RGT05UUyBlbnZpcm9ubWVudCB2YXJpYWJsZSBpcyBub3QgZGVmaW5lZCBvciBu b3Qgc2V0IHByb3Blcmx5IgorICAgICAgICAgICAgcHJpbnQgIllvdSBtdXN0IHNldCBpdCBiZWZv cmUgcnVubmluZyB0aGUgdGVzdHMuIgorICAgICAgICAgICAgcHJpbnQgIlVzZSBnaXQgdG8gZ3Jh YiB0aGUgYWN0dWFsIGZvbnRzIGZyb20gaHR0cDovL2dpdG9yaW91cy5vcmcvcXR3ZWJraXQvdGVz dGZvbnRzXG4iCisgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ1dFQktJVF9URVNURk9O VFMgbm90IHNldCcpCiAgICAgICAgIGNsZWFuX2VudiA9IFdlYktpdFBvcnQuc2V0dXBfZW52aXJv bl9mb3Jfc2VydmVyKHNlbGYsIHNlcnZlcl9uYW1lKQogICAgICAgICBjbGVhbl9lbnZbJ1FUV0VC S0lUX1BMVUdJTl9QQVRIJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdsaWIvcGx1Z2lucycpCiAgICAg ICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChjbGVhbl9lbnYsICdRVF9E UlRfV0VCVklFV19NT0RFJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CmluZGV4IDJhYTZmZjVlNzAxZGFjOGVjMjkx ZWMwZjcyZTQ0NDIwMmI1YTRjNTQuLjY5M2IwYzBkMjhjNjk3MWRjYjUwNjQxZWYwZmI5NDMwZGZm MTU4NWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvcXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9xdF91bml0dGVzdC5weQpAQCAtNzgsOSArNzgsMTIgQEAgY2xhc3MgUXRQb3J0VGVz dChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgIE91dHB1dENhcHR1cmUoKS5h c3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNob3dfcmVzdWx0c19odG1sX2ZpbGUsIFsidGVzdC5o dG1sIl0sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9z ZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBzZWxmLm1ha2Vf cG9ydCgpCi0gICAgICAgIGVudiA9IHBvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKHBvcnQu ZHJpdmVyX25hbWUoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZW52WydRVFdFQktJVF9Q TFVHSU5fUEFUSCddLCAnTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJvY2Vzcy9saWIvcGx1Z2lucycp CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAg ICAgICAgICBlbnYgPSBwb3J0LnNldHVwX2Vudmlyb25fZm9yX3NlcnZlcihwb3J0LmRyaXZlcl9u YW1lKCkpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhlbnZbJ1FUV0VCS0lUX1BMVUdJ Tl9QQVRIJ10sICdNT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9jZXNzL2xpYi9wbHVnaW5zJykKKyAg ICAgICAgZXhjZXB0IFJ1bnRpbWVFcnJvciwgZToKKyAgICAgICAgICAgIHByaW50IGUKIAogICAg IGRlZiB0ZXN0X29wZXJhdGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoJ2xpbnV4Jywgc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdxdC1saW51eCcsIG9zX25hbWU9 J2xpbnV4Jykub3BlcmF0aW5nX3N5c3RlbSgpKQo= 125168 2012-02-02 12:57:29 -0800 2012-02-06 14:05:55 -0800 Patch bug-77466-20120202175703.patch text/plain 1868 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTBkNjdkYmE2ZTI4NjEwYzlhMjRlYmFiZDdjZWZhOWIz OGExZGQyOS4uOGM3OWQyZmMyMzNjOTQ3ZTkyYTkzNDdkOTVmYTM4NTkxYzM1NGFmNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTAyLTAyICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFA b3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdW1dLMl0gcnVuLXdlYmtpdC10ZXN0cyAtLXF0 IGNyYXNoZXMgaWYgV0VCS0lUX1RFU1RGT05UUyBpcyBub3Qgc2V0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzQ2NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxpY2F0ZSB0aGUgYmVoYXZpb3Igb2Yg b2xkLXJ1bi13ZWJraXQtdGVzdHMgYW5kIGNoZWNrIGlmIFdFQktJVF9URVNURk9OVFMKKyAgICAg ICAgaXMgc2V0IG9yIGlmIHdlIHNob3VsZCByYWlzZSBhbiBlcnJvci4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHk6CisgICAgICAgIChRdFBvcnQu b3BlcmF0aW5nX3N5c3RlbSk6CisgICAgICAgIChRdFBvcnQpOgorICAgICAgICAoUXRQb3J0LmNo ZWNrX3N5c19kZXBzKToKKwogMjAxMi0wMi0wMiAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5j b20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3 NjY0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L3F0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQpp bmRleCAyNDQ1ODc2OGM3MTgzNmRmMjNmZWQ1MWQ1YjM4NjczYjdlODcyYjgwLi41ZTc3ODQxMjA4 YmMzNGE0ZWZiOTg3MGJkZGNmOTJiNWEyYmU4YzU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKQEAgLTMxLDYgKzMxLDcgQEAKIGltcG9ydCBs b2dnaW5nCiBpbXBvcnQgcmUKIGltcG9ydCBzeXMKK2ltcG9ydCBvcwogCiBpbXBvcnQgd2Via2l0 CiAKQEAgLTE0OCwzICsxNDksMTIgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogCiAgICAg ZGVmIG9wZXJhdGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9vcGVyYXRp bmdfc3lzdGVtCisKKyAgICBkZWYgY2hlY2tfc3lzX2RlcHMoc2VsZiwgbmVlZHNfaHR0cCk6Cisg ICAgICAgIHJlc3VsdCA9IHN1cGVyKFF0UG9ydCwgc2VsZikuY2hlY2tfc3lzX2RlcHMobmVlZHNf aHR0cCkKKyAgICAgICAgaWYgbm90ICdXRUJLSVRfVEVTVEZPTlRTJyBpbiBvcy5lbnZpcm9uOgor ICAgICAgICAgICAgX2xvZy5lcnJvcignXG5UaGUgV0VCS0lUX1RFU1RGT05UUyBlbnZpcm9ubWVu dCB2YXJpYWJsZSBpcyBub3QgZGVmaW5lZCBvciBub3Qgc2V0IHByb3Blcmx5LicpCisgICAgICAg ICAgICBfbG9nLmVycm9yKCdZb3UgbXVzdCBzZXQgaXQgYmVmb3JlIHJ1bm5pbmcgdGhlIHRlc3Rz LicpCisgICAgICAgICAgICBfbG9nLmVycm9yKCdVc2UgZ2l0IHRvIGdyYWIgdGhlIGFjdHVhbCBm b250cyBmcm9tIGh0dHA6Ly9naXRvcmlvdXMub3JnL3F0d2Via2l0L3Rlc3Rmb250cycpCisgICAg ICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgcmV0dXJuIHJlc3VsdAo= 125706 2012-02-06 14:06:02 -0800 2012-02-09 12:19:01 -0800 Patch bug-77466-20120206190537.patch text/plain 3596 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2ODMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjhjMTczYjM2YTJiM2FkNDEwNWRkZjE0NTY4MzBkNzY4 MWY1ZGY4ZS4uN2VhOTU3YmZlMGMyZDZkMDRhYzYwNGIzNDU0MmZiMWEyOTM4OThmMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTAyLTA2ICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFA b3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdW1dLMl0gcnVuLXdlYmtpdC10ZXN0cyAtLXF0 ICBjcmFzaGVzIGlmIFdFQktJVF9URVNURk9OVFMgaXMgbm90IHNldAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc0NjYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsaWNhdGUgdGhlIGJlaGF2aW9yIG9m IG9sZC1ydW4td2Via2l0LXRlc3RzIGFuZCBjaGVjayBpZiBXRUJLSVRfVEVTVEZPTlRTCisgICAg ICAgIGlzIHNldCBvciBpZiB3ZSBzaG91bGQgcmFpc2UgYW4gZXJyb3IuIEEgdW5pdCB0ZXN0IHdh cyBhZGRlZC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXQucHk6CisgICAgICAgIChRdFBvcnQub3BlcmF0aW5nX3N5c3RlbSk6CisgICAgICAgIChRdFBv cnQpOgorICAgICAgICAoUXRQb3J0LmNoZWNrX3N5c19kZXBzKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoUXRQ b3J0VGVzdC50ZXN0X29wZXJhdGluZ19zeXN0ZW0pOgorICAgICAgICAoUXRQb3J0VGVzdCk6Cisg ICAgICAgIChRdFBvcnRUZXN0LnRlc3RfY2hlY2tfc3lzX2RlcHMpOgorCiAyMDEyLTAyLTA2ICBQ aGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbd2Via2l0 cHldIGNwcCBzdHlsZS1jaGVja2VyIGNvbXBsYWlucyBhYm91dCByZWFkYWJpbGl0eS9uYW1pbmcg aW4gR1N0cmVhbWVyIGVsZW1lbnRzIHNvdXJjZSBmaWxlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggMjQ0NTg3NjhjNzE4MzZkZjIzZmVk NTFkNWIzODY3M2I3ZTg3MmI4MC4uNWU3Nzg0MTIwOGJjMzRhNGVmYjk4NzBiZGRjZjkyYjVhMmJl OGM1OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9xdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0 LnB5CkBAIC0zMSw2ICszMSw3IEBACiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IHJlCiBpbXBvcnQg c3lzCitpbXBvcnQgb3MKIAogaW1wb3J0IHdlYmtpdAogCkBAIC0xNDgsMyArMTQ5LDEyIEBAIGNs YXNzIFF0UG9ydChXZWJLaXRQb3J0KToKIAogICAgIGRlZiBvcGVyYXRpbmdfc3lzdGVtKHNlbGYp OgogICAgICAgICByZXR1cm4gc2VsZi5fb3BlcmF0aW5nX3N5c3RlbQorCisgICAgZGVmIGNoZWNr X3N5c19kZXBzKHNlbGYsIG5lZWRzX2h0dHApOgorICAgICAgICByZXN1bHQgPSBzdXBlcihRdFBv cnQsIHNlbGYpLmNoZWNrX3N5c19kZXBzKG5lZWRzX2h0dHApCisgICAgICAgIGlmIG5vdCAnV0VC S0lUX1RFU1RGT05UUycgaW4gb3MuZW52aXJvbjoKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ1xu VGhlIFdFQktJVF9URVNURk9OVFMgZW52aXJvbm1lbnQgdmFyaWFibGUgaXMgbm90IGRlZmluZWQg b3Igbm90IHNldCBwcm9wZXJseS4nKQorICAgICAgICAgICAgX2xvZy5lcnJvcignWW91IG11c3Qg c2V0IGl0IGJlZm9yZSBydW5uaW5nIHRoZSB0ZXN0cy4nKQorICAgICAgICAgICAgX2xvZy5lcnJv cignVXNlIGdpdCB0byBncmFiIHRoZSBhY3R1YWwgZm9udHMgZnJvbSBodHRwOi8vZ2l0b3Jpb3Vz Lm9yZy9xdHdlYmtpdC90ZXN0Zm9udHMnKQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAg ICAgIHJldHVybiByZXN1bHQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CmluZGV4IDJhYTZmZjVlNzAxZGFjOGVjMjkx ZWMwZjcyZTQ0NDIwMmI1YTRjNTQuLmRjYjM3NjU0NWM2OWJlYTYxOTA3ZDBmOTM0MGJmYTg1NTFm YzJkNDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvcXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9xdF91bml0dGVzdC5weQpAQCAtMjcsNiArMjcsNyBAQAogIyBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog CiBpbXBvcnQgdW5pdHRlc3QKK2ltcG9ydCBvcwogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0uZXhlY3V0aXZlX21vY2sgaW1wb3J0IE1vY2tFeGVjdXRpdmUsIE1vY2tFeGVjdXRpdmUyCiBm cm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2Fw dHVyZQpAQCAtODYsMyArODcsMTcgQEAgY2xhc3MgUXRQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBv cnRUZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2xpbnV4Jywgc2VsZi5tYWtl X3BvcnQocG9ydF9uYW1lPSdxdC1saW51eCcsIG9zX25hbWU9J2xpbnV4Jykub3BlcmF0aW5nX3N5 c3RlbSgpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdtYWMnLCBzZWxmLm1ha2VfcG9ydChv c19uYW1lPSdtYWMnKS5vcGVyYXRpbmdfc3lzdGVtKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoJ3dpbicsIHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT0ncXQtd2luJywgb3NfbmFtZT0nd2lu Jykub3BlcmF0aW5nX3N5c3RlbSgpKQorCisgICAgZGVmIHRlc3RfY2hlY2tfc3lzX2RlcHMoc2Vs Zik6CisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisKKyAgICAgICAgIyBTdWNjZXNz CisgICAgICAgIG9zLmVudmlyb25bJ1dFQktJVF9URVNURk9OVFMnXSA9ICcvdG1wL2ZvbycKKyAg ICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoZXhpdF9jb2RlPTApCisgICAg ICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmNoZWNrX3N5c19kZXBzKG5lZWRzX2h0dHA9RmFsc2Up KQorCisgICAgICAgICMgRmFpbHVyZQorICAgICAgICBkZWwgb3MuZW52aXJvblsnV0VCS0lUX1RF U1RGT05UUyddCisgICAgICAgIHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKGV4aXRf Y29kZT0xLAorICAgICAgICAgICAgb3V0cHV0PSd0ZXN0aW5nIG91dHB1dCBmYWlsdXJlJykKKyAg ICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0LmNoZWNrX3N5c19kZXBzKG5lZWRzX2h0dHA9RmFs c2UpKQo=