67256 2011-08-30 20:28:32 -0700 [GTK][DRT] Normalize file:///tmp/LayoutTests in LayoutTestController::pathToLocalResource() 2011-12-03 03:33:25 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, LayoutTestFailure P2 Normal --- 67239 0 jarred mrobinson abarth gustavo mrobinson ojan pnormand webkit.review.bot oldest_to_newest 459403 0 jarred 2011-08-30 20:28:32 -0700 Gtk DRT should translate file:///tmp/LayoutTests paths into a local URL that's derived from the path of the DRT application exec. 460234 1 mrobinson 2011-08-31 22:55:11 -0700 Which tests are failing because of this issue? 460258 2 jarred 2011-08-31 23:28:40 -0700 Any tests that run in NRWT which load a local resource from /tmp/LayoutTests. e.g. fast/dom/frame-loading-via-document-write.html fast/loader/local-CSS-from-local.html fast/loader/local-JavaScript-from-local.html fast/loader/local-image-from-local.html http/tests/security/local-user-CSS-from-remote.html see bug #67254 for Qt's implementation. Chromium's implementation and related logic: http://pastie.org/2464106 original bug #64135 514293 3 117715 mrobinson 2011-12-02 17:18:03 -0800 Created attachment 117715 Patch 514294 4 webkit.review.bot 2011-12-02 17:21:22 -0800 Attachment 117715 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/DumpRenderTree/g..." exit_code: 1 Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:91: Use 0 instead of NULL. [readability/null] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 514472 5 117715 pnormand 2011-12-03 02:13:57 -0800 Comment on attachment 117715 Patch This is neat! 514476 6 117715 webkit.review.bot 2011-12-03 03:33:21 -0800 Comment on attachment 117715 Patch Clearing flags on attachment: 117715 Committed r101922: <http://trac.webkit.org/changeset/101922> 514478 7 webkit.review.bot 2011-12-03 03:33:25 -0800 All reviewed patches have been landed. Closing bug. 117715 2011-12-02 17:18:03 -0800 2011-12-03 03:33:20 -0800 Patch bug-67256-20111203021801.patch text/plain 11535 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxODY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmQzNjAyMGU3MjgxNmI2NTQyYWQyZTRhMTZjYzYyZmY5 MmQxOGFkOC4uMzhkZjdlMTBkMjVjZDkwNTI4ZmQ3M2UxZTNmYmIyOGY4ZGFkZDcxZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2 IEBACiAyMDExLTEyLTAyICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K IAorICAgICAgICBbR1RLXVtEUlRdIE5vcm1hbGl6ZSBmaWxlOi8vL3RtcC9MYXlvdXRUZXN0cyBp biBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGF0aFRvTG9jYWxSZXNvdXJjZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NzI1NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBMYXlvdXRUZXN0 Q29udHJvbGxlcjo6cGF0aFRvTG9jYWxSZXNvdXJjZSBmb3IgR1RLKy4gSW5zdGVhZCBvZiBwYXNz aW5nIAorICAgICAgICBXRUJLSVRfVEVTVF9GT05UUyB0byB0aGUgR1RLKyB0ZXN0IGhhcm5lc3Nl cywgcGFzcyBhIG1vcmUgZ2VuZXJpYyBXRUJLSVRfVE9QX0xFVkVMLAorICAgICAgICB3aGljaCBw b2ludHMgdG8gdGhlIG1vcmUgZ2VuZXJpYyB0b3AtbGV2ZWwgcGF0aCBvZiB0aGUgV2ViS2l0IGNo ZWNrb3V0LiBUaGlzIGNvZGUgaXMKKyAgICAgICAgZHVwbGljYXRlZCBiZXR3ZWVuIFdLMSBhbmQg V0syIGhhcm5lc3NlcyBiZWNhdXNlIHdlIGRvIG5vdCBjdXJyZW50bHkgaGF2ZSBhIHdheSB0bwor ICAgICAgICBzaGFyZSBjb2RlIGhlcmUuCisKKyAgICAgICAgSWYgV0VCS0lUX1RPUF9MRVZFTCBp cyBub3QgcHJvdmlkZWQsIHdlIHNlYXJjaCBmb3IgdGhlIHRvcCBsZXZlbCBiYXNlZCBvbiB0aGUg YmluYXJ5CisgICAgICAgIGxvY2F0aW9uLiBUaGlzIHdpbGwgY2F1c2UgdGhlIGZhbGxiYWNrIHRv IGZhaWwgaWYgeW91IGJ1aWxkIGludG8gYSBub24tdHlwaWNhbCBsb2NhdGlvbgorICAgICAgICBv ciBldmVuIGZha2UgaXQgd2l0aCBhIHN5bWxpbmsuIEluIHRoaXMgY2FzZSBpdCdzIGltcG9ydGFu dCB0byB1c2UgdGhlIGVudmlyb25tZW50IHZhcmlhYmxlLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGdldFRvcExldmVsUGF0aCk6 IEFkZGVkLgorICAgICAgICAoaW5pdGlhbGl6ZUZvbnRzKTogVXNlIHRoZSBuZXcgaGVscGVyIHRv IGdldCB0aGUgZm9udCBwYXRoLgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZUd0ay5oOiBFeHBvc2UgdGhlIG5ldyBoZWxwZXIuCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvZ3RrL0xheW91dFRlc3RDb250cm9sbGVyR3RrLmNwcDoKKyAgICAgICAgKExheW91dFRl c3RDb250cm9sbGVyOjpwYXRoVG9Mb2NhbFJlc291cmNlKTpVc2UgdGhlIG5ldyBoZWxwZXIgdG8g bm9ybWFsaXplCisgICAgICAgIHRlc3QgcGF0aHMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAgICAgIChHdGtQb3J0LnNldHVwX2Vudmly b25fZm9yX3NlcnZlcik6UGFzcyB0aGUgdG9wLWxldmVsIHBhdGggb2YgdGhlCisgICAgICAgIGNo ZWNrb3V0IGluc3RlYWQgb2YgcGFzc2luZyB0aGUgZm9udCBwYXRoLgorICAgICAgICAqIFdlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwOgorICAg ICAgICAoV1RSOjpnZXRUb3BMZXZlbFBhdGgpOiBBZGRlZCB0aGlzIGhlbHBlci4KKyAgICAgICAg KFdUUjo6aW5pdGl0aWFsaXplRm9udENvbmZpZ1NldHRpbmcpOiBVc2UgdGhlIGhlbHBlciB0byBm aW5kIHRoZSBmb250IHBhdGguCisKKzIwMTEtMTItMDIgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2Jp bnNvbkBpZ2FsaWEuY29tPgorCiAgICAgICAgIFRyeSB0byBmaXggdGhlIEdUSysgYnVpbGQuCiAK ICAgICAgICAgKiBndGsvamhidWlsZC5tb2R1bGVzOiBQcm9wZXJseSBzcGVjaWZ5IHRoZSBnbGli LW5ldHdvcmtpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3Bw CmluZGV4IDM5ZDM2NDE0ZmZlMDZkMDRmY2U0MzIzYzc4Y2EzMGEyMzczYzg1NmUuLjM3ZmM0ZDll MGNjOWUxMDA5Y2U3OTNkMjAwOTI1YmQwMTcyZTUxZDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtMTU3LDYgKzE1NywyMCBAQCBzdGF0aWMgdm9p ZCBpbml0aWFsaXplR3RrRm9udFNldHRpbmdzKGNvbnN0IGNoYXIqIHRlc3RVUkwpCiAgICAgICAg IGdfb2JqZWN0X3NldChzZXR0aW5ncywgImd0ay14ZnQtcmdiYSIsICJub25lIiwgTlVMTCk7CiB9 CiAKK0NTdHJpbmcgZ2V0VG9wTGV2ZWxQYXRoKCkKK3sKKyAgICBpZiAoY29uc3QgY2hhciogdG9w TGV2ZWxEaXJlY3RvcnkgPSBnX2dldGVudigiV0VCS0lUX1RPUF9MRVZFTCIpKQorICAgICAgICBy ZXR1cm4gdG9wTGV2ZWxEaXJlY3Rvcnk7CisKKyAgICAvLyBJZiB0aGUgZW52aXJvbm1lbnQgdmFy aWFibGUgd2Fzbid0IHByb3ZpZGVkIHRoZW4gYXNzdW1lIHdlIHdlcmUgYnVpbHQgaW50bworICAg IC8vIFdlYktpdEJ1aWxkL0RlYnVnIG9yIFdlYktpdEJ1aWxkL1JlbGVhc2UuIE9idmlvdXNseSB0 aGlzIHdpbGwgZmFpbCBpZiB0aGUgYnVpbGQKKyAgICAvLyBkaXJlY3RvcnkgaXMgbm9uLXN0YW5k YXJkLCBidXQgd2UgY2FuJ3QgZG8gbXVjaCBtb3JlIGFib3V0IHRoaXMuCisgICAgR093blB0cjxj aGFyPiBwYXJlbnRQYXRoKGdfcGF0aF9nZXRfZGlybmFtZShnZXRDdXJyZW50RXhlY3V0YWJsZVBh dGgoKS5kYXRhKCkpKTsKKyAgICBHT3duUHRyPGNoYXI+IGxheW91dFRlc3RzUGF0aChnX2J1aWxk X2ZpbGVuYW1lKHBhcmVudFBhdGguZ2V0KCksICIuLiIsICIuLiIsICIuLiIsIE5VTEwpKTsKKyAg ICBHT3duUHRyPGNoYXI+IGFic29sdXRlVG9wTGV2ZWxQYXRoKHJlYWxwYXRoKGxheW91dFRlc3Rz UGF0aC5nZXQoKSwgMCkpOworICAgIHJldHVybiBhYnNvbHV0ZVRvcExldmVsUGF0aC5nZXQoKTsK K30KKwogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUZvbnRzKGNvbnN0IGNoYXIqIHRlc3RVUkwgPSAw KQogewogI2lmIFBMQVRGT1JNKFgxMSkKQEAgLTE3OCwyMiArMTkyLDE4IEBAIHN0YXRpYyB2b2lk IGluaXRpYWxpemVGb250cyhjb25zdCBjaGFyKiB0ZXN0VVJMID0gMCkKICAgICBpZiAoIUZjQ29u ZmlnUGFyc2VBbmRMb2FkKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxGY0NoYXI4Kj4oZm9udENv bmZpZ0ZpbGVuYW1lLmdldCgpKSwgdHJ1ZSkpCiAgICAgICAgIGdfZXJyb3IoIkNvdWxkbid0IGxv YWQgZm9udCBjb25maWd1cmF0aW9uIGZpbGUgZnJvbTogJXMiLCBmb250Q29uZmlnRmlsZW5hbWUu Z2V0KCkpOwogCi0gICAgQ1N0cmluZyBmb250c1BhdGggPSBnX2dldGVudigiV0VCS0lUX1RFU1Rf Rk9OVFMiKTsKLSAgICBpZiAoZm9udHNQYXRoLmlzTnVsbCgpKSB7Ci0gICAgICAgIEdPd25QdHI8 Y2hhcj4gcGFyZW50UGF0aChnX3BhdGhfZ2V0X2Rpcm5hbWUoZ2V0Q3VycmVudEV4ZWN1dGFibGVQ YXRoKCkuZGF0YSgpKSk7Ci0gICAgICAgIEdPd25QdHI8Y2hhcj4gYWx0ZXJuYXRlUGF0aChnX2J1 aWxkX2ZpbGVuYW1lKHBhcmVudFBhdGguZ2V0KCksICIuLiIsICIuLiIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJEZXBlbmRlbmNpZXMiLCAi Um9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKLSAgICAgICAgZm9udHNQYXRo ID0gYWx0ZXJuYXRlUGF0aC5nZXQoKTsKLSAgICAgICAgaWYgKCFnX2ZpbGVfdGVzdChhbHRlcm5h dGVQYXRoLmdldCgpLCBzdGF0aWNfY2FzdDxHRmlsZVRlc3Q+KEdfRklMRV9URVNUX0VYSVNUUyB8 IEdfRklMRV9URVNUX0lTX0RJUikpKQotICAgICAgICAgICAgZ19lcnJvcigiV0VCS0lUX1RFU1Rf Rk9OVFMgZW52aXJvbm1lbnQgdmFyaWFibGUgbm90IHNldCBhbmQgJXMgZG9lcyBub3QgZXhpc3Qi LCBhbHRlcm5hdGVQYXRoLmdldCgpKTsKLSAgICB9CisgICAgQ1N0cmluZyB0b3BMZXZlbFBhdGgg PSBnZXRUb3BMZXZlbFBhdGgoKTsKKyAgICBHT3duUHRyPGNoYXI+IGZvbnRzUGF0aChnX2J1aWxk X2ZpbGVuYW1lKHRvcExldmVsUGF0aC5kYXRhKCksICJXZWJLaXRCdWlsZCIsICJEZXBlbmRlbmNp ZXMiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlJvb3Qi LCAid2Via2l0Z3RrLXRlc3QtZm9udHMiLCBOVUxMKSk7CisgICAgaWYgKCFnX2ZpbGVfdGVzdChm b250c1BhdGguZ2V0KCksIHN0YXRpY19jYXN0PEdGaWxlVGVzdD4oR19GSUxFX1RFU1RfRVhJU1RT IHwgR19GSUxFX1RFU1RfSVNfRElSKSkpCisgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBsb2Nh dGUgdGVzdCBmb250cyBhdCAlcy4gSXMgV0VCS0lUX1RPUF9MRVZFTCBzZXQ/IiwgZm9udHNQYXRo LmdldCgpKTsKIAogICAgIEdPd25QdHI8R0Vycm9yPiBlcnJvcjsKLSAgICBHT3duUHRyPEdEaXI+ IGZvbnRzRGlyZWN0b3J5KGdfZGlyX29wZW4oZm9udHNQYXRoLmRhdGEoKSwgMCwgJmVycm9yLm91 dFB0cigpKSk7CisgICAgR093blB0cjxHRGlyPiBmb250c0RpcmVjdG9yeShnX2Rpcl9vcGVuKGZv bnRzUGF0aC5nZXQoKSwgMCwgJmVycm9yLm91dFB0cigpKSk7CiAgICAgd2hpbGUgKGNvbnN0IGNo YXIqIGRpcmVjdG9yeUVudHJ5ID0gZ19kaXJfcmVhZF9uYW1lKGZvbnRzRGlyZWN0b3J5LmdldCgp KSkgewogICAgICAgICBpZiAoIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIudHRm IikgJiYgIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIub3RmIikpCiAgICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgR093blB0cjxnY2hhcj4gZm9udFBhdGgoZ19idWlsZF9m aWxlbmFtZShmb250c1BhdGguZGF0YSgpLCBkaXJlY3RvcnlFbnRyeSwgTlVMTCkpOworICAgICAg ICBHT3duUHRyPGdjaGFyPiBmb250UGF0aChnX2J1aWxkX2ZpbGVuYW1lKGZvbnRzUGF0aC5nZXQo KSwgZGlyZWN0b3J5RW50cnksIE5VTEwpKTsKICAgICAgICAgaWYgKCFGY0NvbmZpZ0FwcEZvbnRB ZGRGaWxlKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4oZm9udFBhdGgu Z2V0KCkpKSkKICAgICAgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBsb2FkIGZvbnQgYXQgJXMh IiwgZm9udFBhdGguZ2V0KCkpOwogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9n dGsvRHVtcFJlbmRlclRyZWVHdGsuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZUd0ay5oCmluZGV4IDdhNWE0Y2Y2YmQxNjFlMWJiNGI0MDQzY2UzYWUxYWUwZTQ0ZWY3 ZjkuLmRiZDFmOGEzZGU0N2ZlOWE5ZDNlNGQyZjQ2NzNjNzVlNjI1NWZkODkgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZUd0ay5oCisrKyBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZUd0ay5oCkBAIC0zMSw4ICszMSw4IEBA CiAKICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0ZGVmaW5lcy5oPgogI2luY2x1ZGUgPEphdmFTY3Jp cHRDb3JlL0pTQmFzZS5oPgotCiAjaW5jbHVkZSA8Z2xpYi5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0 L0NTdHJpbmcuaD4KIAogZXh0ZXJuIFdlYktpdFdlYkZyYW1lKiBtYWluRnJhbWU7CiBleHRlcm4g V2ViS2l0V2ViRnJhbWUqIHRvcExvYWRpbmdGcmFtZTsKQEAgLTQxLDUgKzQxLDYgQEAgZXh0ZXJu IGJvb2wgd2FpdEZvclBvbGljeTsKIGV4dGVybiBHU0xpc3QqIHdlYlZpZXdMaXN0OwogCiBnY2hh ciogSlNTdHJpbmdDb3B5VVRGOENTdHJpbmcoSlNTdHJpbmdSZWYganNTdHJpbmcpOworQ1N0cmlu ZyBnZXRUb3BMZXZlbFBhdGgoKTsKIAogI2VuZGlmIC8vIER1bXBSZW5kZXJUcmVlR3RrX2gKZGlm ZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJvbGxlckd0 ay5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvTGF5b3V0VGVzdENvbnRyb2xsZXJHdGsu Y3BwCmluZGV4IDQ1NTc1OGRiMWI5ZWM1MGYwOTQ2NjlmNzg1ZTYzMmY2ZTNlMzEyOGIuLjg2OTE1 ZTk1OWMzNjYyZTQ0YTJmOWQzM2QwOThkNjY0NmYyNDBhMDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJvbGxlckd0ay5jcHAKKysrIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvZ3RrL0xheW91dFRlc3RDb250cm9sbGVyR3RrLmNwcApAQCAtMjAxLDgg KzIwMSwxMyBAQCB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpub3RpZnlEb25lKCkKIAogSlNT dHJpbmdSZWYgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdGhUb0xvY2FsUmVzb3VyY2UoSlNDb250 ZXh0UmVmIGNvbnRleHQsIEpTU3RyaW5nUmVmIHVybCkKIHsKLSAgICAvLyBGdW5jdGlvbiBpbnRy b2R1Y2VkIGluIHIyODY5MC4gVGhpcyBtYXkgbmVlZCBzcGVjaWFsLWNhc2luZyBvbiBXaW5kb3dz LgotICAgIHJldHVybiBKU1N0cmluZ1JldGFpbih1cmwpOyAvLyBEbyBub3RoaW5nIG9uIFVuaXgu CisgICAgR093blB0cjxjaGFyPiB1cmxDU3RyaW5nKEpTU3RyaW5nQ29weVVURjhDU3RyaW5nKHVy bCkpOworICAgIGlmICghZ19zdHJfaGFzX3ByZWZpeCh1cmxDU3RyaW5nLmdldCgpLCAiZmlsZTov Ly90bXAvTGF5b3V0VGVzdHMvIikpCisgICAgICAgIHJldHVybiB1cmw7CisKKyAgICBjb25zdCBj aGFyKiBsYXlvdXRUZXN0c1N1ZmZpeCA9IHVybENTdHJpbmcuZ2V0KCkgKyBzdHJsZW4oImZpbGU6 Ly8vdG1wLyIpOworICAgIEdPd25QdHI8Y2hhcj4gdGVzdFBhdGgoZ19idWlsZF9maWxlbmFtZShn ZXRUb3BMZXZlbFBhdGgoKS5kYXRhKCksIGxheW91dFRlc3RzU3VmZml4KSk7CisgICAgcmV0dXJu IEpTU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHRlc3RQYXRoLmdldCgpKTsKIH0KIAogdm9p ZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cXVldWVMb2FkKEpTU3RyaW5nUmVmIHVybCwgSlNTdHJp bmdSZWYgdGFyZ2V0KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9ndGsucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2d0ay5weQppbmRleCBhM2M1NTU2NjZkMzFhNzI1YzVkZjg0OWE2ZWRlNmMyNTViOGFmMmQz Li5kMDVkZGE5ODU1YTU0MzI2NWQ0MjlkNjM4ZGJlYTJmMjYyYzlkN2IyIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQpAQCAtOTMsNyArOTMs NyBAQCBjbGFzcyBHdGtQb3J0KFdlYktpdFBvcnQpOgogICAgICAgICBlbnZpcm9ubWVudFsnVEVT VF9SVU5ORVJfSU5KRUNURURfQlVORExFX0ZJTEVOQU1FJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdM aWJyYXJpZXMnLCAnbGliVGVzdFJ1bm5lckluamVjdGVkQnVuZGxlLmxhJykKICAgICAgICAgZW52 aXJvbm1lbnRbJ1RFU1RfUlVOTkVSX1RFU1RfUExVR0lOX1BBVEgnXSA9IHNlbGYuX2J1aWxkX3Bh dGgoJ1Rlc3ROZXRzY2FwZVBsdWdpbicsICcubGlicycpCiAgICAgICAgIGVudmlyb25tZW50WydX RUJLSVRfSU5TUEVDVE9SX1BBVEgnXSA9IHNlbGYuX2J1aWxkX3BhdGgoJ1Byb2dyYW1zJywgJ3Jl c291cmNlcycsICdpbnNwZWN0b3InKQotICAgICAgICBlbnZpcm9ubWVudFsnV0VCS0lUX1RFU1Rf Rk9OVFMnXSA9IHNlbGYuX2J1aWxkX3BhdGgoJy4uJywgJ0RlcGVuZGVuY2llcycsICdSb290Jywg J3dlYmtpdGd0ay10ZXN0LWZvbnRzJykKKyAgICAgICAgZW52aXJvbm1lbnRbJ1dFQktJVF9UT1Bf TEVWRUwnXSA9IHNlbGYuX2NvbmZpZy53ZWJraXRfYmFzZV9kaXIoKQogICAgICAgICByZXR1cm4g ZW52aXJvbm1lbnQKIAogICAgIGRlZiBfZ2VuZXJhdGVfYWxsX3Rlc3RfY29uZmlndXJhdGlvbnMo c2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L2d0ay9BY3RpdmF0ZUZvbnRzR3RrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwCmluZGV4IGNmMzljZDY3YjgwZDg3ZGZj MDYwZGY0NjNjNzRhYTMyNmFmZGU3ZDIuLmM5N2NhOTI4ZjM1MWExNjQ1OTQ0ZWJhMzE2NzhlMDNh OGIxZTMzODUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwCkBAIC01Miw2ICs1MiwyMCBA QCB2b2lkIGluaXRpYWxpemVHdGtTZXR0aW5ncygpCiAgICAgICAgICAgICAgICAgICJndGsteGZ0 LXJnYmEiLCAibm9uZSIsIE5VTEwpOwogfQogCitzdGF0aWMgQ1N0cmluZyBnZXRUb3BMZXZlbFBh dGgoKQoreworICAgIGlmIChjb25zdCBjaGFyKiB0b3BMZXZlbERpcmVjdG9yeSA9IGdfZ2V0ZW52 KCJXRUJLSVRfVE9QX0xFVkVMIikpCisgICAgICAgIHJldHVybiB0b3BMZXZlbERpcmVjdG9yeTsK KworICAgIC8vIElmIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSB3YXNuJ3QgcHJvdmlkZWQgdGhl biBhc3N1bWUgd2Ugd2VyZSBidWlsdCBpbnRvCisgICAgLy8gV2ViS2l0QnVpbGQvRGVidWcgb3Ig V2ViS2l0QnVpbGQvUmVsZWFzZS4gT2J2aW91c2x5IHRoaXMgd2lsbCBmYWlsIGlmIHRoZSBidWls ZAorICAgIC8vIGRpcmVjdG9yeSBpcyBub24tc3RhbmRhcmQsIGJ1dCB3ZSBjYW4ndCBkbyBtdWNo IG1vcmUgYWJvdXQgdGhpcy4KKyAgICBHT3duUHRyPGNoYXI+IHBhcmVudFBhdGgoZ19wYXRoX2dl dF9kaXJuYW1lKGdldEN1cnJlbnRFeGVjdXRhYmxlUGF0aCgpLmRhdGEoKSkpOworICAgIEdPd25Q dHI8Y2hhcj4gbGF5b3V0VGVzdHNQYXRoKGdfYnVpbGRfZmlsZW5hbWUocGFyZW50UGF0aC5nZXQo KSwgIi4uIiwgIi4uIiwgIi4uIiwgTlVMTCkpOworICAgIEdPd25QdHI8Y2hhcj4gYWJzb2x1dGVU b3BMZXZlbFBhdGgocmVhbHBhdGgobGF5b3V0VGVzdHNQYXRoLmdldCgpLCAwKSk7CisgICAgcmV0 dXJuIGFic29sdXRlVG9wTGV2ZWxQYXRoLmdldCgpOworfQorCiB2b2lkIGluaXRpdGlhbGl6ZUZv bnRDb25maWdTZXR0aW5nKCkKIHsKICAgICBGY0luaXQoKTsKQEAgLTcyLDIyICs4NiwxOCBAQCB2 b2lkIGluaXRpdGlhbGl6ZUZvbnRDb25maWdTZXR0aW5nKCkKICAgICBpZiAoIUZjQ29uZmlnUGFy c2VBbmRMb2FkKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxGY0NoYXI4Kj4oZm9udENvbmZpZ0Zp bGVuYW1lLmdldCgpKSwgdHJ1ZSkpCiAgICAgICAgIGdfZXJyb3IoIkNvdWxkbid0IGxvYWQgZm9u dCBjb25maWd1cmF0aW9uIGZpbGUgZnJvbTogJXMiLCBmb250Q29uZmlnRmlsZW5hbWUuZ2V0KCkp OwogCi0gICAgQ1N0cmluZyBmb250c1BhdGggPSBnX2dldGVudigiV0VCS0lUX1RFU1RfRk9OVFMi KTsKLSAgICBpZiAoZm9udHNQYXRoLmlzTnVsbCgpKSB7Ci0gICAgICAgIEdPd25QdHI8Y2hhcj4g cGFyZW50UGF0aChnX3BhdGhfZ2V0X2Rpcm5hbWUoZ2V0Q3VycmVudEV4ZWN1dGFibGVQYXRoKCku ZGF0YSgpKSk7Ci0gICAgICAgIEdPd25QdHI8Y2hhcj4gYWx0ZXJuYXRlUGF0aChnX2J1aWxkX2Zp bGVuYW1lKHBhcmVudFBhdGguZ2V0KCksICIuLiIsICIuLiIsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJEZXBlbmRlbmNpZXMiLCAiUm9vdCIs ICJ3ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKLSAgICAgICAgZm9udHNQYXRoID0gYWx0 ZXJuYXRlUGF0aC5nZXQoKTsKLSAgICAgICAgaWYgKCFnX2ZpbGVfdGVzdChhbHRlcm5hdGVQYXRo LmdldCgpLCBzdGF0aWNfY2FzdDxHRmlsZVRlc3Q+KEdfRklMRV9URVNUX0VYSVNUUyB8IEdfRklM RV9URVNUX0lTX0RJUikpKQotICAgICAgICAgICAgZ19lcnJvcigiV0VCS0lUX1RFU1RfRk9OVFMg ZW52aXJvbm1lbnQgdmFyaWFibGUgbm90IHNldCBhbmQgJXMgZG9lcyBub3QgZXhpc3QiLCBhbHRl cm5hdGVQYXRoLmdldCgpKTsKLSAgICB9CisgICAgQ1N0cmluZyB0b3BMZXZlbFBhdGggPSBnZXRU b3BMZXZlbFBhdGgoKTsKKyAgICBHT3duUHRyPGNoYXI+IGZvbnRzUGF0aChnX2J1aWxkX2ZpbGVu YW1lKHRvcExldmVsUGF0aC5kYXRhKCksICJXZWJLaXRCdWlsZCIsICJEZXBlbmRlbmNpZXMiLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlJvb3QiLCAid2Vi a2l0Z3RrLXRlc3QtZm9udHMiLCBOVUxMKSk7CisgICAgaWYgKCFnX2ZpbGVfdGVzdChmb250c1Bh dGguZ2V0KCksIHN0YXRpY19jYXN0PEdGaWxlVGVzdD4oR19GSUxFX1RFU1RfRVhJU1RTIHwgR19G SUxFX1RFU1RfSVNfRElSKSkpCisgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBsb2NhdGUgdGVz dCBmb250cyBhdCAlcy4gSXMgV0VCS0lUX1RPUF9MRVZFTCBzZXQ/IiwgZm9udHNQYXRoLmdldCgp KTsKIAogICAgIEdPd25QdHI8R0Vycm9yPiBlcnJvcjsKLSAgICBHT3duUHRyPEdEaXI+IGZvbnRz RGlyZWN0b3J5KGdfZGlyX29wZW4oZm9udHNQYXRoLmRhdGEoKSwgMCwgJmVycm9yLm91dFB0cigp KSk7CisgICAgR093blB0cjxHRGlyPiBmb250c0RpcmVjdG9yeShnX2Rpcl9vcGVuKGZvbnRzUGF0 aC5nZXQoKSwgMCwgJmVycm9yLm91dFB0cigpKSk7CiAgICAgd2hpbGUgKGNvbnN0IGNoYXIqIGRp cmVjdG9yeUVudHJ5ID0gZ19kaXJfcmVhZF9uYW1lKGZvbnRzRGlyZWN0b3J5LmdldCgpKSkgewog ICAgICAgICBpZiAoIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIudHRmIikgJiYg IWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIub3RmIikpCiAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgR093blB0cjxnY2hhcj4gZm9udFBhdGgoZ19idWlsZF9maWxlbmFt ZShmb250c1BhdGguZGF0YSgpLCBkaXJlY3RvcnlFbnRyeSwgTlVMTCkpOworICAgICAgICBHT3du UHRyPGdjaGFyPiBmb250UGF0aChnX2J1aWxkX2ZpbGVuYW1lKGZvbnRzUGF0aC5nZXQoKSwgZGly ZWN0b3J5RW50cnksIE5VTEwpKTsKICAgICAgICAgaWYgKCFGY0NvbmZpZ0FwcEZvbnRBZGRGaWxl KGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4oZm9udFBhdGguZ2V0KCkp KSkKICAgICAgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBsb2FkIGZvbnQgYXQgJXMhIiwgZm9u dFBhdGguZ2V0KCkpOwogICAgIH0K