82466 2012-03-28 07:19:10 -0700 Use xcrun to find nm and ranlib on OS X builds 2012-03-28 13:14:25 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 80915 1 ddkilzer ddkilzer mitz mrowe oldest_to_newest 589934 0 ddkilzer 2012-03-28 07:19:10 -0700 When running build-webkit, we should use xcrun to find the nm(1) and ranlib(1) commands on OS X. 589950 1 134292 ddkilzer 2012-03-28 07:40:36 -0700 Created attachment 134292 Patch 590082 2 134292 mitz 2012-03-28 10:14:32 -0700 Comment on attachment 134292 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134292&action=review > Tools/Scripts/webkitperl/features.pm:57 > +sub nmPath() > +{ > + if (isAppleMacWebKit()) { > + my $nm = `xcrun -find nm`; > + chomp $nm; > + return $nm if $nm; > + } > + return "nm"; > +} Should this function cache the result? Probably doesn’t matter if we run nm only on libraries, but could matter if we run it on every new .o file. 590113 3 134330 ddkilzer 2012-03-28 10:37:58 -0700 Created attachment 134330 Patch 590116 4 ddkilzer 2012-03-28 10:39:22 -0700 (In reply to comment #3) > Created an attachment (id=134330) [details] > Patch ChangeLog: - Moved nmPath() to webkitdirs.pm so check-for-global-initializers could use it later. - Cache result of nmPath(). - Moved $ranlib out of the foreach loop in build-webkit. 590131 5 134330 mitz 2012-03-28 10:51:31 -0700 Comment on attachment 134330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134330&action=review > Tools/Scripts/webkitdirs.pm:1312 > +sub determineNMPath() I don’t know why the M is uppercase :-) 590317 6 ddkilzer 2012-03-28 13:03:34 -0700 (In reply to comment #5) > (From update of attachment 134330 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=134330&action=review > > > Tools/Scripts/webkitdirs.pm:1312 > > +sub determineNMPath() > > I don’t know why the M is uppercase :-) My Shift key was stuck?! :) Fixed. 590329 7 ddkilzer 2012-03-28 13:14:25 -0700 Committed r112431: <http://trac.webkit.org/changeset/112431> 134292 2012-03-28 07:40:36 -0700 2012-03-28 10:37:55 -0700 Patch bug-82466-20120328074035.patch text/plain 3124 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMjAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTg3YWEwMDA4YjEzNTdmNTQ2ZWE4MGUxMzZkMGQ4OTQ3 YmQyYjQ2Zi4uNDJlMTMwN2NmZDEwZGZmMjRhN2RmMzNlNjc2OWM2OTJkYTQxNmY3YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTAzLTI4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgVXNlIHhjcnVuIHRvIGZpbmQgbm0gYW5kIHJhbmxpYiBvbiBPUyBYIGJ1aWxkcworICAg ICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi84MjQ2Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OiBVc2UgeGNy dW4gdG8gZmluZCByYW5saWIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRwZXJsL2ZlYXR1cmVz LnBtOgorICAgICAgICAobm1QYXRoKTogQWRkZWQuICBVc2UgeGNydW4gdG8gZmluZCBubSBvbiBP UyBYLgorICAgICAgICAobGlicmFyeUNvbnRhaW5zU3ltYm9sKTogVXNlIG5tUGF0aCgpLgorCiAy MDEyLTAzLTI2ICBTY290dCBCeWVyICA8c2NvdHRieWVyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBFbmFibGUgbGF5b3V0IHRlc3Rpbmcgb2YgdGhlIHNjcm9sbCBhbmltYXRvci4KZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQKaW5kZXggZmFlMWNlNDM0ZmM0ZGI1MmQ1ODM0OThmZGEyNWZlMmM0ODdjYzExNS4uNTFmOWE2 MWEyODQ5ZmMzMmE0MjNjNDk2MGU3MGMzZDY3OGQ0YTEwNCAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy9idWlsZC13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAgLTEs NiArMSw2IEBACiAjIS91c3IvYmluL3BlcmwgLXcKIAotIyBDb3B5cmlnaHQgKEMpIDIwMDUsIDIw MDYsIDIwMDcsIDIwMDgsIDIwMDksIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorIyBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYsIDIwMDcsIDIwMDgsIDIwMDksIDIwMTAsIDIw MTEsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMp IDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChDKSAy MDEwIG1vaWppLW1vYmlsZS5jb20gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChD KSAyMDExIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgpA QCAtNTYxLDcgKzU2MSw5IEBAIGlmIChpc0d0aygpKSB7CiAgICAgICAgIGlmICghLWUgJGxpYiB8 fCAtTSAkbGliID4gLU0gJHNyY0xpYikgewogICAgICAgICAgICAgcHJpbnQgIlVwZGF0aW5nICRs aWJcbiI7CiAgICAgICAgICAgICBzeXN0ZW0gImRpdHRvIiwgJHNyY0xpYiwgJGxpYjsKLSAgICAg ICAgICAgIHN5c3RlbSAicmFubGliIiwgJGxpYjsKKyAgICAgICAgICAgIG15ICRyYW5saWIgPSBg eGNydW4gLWZpbmQgcmFubGliYDsKKyAgICAgICAgICAgIGNob21wICRyYW5saWI7CisgICAgICAg ICAgICBzeXN0ZW0gJHJhbmxpYiwgJGxpYjsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL2ZlYXR1cmVzLnBtIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRwZXJsL2ZlYXR1cmVzLnBtCmluZGV4IDFkZjU2NDA1YjgyMmMwYzdjMjY0YmRiZTIyMGVm MzQ3NDZhZjIyNjMuLmY2MWNkYzNhODRhNWE5NzljZGI2YzJjNjk3ZGIwMzllMzg3NGRlZDQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9mZWF0dXJlcy5wbQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHBlcmwvZmVhdHVyZXMucG0KQEAgLTEsNCArMSw0IEBACi0jIENvcHly aWdodCAoQykgMjAwNSwgMjAwNiwgMjAwNywgMjAwOCwgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQKKyMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5 LCAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZAogIyBDb3B5cmlnaHQgKEMpIDIw MDYgQWxleGV5IFByb3NrdXJ5YWtvdiAoYXBAbnlwb3AuY29tKQogIyBDb3B5cmlnaHQgKEMpIDIw MTAgQW5kcmFzIEJlY3NpIChhYmVjc2lAaW5mLnUtc3plZ2VkLmh1KSwgVW5pdmVyc2l0eSBvZiBT emVnZWQKICMKQEAgLTMxLDYgKzMxLDEwIEBACiB1c2Ugc3RyaWN0OwogdXNlIHdhcm5pbmdzOwog Cit1c2UgRmluZEJpbjsKK3VzZSBsaWIgJEZpbmRCaW46OkJpbjsKK3VzZSB3ZWJraXRkaXJzOwor CiBCRUdJTiB7CiAgICB1c2UgRXhwb3J0ZXIgICAoKTsKICAgIG91ciAoJFZFUlNJT04sIEBJU0Es IEBFWFBPUlQsIEBFWFBPUlRfT0ssICVFWFBPUlRfVEFHUyk7CkBAIC00Miw2ICs0NiwxNiBAQCBC RUdJTiB7CiAgICBARVhQT1JUX09LICAgPSAoKTsKIH0KIAorc3ViIG5tUGF0aCgpCit7CisgICAg aWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgeworICAgICAgICBteSAkbm0gPSBgeGNydW4gLWZpbmQg bm1gOworICAgICAgICBjaG9tcCAkbm07CisgICAgICAgIHJldHVybiAkbm0gaWYgJG5tOworICAg IH0KKyAgICByZXR1cm4gIm5tIjsKK30KKwogc3ViIGxpYnJhcnlDb250YWluc1N5bWJvbCgkJCkK IHsKICAgICBteSAoJHBhdGgsICRzeW1ib2wpID0gQF87CkBAIC01Myw3ICs2Nyw3IEBAIHN1YiBs aWJyYXJ5Q29udGFpbnNTeW1ib2woJCQpCiAKICAgICBteSAkZm91bmRTeW1ib2wgPSAwOwogICAg IGlmICgtZSAkcGF0aCkgewotICAgICAgICBvcGVuIE5NLCAiLXwiLCAibm0iLCAkcGF0aCBvciBk aWU7CisgICAgICAgIG9wZW4gTk0sICItfCIsIG5tUGF0aCgpLCAkcGF0aCBvciBkaWU7CiAgICAg ICAgIHdoaWxlICg8Tk0+KSB7CiAgICAgICAgICAgICAkZm91bmRTeW1ib2wgPSAxIGlmIC8kc3lt Ym9sLzsgIyBGSVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgY2hlY2sgZm9yIHdvcmQgYm91bmRh cmllcyBiZWZvcmUvYWZ0ZXIgdGhlIHN5bWJvbCBuYW1lLgogICAgICAgICB9Cg== 134330 2012-03-28 10:37:58 -0700 2012-03-28 10:51:31 -0700 Patch bug-82466-20120328103757.patch text/plain 4458 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMjAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTg3YWEwMDA4YjEzNTdmNTQ2ZWE4MGUxMzZkMGQ4OTQ3 YmQyYjQ2Zi4uNDg2YmVjMDgwYzIyOWQxNzMxM2MyOTQ5NTc5YjFmMDE2MmY2MDJlNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTAzLTI4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgVXNlIHhjcnVuIHRvIGZpbmQgbm0gYW5kIHJhbmxpYiBvbiBPUyBYIGJ1aWxkcworICAg ICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi84MjQ2Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OiBVc2UgeGNy dW4gdG8gZmluZCByYW5saWIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lTk1QYXRoKTogQWRkZWQuICBVc2UgeGNydW4gdG8gZmluZCBubSBvbiBP UyBYLgorICAgICAgICAobm1QYXRoKTogQWRkZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw ZXJsL2ZlYXR1cmVzLnBtOgorICAgICAgICAobGlicmFyeUNvbnRhaW5zU3ltYm9sKTogVXNlIG5t UGF0aCgpLgorCiAyMDEyLTAzLTI2ICBTY290dCBCeWVyICA8c2NvdHRieWVyQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBFbmFibGUgbGF5b3V0IHRlc3Rpbmcgb2YgdGhlIHNjcm9sbCBhbmltYXRv ci4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0 cy9idWlsZC13ZWJraXQKaW5kZXggZmFlMWNlNDM0ZmM0ZGI1MmQ1ODM0OThmZGEyNWZlMmM0ODdj YzExNS4uZDEwMmE0YWM2YTY0MWYwNjQ2MGNhNGRhNzA4YWYxZGQ2ZTRjZGVkYSAxMDA3NTUKLS0t IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQKQEAgLTEsNiArMSw2IEBACiAjIS91c3IvYmluL3BlcmwgLXcKIAotIyBDb3B5cmlnaHQg KEMpIDIwMDUsIDIwMDYsIDIwMDcsIDIwMDgsIDIwMDksIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYsIDIwMDcsIDIwMDgsIDIw MDksIDIwMTAsIDIwMTEsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBD b3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29w eXJpZ2h0IChDKSAyMDEwIG1vaWppLW1vYmlsZS5jb20gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMg Q29weXJpZ2h0IChDKSAyMDExIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRz IHJlc2VydmVkLgpAQCAtNTU1LDEzICs1NTUsMTYgQEAgaWYgKGlzR3RrKCkpIHsKICAgICAgICAg ImxpYldlYktpdFN5c3RlbUludGVyZmFjZUxpb24uYSIsCiAgICAgICAgICJsaWJXZWJDb3JlU1FM aXRlMy5hIiwKICAgICApOworCisgICAgbXkgJHJhbmxpYiA9IGB4Y3J1biAtZmluZCByYW5saWJg OworICAgIGNob21wICRyYW5saWI7CiAgICAgZm9yZWFjaCBteSAkbGliTmFtZSAoQGxpYnJhcmll c1RvQ29weSkgewogICAgICAgICBteSAkc3JjTGliID0gIldlYktpdExpYnJhcmllcy8iIC4gJGxp Yk5hbWU7CiAgICAgICAgIG15ICRsaWIgPSAiJHByb2R1Y3REaXIvIiAuICRsaWJOYW1lOwogICAg ICAgICBpZiAoIS1lICRsaWIgfHwgLU0gJGxpYiA+IC1NICRzcmNMaWIpIHsKICAgICAgICAgICAg IHByaW50ICJVcGRhdGluZyAkbGliXG4iOwogICAgICAgICAgICAgc3lzdGVtICJkaXR0byIsICRz cmNMaWIsICRsaWI7Ci0gICAgICAgICAgICBzeXN0ZW0gInJhbmxpYiIsICRsaWI7CisgICAgICAg ICAgICBzeXN0ZW0gJHJhbmxpYiwgJGxpYjsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IDU3NjlhZDNiMGE4MzJhMzNmZWU5OWU5OGQ5NzE1NjVkOTdmMzU4ZmUuLjY4Y2Yz Mjc0ZGQ2OWIxZDFhYzYwZTE1YmNjNTg2OTM2YjBiYWM3ZDkgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTEsNCArMSw0IEBACi0jIENvcHlyaWdodCAoQykgMjAwNSwgMjAwNiwgMjAwNywgMjAxMCwgMjAx MiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAwNSwg MjAwNiwgMjAwNywgMjAxMCwgMjAxMSwgMjAxMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAjIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogIyBDb3B5cmlnaHQgKEMpIDIwMTEgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAjCkBAIC01Niw2ICs1Niw3IEBAIEJFR0lOIHsKICAgICAgICAmY21h a2VCYXNlZFBvcnROYW1lCiAgICAgICAgJmN1cnJlbnRTVk5SZXZpc2lvbgogICAgICAgICZkZWJ1 Z1NhZmFyaQorICAgICAgICZubVBhdGgKICAgICAgICAmcGFzc2VkQ29uZmlndXJhdGlvbgogICAg ICAgICZwcmludEhlbHBBbmRFeGl0Rm9yUnVuQW5kRGVidWdXZWJLaXRBcHBJZk5lZWRlZAogICAg ICAgICZwcm9kdWN0RGlyCkBAIC04MSw2ICs4Miw3IEBAIG15ICRjb25maWd1cmF0aW9uRm9yVmlz dWFsU3R1ZGlvOwogbXkgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyOwogbXkgJHNvdXJjZURpcjsK IG15ICRjdXJyZW50U1ZOUmV2aXNpb247CitteSAkbm1QYXRoOwogbXkgJG9zWFZlcnNpb247CiBt eSAkZ2VuZXJhdGVEc3ltOwogbXkgJGlzUXQ7CkBAIC0xMzA3LDYgKzEzMDksMjMgQEAgc3ViIGlz UGVyaWFuSW5zdGFsbGVkKCkKICAgICByZXR1cm4gMDsKIH0KIAorc3ViIGRldGVybWluZU5NUGF0 aCgpCit7CisgICAgcmV0dXJuIGlmICRubVBhdGg7CisKKyAgICBpZiAoaXNBcHBsZU1hY1dlYktp dCgpKSB7CisgICAgICAgICRubVBhdGggPSBgeGNydW4gLWZpbmQgbm1gOworICAgICAgICBjaG9t cCAkbm1QYXRoOworICAgIH0KKyAgICAkbm1QYXRoID0gIm5tIiBpZiAhJG5tUGF0aDsKK30KKwor c3ViIG5tUGF0aCgpCit7CisgICAgZGV0ZXJtaW5lTk1QYXRoKCk7CisgICAgcmV0dXJuICRubVBh dGg7Cit9CisKIHN1YiBkZXRlcm1pbmVPU1hWZXJzaW9uKCkKIHsKICAgICByZXR1cm4gaWYgJG9z WFZlcnNpb247CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvZmVhdHVyZXMu cG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvZmVhdHVyZXMucG0KaW5kZXggMWRmNTY0MDVi ODIyYzBjN2MyNjRiZGJlMjIwZWYzNDc0NmFmMjI2My4uODk5MjYxOTdmNmRmZjBhZTJlNmNiYjVm ZDdmYTA4ZjQ0MTk1ODUzOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL2Zl YXR1cmVzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9mZWF0dXJlcy5wbQpAQCAt MSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZAorIyBDb3B5cmlnaHQgKEMpIDIwMDUsIDIw MDYsIDIwMDcsIDIwMDgsIDIwMDksIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk CiAjIENvcHlyaWdodCAoQykgMjAwNiBBbGV4ZXkgUHJvc2t1cnlha292IChhcEBueXBvcC5jb20p CiAjIENvcHlyaWdodCAoQykgMjAxMCBBbmRyYXMgQmVjc2kgKGFiZWNzaUBpbmYudS1zemVnZWQu aHUpLCBVbml2ZXJzaXR5IG9mIFN6ZWdlZAogIwpAQCAtMzEsNiArMzEsMTAgQEAKIHVzZSBzdHJp Y3Q7CiB1c2Ugd2FybmluZ3M7CiAKK3VzZSBGaW5kQmluOwordXNlIGxpYiAkRmluZEJpbjo6Qmlu OwordXNlIHdlYmtpdGRpcnM7CisKIEJFR0lOIHsKICAgIHVzZSBFeHBvcnRlciAgICgpOwogICAg b3VyICgkVkVSU0lPTiwgQElTQSwgQEVYUE9SVCwgQEVYUE9SVF9PSywgJUVYUE9SVF9UQUdTKTsK QEAgLTUzLDcgKzU3LDcgQEAgc3ViIGxpYnJhcnlDb250YWluc1N5bWJvbCgkJCkKIAogICAgIG15 ICRmb3VuZFN5bWJvbCA9IDA7CiAgICAgaWYgKC1lICRwYXRoKSB7Ci0gICAgICAgIG9wZW4gTk0s ICItfCIsICJubSIsICRwYXRoIG9yIGRpZTsKKyAgICAgICAgb3BlbiBOTSwgIi18Iiwgbm1QYXRo KCksICRwYXRoIG9yIGRpZTsKICAgICAgICAgd2hpbGUgKDxOTT4pIHsKICAgICAgICAgICAgICRm b3VuZFN5bWJvbCA9IDEgaWYgLyRzeW1ib2wvOyAjIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJs eSBjaGVjayBmb3Igd29yZCBib3VuZGFyaWVzIGJlZm9yZS9hZnRlciB0aGUgc3ltYm9sIG5hbWUu CiAgICAgICAgIH0K