116339 2013-05-17 12:02:05 -0700 Add --sdk flag to jsDriver.pl to allow running in the iOS simulator 2013-05-30 18:46:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac Other RESOLVED FIXED P2 Enhancement --- 1 dfarler dfarler ddkilzer gyuyoung.kim oldest_to_newest 890563 0 dfarler 2013-05-17 12:02:05 -0700 In order to run jsc in the simulator without altering the environment, add an --sdk flag to prefix the jsc command with xcrun -sdk $sdk sim. 892398 1 202577 dfarler 2013-05-22 11:09:35 -0700 Created attachment 202577 Patch 892490 2 202577 joepeck 2013-05-22 12:32:22 -0700 Comment on attachment 202577 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202577&action=review r=me > Source/JavaScriptCore/tests/mozilla/jsDriver.pl:68 > +my $opt_sim_sdk = ''; I think our style is double quoted strings in perl. Here and else where. I'm not sure how strict that is, I don't mind seeing either. 892622 3 202634 dfarler 2013-05-22 18:07:42 -0700 Created attachment 202634 Patch Needs a chomp around the shell call because Perl. 892628 4 202635 dfarler 2013-05-22 18:24:53 -0700 Created attachment 202635 Patch sim needs --adopt-pid to have the correct return code from the forked process 893056 5 202635 ddkilzer 2013-05-23 15:03:40 -0700 Comment on attachment 202635 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202635&action=review r- to fix the --adopt-pid issue. > Source/JavaScriptCore/ChangeLog:3 > + --sdk option to jsDriver.pl to run with iOS Simulator What happened to "Add" in the title here? :) > Source/JavaScriptCore/tests/mozilla/jsDriver.pl:180 > + chomp($shell_command = `xcrun -sdk $opt_sim_sdk -find sim`) if $opt_sim_sdk; > + $shell_command .= " --adopt-pid "; I think both of these need to be inside an if ($opt_sim_sdk) check since --adopt-pid only makes sense when using the sim tool: if ($opt_sim_sdk) { chomp($shell_command = `xcrun -sdk $opt_sim_sdk -find sim`); $shell_command .= " --adopt-pid "; } 893057 6 dfarler 2013-05-23 15:08:47 -0700 (In reply to comment #5) > (From update of attachment 202635 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=202635&action=review > > r- to fix the --adopt-pid issue. > > > Source/JavaScriptCore/ChangeLog:3 > > + --sdk option to jsDriver.pl to run with iOS Simulator > > What happened to "Add" in the title here? :) Fixed! > > > Source/JavaScriptCore/tests/mozilla/jsDriver.pl:180 > > + chomp($shell_command = `xcrun -sdk $opt_sim_sdk -find sim`) if $opt_sim_sdk; > > + $shell_command .= " --adopt-pid "; > > I think both of these need to be inside an if ($opt_sim_sdk) check since --adopt-pid only makes sense when using the sim tool: > > if ($opt_sim_sdk) { > chomp($shell_command = `xcrun -sdk $opt_sim_sdk -find sim`); > $shell_command .= " --adopt-pid "; > } D’oh. Dumb mistake - that’s what I meant, I’m sure. :) 893058 7 202743 dfarler 2013-05-23 15:09:14 -0700 Created attachment 202743 Patch 894488 8 202743 ddkilzer 2013-05-28 13:39:30 -0700 Comment on attachment 202743 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202743&action=review r=me with some minor fixes to avoid warnings and unnecessary checks. > Source/JavaScriptCore/tests/mozilla/jsDriver.pl:180 > + chomp($shell_command = `xcrun -sdk $opt_sim_sdk -find sim`) if $opt_sim_sdk; You don't need the " if $opt_sim_sdk;" here now that it's inside the if block. > Source/JavaScriptCore/tests/mozilla/jsDriver.pl:184 > + $shell_command .= " $opt_arch "; If $opt_sim_sdk is not set, we now have a space at the beginning of $shell_command, and I think $shell_command will be undef here (so we'll get a warning about appending a string to undef). You might consider just adding an else block to the if ($opt_sim_sdk) above to initialize $shell_command to the empty string: } else { $shell_command = ""; } Then you can change this line to: $shell_command .= "$opt_arch "; 895743 9 dfarler 2013-05-30 17:16:17 -0700 Committed r150994: <http://trac.webkit.org/changeset/150994> 895757 10 gyuyoung.kim 2013-05-30 18:28:10 -0700 jscore test has been broken r150994. http://build.webkit.org/builders/EFL%20Linux%2064-bit%20Release%20WK1/builds/31 895760 11 dfarler 2013-05-30 18:46:22 -0700 Fix committed: r150998 Reviewed by Joe Pecoraro. 202577 2013-05-22 11:09:35 -0700 2013-05-22 18:07:39 -0700 Patch bug-116339-20130522110822.patch text/plain 3236 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZmNmNWMzZmMwNTU2YTZhYTc1NzQ5NTQwOWNiYmMwMDE3OTE3NzA3Li5hNDAzZWNkMzJkZjI5Yjcy ZDM5ZTQzMTAwMGMwMmY3ZGJmZjEwZDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMy0wNS0yMiAgRGF2aWQgRmFybGVyICA8ZGZhcmxlckBhcHBsZS5jb20+ CisKKyAgICAgICAgLS1zZGsgb3B0aW9uIHRvIGpzRHJpdmVyLnBsIHRvIHJ1biB3aXRoIGlPUyBT aW11bGF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExNjMzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogdGVzdHMvbW96aWxsYS9qc0RyaXZlci5wbDoKKyAgICAgICAgKGV4ZWN1dGVfdGVzdHMpOgor ICAgICAgICBQcmVmaXggc2hlbGwgY29tbWFuZCB3aXRoIHRoZSBwYXRoIHRvIHRoZSAic2ltIiB0 b29sLgorICAgICAgICAocGFyc2VfYXJncyk6CisgICAgICAgIEFkZCAtZCAvIC0tc2RrIG9wdGlv bi4KKyAgICAgICAgKHVzYWdlKToKKyAgICAgICAgSGVscCBtZXNzYWdlIGZvciAtZCAvIC0tc2Rr IG9wdGlvbi4KKwogMjAxMy0wNS0yMiAgSnVsaWVuIEJyaWFuY2VhdSAgPGpicmlhbmNlYXVAbmRz LmNvbT4KIAogICAgICAgICBbc2g0XSBSZW1vdmUgTWFjcm9Bc3NlbWJsZXJTSDQuY3BwIGZpbGUu CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW96aWxsYS9qc0RyaXZl ci5wbCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCmlu ZGV4IDRhNzc0Y2VmZDc3OGIyM2JlZDMwYjQwYTM3MGZjNmFjMDgxNjkwOGQuLjMxMmU4NDVhNzNl NjUxMDU2ZDY5NGYxNzUyNDE4NWMwYzI5NjQyMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCkBAIC02NSw5ICs2NSwxMCBAQCBteSAkb3B0 X2NvbnNvbGVfZmFpbHVyZXMgPSAwOwogbXkgJG9wdF9seHJfdXJsID0gIi4vIjsgIyAiaHR0cDov L2x4ci5tb3ppbGxhLm9yZy9tb3ppbGxhL3NvdXJjZS9qcy90ZXN0cy8iOwogbXkgJG9wdF9leGl0 X211bmdlID0gKCRvc190eXBlIG5lICJNQUMiKSA/IDEgOiAwOwogbXkgJG9wdF9hcmNoPSAiIjsK K215ICRvcHRfc2ltX3NkayA9ICcnOwogCiAjIGNvbW1hbmQgbGluZSBvcHRpb24gZGVmaW5pdGlv bgotbXkgJG9wdGlvbnMgPSAiYT1zIGFyY2g+YSBiPXMgYnVndXJsPmIgYz1zIGNsYXNzcGF0aD5j IGU9cyBlbmdpbmU+ZSBmPXMgZmlsZT5mICIgLgorbXkgJG9wdGlvbnMgPSAiYT1zIGFyY2g+YSBi PXMgYnVndXJsPmIgYz1zIGNsYXNzcGF0aD5jIGQ9cyBzZGs+ZCBlPXMgZW5naW5lPmUgZj1zIGZp bGU+ZiAiIC4KICJoIGhlbHA+aCBpIGo9cyBqYXZhcGF0aD5qIGsgY29uZmFpbD5rIGw9cyBsaXN0 PmwgTD1zIG5lZ2xpc3Q+TCAiIC4KICJvPXMgb3B0Pm8gcD1zIHRlc3RwYXRoPnAgcz1zIHNoZWxs cGF0aD5zIHQgdHJhY2U+dCB1PXMgbHhydXJsPnUgIiAuCiAieCBub2V4aXRtdW5nZT54IjsKQEAg LTE3NSw3ICsxNzYsOSBAQCBzdWIgZXhlY3V0ZV90ZXN0cyB7CiAjIChvbmx5IGNoZWNrIGZvciB0 aGVpciBleGlzdGFuY2UgaWYgdGhlIHN1aXRlIG9yIHRlc3RfZGlyIGhhcyBjaGFuZ2VkCiAjIHNp bmNlIHRoZSBsYXN0IHRpbWUgd2UgbG9va2VkLikKICAgICAgICAgaWYgKCRsYXN0X3N1aXRlIG5l ICRzdWl0ZSB8fCAkbGFzdF90ZXN0X2RpciBuZSAkdGVzdF9kaXIpIHsKLSAgICAgICAgICAgICRz aGVsbF9jb21tYW5kID0gJG9wdF9hcmNoIC4gIiAiOworICAgICAgICAgICAgJHNoZWxsX2NvbW1h bmQgPSBgeGNydW4gLXNkayAkb3B0X3NpbV9zZGsgLWZpbmQgc2ltYCAuICcgJyBpZiAkb3B0X3Np bV9zZGs7CisKKyAgICAgICAgICAgICRzaGVsbF9jb21tYW5kIC49ICRvcHRfYXJjaCAuICIgIjsK ICAgICAgICAgICAgIAogICAgICAgICAgICAgJHNoZWxsX2NvbW1hbmQgLj0gJnhwX3BhdGgoJGVu Z2luZV9jb21tYW5kKSAgLiAiIC1zICI7CiAKQEAgLTQ0OSw2ICs0NTIsMTEgQEAgc3ViIHBhcnNl X2FyZ3MgewogICAgICAgICAgICAgJmRkICgib3B0OiBhZGRpbmcgbmVnYXRpdmUgbGlzdCAnJHZh bHVlJy4iKTsKICAgICAgICAgICAgIHB1c2ggKEBvcHRfbmVnX2xpc3RfZmlsZXMsICR2YWx1ZSk7 CiAgICAgICAgICAgICAKKyAgICAgICAgfSBlbHNpZiAoJG9wdGlvbiBlcSAiZCIpIHsKKyAgICAg ICAgICAgICRvcHRpb24gPSAnZCc7CisgICAgICAgICAgICAmZGQgKCJvcHQ6IHVzaW5nICR2YWx1 ZSBzaW11bGF0b3IgU0RLIHRvIHJ1biBqc2MuIik7CisgICAgICAgICAgICAkb3B0X3NpbV9zZGsg PSAkdmFsdWU7CisKICAgICAgICAgfSBlbHNpZiAoJG9wdGlvbiBlcSAibyIpIHsKICAgICAgICAg ICAgICRvcHRfZW5naW5lX3BhcmFtcyA9ICR2YWx1ZTsKICAgICAgICAgICAgICZkZCAoIm9wdDog c2V0dGluZyBlbmdpbmUgcGFyYW1zIHRvICckb3B0X2VuZ2luZV9wYXJhbXMnLiIpOwpAQCAtNTEx LDYgKzUxOSw3IEBAIHN1YiB1c2FnZSB7CiAgICAgICIoLWJ8LS1idWd1cmwpICAgICAgICAgICAg IEJ1Z3ppbGxhIFVSTC5cbiIgLgogICAgICAiICAgICAgICAgICAgICAgICAgICAgICAgICAoZGVm YXVsdCBpcyAkb3B0X2J1Z191cmwpXG4iIC4KICAgICAgIigtY3wtLWNsYXNzcGF0aCkgICAgICAg ICAgQ2xhc3NwYXRoIChSaGlubyBvbmx5LilcbiIgLgorICAgICAiKC1kfC0tc2RrKSAgICAgICAg ICAgICAgICBVc2UgYSBzaW11bGF0b3IgU0RLIHRvIHJ1biBqc2NcbiIgLgogICAgICAiKC1lfC0t ZW5naW5lKSA8dHlwZT4gLi4uICBTcGVjaWZ5IHRoZSB0eXBlIG9mIGVuZ2luZShzKSB0byB0ZXN0 LlxuIiAuCiAgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgIDx0eXBlPiBpcyBvbmUgb3Ig bW9yZSBvZlxuIiAuCiAgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgIChzcXVpcnJlbGZp c2h8c21vcHR8c21kZWJ1Z3xsY29wdHxsY2RlYnVnfHhwY3NoZWxsfCIgLgo= 202634 2013-05-22 18:07:42 -0700 2013-05-22 18:24:51 -0700 Patch bug-116339-20130522180629.patch text/plain 3235 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZmNmNWMzZmMwNTU2YTZhYTc1NzQ5NTQwOWNiYmMwMDE3OTE3NzA3Li5hNDAzZWNkMzJkZjI5Yjcy ZDM5ZTQzMTAwMGMwMmY3ZGJmZjEwZDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMy0wNS0yMiAgRGF2aWQgRmFybGVyICA8ZGZhcmxlckBhcHBsZS5jb20+ CisKKyAgICAgICAgLS1zZGsgb3B0aW9uIHRvIGpzRHJpdmVyLnBsIHRvIHJ1biB3aXRoIGlPUyBT aW11bGF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExNjMzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogdGVzdHMvbW96aWxsYS9qc0RyaXZlci5wbDoKKyAgICAgICAgKGV4ZWN1dGVfdGVzdHMpOgor ICAgICAgICBQcmVmaXggc2hlbGwgY29tbWFuZCB3aXRoIHRoZSBwYXRoIHRvIHRoZSAic2ltIiB0 b29sLgorICAgICAgICAocGFyc2VfYXJncyk6CisgICAgICAgIEFkZCAtZCAvIC0tc2RrIG9wdGlv bi4KKyAgICAgICAgKHVzYWdlKToKKyAgICAgICAgSGVscCBtZXNzYWdlIGZvciAtZCAvIC0tc2Rr IG9wdGlvbi4KKwogMjAxMy0wNS0yMiAgSnVsaWVuIEJyaWFuY2VhdSAgPGpicmlhbmNlYXVAbmRz LmNvbT4KIAogICAgICAgICBbc2g0XSBSZW1vdmUgTWFjcm9Bc3NlbWJsZXJTSDQuY3BwIGZpbGUu CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW96aWxsYS9qc0RyaXZl ci5wbCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCmlu ZGV4IDRhNzc0Y2VmZDc3OGIyM2JlZDMwYjQwYTM3MGZjNmFjMDgxNjkwOGQuLmI4OTQxMmY3Y2Vj NzU3NjQ5NmI2MDk0NWNjZmQ2MGExZmU4NjFmMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCkBAIC02NSw5ICs2NSwxMCBAQCBteSAkb3B0 X2NvbnNvbGVfZmFpbHVyZXMgPSAwOwogbXkgJG9wdF9seHJfdXJsID0gIi4vIjsgIyAiaHR0cDov L2x4ci5tb3ppbGxhLm9yZy9tb3ppbGxhL3NvdXJjZS9qcy90ZXN0cy8iOwogbXkgJG9wdF9leGl0 X211bmdlID0gKCRvc190eXBlIG5lICJNQUMiKSA/IDEgOiAwOwogbXkgJG9wdF9hcmNoPSAiIjsK K215ICRvcHRfc2ltX3NkayA9ICcnOwogCiAjIGNvbW1hbmQgbGluZSBvcHRpb24gZGVmaW5pdGlv bgotbXkgJG9wdGlvbnMgPSAiYT1zIGFyY2g+YSBiPXMgYnVndXJsPmIgYz1zIGNsYXNzcGF0aD5j IGU9cyBlbmdpbmU+ZSBmPXMgZmlsZT5mICIgLgorbXkgJG9wdGlvbnMgPSAiYT1zIGFyY2g+YSBi PXMgYnVndXJsPmIgYz1zIGNsYXNzcGF0aD5jIGQ9cyBzZGs+ZCBlPXMgZW5naW5lPmUgZj1zIGZp bGU+ZiAiIC4KICJoIGhlbHA+aCBpIGo9cyBqYXZhcGF0aD5qIGsgY29uZmFpbD5rIGw9cyBsaXN0 PmwgTD1zIG5lZ2xpc3Q+TCAiIC4KICJvPXMgb3B0Pm8gcD1zIHRlc3RwYXRoPnAgcz1zIHNoZWxs cGF0aD5zIHQgdHJhY2U+dCB1PXMgbHhydXJsPnUgIiAuCiAieCBub2V4aXRtdW5nZT54IjsKQEAg LTE3NSw3ICsxNzYsOSBAQCBzdWIgZXhlY3V0ZV90ZXN0cyB7CiAjIChvbmx5IGNoZWNrIGZvciB0 aGVpciBleGlzdGFuY2UgaWYgdGhlIHN1aXRlIG9yIHRlc3RfZGlyIGhhcyBjaGFuZ2VkCiAjIHNp bmNlIHRoZSBsYXN0IHRpbWUgd2UgbG9va2VkLikKICAgICAgICAgaWYgKCRsYXN0X3N1aXRlIG5l ICRzdWl0ZSB8fCAkbGFzdF90ZXN0X2RpciBuZSAkdGVzdF9kaXIpIHsKLSAgICAgICAgICAgICRz aGVsbF9jb21tYW5kID0gJG9wdF9hcmNoIC4gIiAiOworICAgICAgICAgICAgY2hvbXAoJHNoZWxs X2NvbW1hbmQgPSBgeGNydW4gLXNkayAkb3B0X3NpbV9zZGsgLWZpbmQgc2ltYCkgaWYgJG9wdF9z aW1fc2RrOworCisgICAgICAgICAgICAkc2hlbGxfY29tbWFuZCAuPSAiICRvcHRfYXJjaCAiOwog ICAgICAgICAgICAgCiAgICAgICAgICAgICAkc2hlbGxfY29tbWFuZCAuPSAmeHBfcGF0aCgkZW5n aW5lX2NvbW1hbmQpICAuICIgLXMgIjsKIApAQCAtNDQ5LDYgKzQ1MiwxMSBAQCBzdWIgcGFyc2Vf YXJncyB7CiAgICAgICAgICAgICAmZGQgKCJvcHQ6IGFkZGluZyBuZWdhdGl2ZSBsaXN0ICckdmFs dWUnLiIpOwogICAgICAgICAgICAgcHVzaCAoQG9wdF9uZWdfbGlzdF9maWxlcywgJHZhbHVlKTsK ICAgICAgICAgICAgIAorICAgICAgICB9IGVsc2lmICgkb3B0aW9uIGVxICJkIikgeworICAgICAg ICAgICAgJG9wdGlvbiA9ICdkJzsKKyAgICAgICAgICAgICZkZCAoIm9wdDogdXNpbmcgJHZhbHVl IHNpbXVsYXRvciBTREsgdG8gcnVuIGpzYy4iKTsKKyAgICAgICAgICAgICRvcHRfc2ltX3NkayA9 ICR2YWx1ZTsKKwogICAgICAgICB9IGVsc2lmICgkb3B0aW9uIGVxICJvIikgewogICAgICAgICAg ICAgJG9wdF9lbmdpbmVfcGFyYW1zID0gJHZhbHVlOwogICAgICAgICAgICAgJmRkICgib3B0OiBz ZXR0aW5nIGVuZ2luZSBwYXJhbXMgdG8gJyRvcHRfZW5naW5lX3BhcmFtcycuIik7CkBAIC01MTEs NiArNTE5LDcgQEAgc3ViIHVzYWdlIHsKICAgICAgIigtYnwtLWJ1Z3VybCkgICAgICAgICAgICAg QnVnemlsbGEgVVJMLlxuIiAuCiAgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgIChkZWZh dWx0IGlzICRvcHRfYnVnX3VybClcbiIgLgogICAgICAiKC1jfC0tY2xhc3NwYXRoKSAgICAgICAg ICBDbGFzc3BhdGggKFJoaW5vIG9ubHkuKVxuIiAuCisgICAgICIoLWR8LS1zZGspICAgICAgICAg ICAgICAgIFVzZSBhIHNpbXVsYXRvciBTREsgdG8gcnVuIGpzY1xuIiAuCiAgICAgICIoLWV8LS1l bmdpbmUpIDx0eXBlPiAuLi4gIFNwZWNpZnkgdGhlIHR5cGUgb2YgZW5naW5lKHMpIHRvIHRlc3Qu XG4iIC4KICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAgPHR5cGU+IGlzIG9uZSBvciBt b3JlIG9mXG4iIC4KICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAgKHNxdWlycmVsZmlz aHxzbW9wdHxzbWRlYnVnfGxjb3B0fGxjZGVidWd8eHBjc2hlbGx8IiAuCg== 202635 2013-05-22 18:24:53 -0700 2013-05-23 15:09:11 -0700 Patch bug-116339-20130522182339.patch text/plain 3284 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZmNmNWMzZmMwNTU2YTZhYTc1NzQ5NTQwOWNiYmMwMDE3OTE3NzA3Li5hNDAzZWNkMzJkZjI5Yjcy ZDM5ZTQzMTAwMGMwMmY3ZGJmZjEwZDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMy0wNS0yMiAgRGF2aWQgRmFybGVyICA8ZGZhcmxlckBhcHBsZS5jb20+ CisKKyAgICAgICAgLS1zZGsgb3B0aW9uIHRvIGpzRHJpdmVyLnBsIHRvIHJ1biB3aXRoIGlPUyBT aW11bGF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExNjMzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogdGVzdHMvbW96aWxsYS9qc0RyaXZlci5wbDoKKyAgICAgICAgKGV4ZWN1dGVfdGVzdHMpOgor ICAgICAgICBQcmVmaXggc2hlbGwgY29tbWFuZCB3aXRoIHRoZSBwYXRoIHRvIHRoZSAic2ltIiB0 b29sLgorICAgICAgICAocGFyc2VfYXJncyk6CisgICAgICAgIEFkZCAtZCAvIC0tc2RrIG9wdGlv bi4KKyAgICAgICAgKHVzYWdlKToKKyAgICAgICAgSGVscCBtZXNzYWdlIGZvciAtZCAvIC0tc2Rr IG9wdGlvbi4KKwogMjAxMy0wNS0yMiAgSnVsaWVuIEJyaWFuY2VhdSAgPGpicmlhbmNlYXVAbmRz LmNvbT4KIAogICAgICAgICBbc2g0XSBSZW1vdmUgTWFjcm9Bc3NlbWJsZXJTSDQuY3BwIGZpbGUu CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW96aWxsYS9qc0RyaXZl ci5wbCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCmlu ZGV4IDRhNzc0Y2VmZDc3OGIyM2JlZDMwYjQwYTM3MGZjNmFjMDgxNjkwOGQuLjk2NWEzZDk1ZDY0 MGY0ZjQ3MDJjMjZhOTk4NGU0OGIzN2NhMzIyODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS90ZXN0cy9tb3ppbGxhL2pzRHJpdmVyLnBsCkBAIC02NSw5ICs2NSwxMCBAQCBteSAkb3B0 X2NvbnNvbGVfZmFpbHVyZXMgPSAwOwogbXkgJG9wdF9seHJfdXJsID0gIi4vIjsgIyAiaHR0cDov L2x4ci5tb3ppbGxhLm9yZy9tb3ppbGxhL3NvdXJjZS9qcy90ZXN0cy8iOwogbXkgJG9wdF9leGl0 X211bmdlID0gKCRvc190eXBlIG5lICJNQUMiKSA/IDEgOiAwOwogbXkgJG9wdF9hcmNoPSAiIjsK K215ICRvcHRfc2ltX3NkayA9ICcnOwogCiAjIGNvbW1hbmQgbGluZSBvcHRpb24gZGVmaW5pdGlv bgotbXkgJG9wdGlvbnMgPSAiYT1zIGFyY2g+YSBiPXMgYnVndXJsPmIgYz1zIGNsYXNzcGF0aD5j IGU9cyBlbmdpbmU+ZSBmPXMgZmlsZT5mICIgLgorbXkgJG9wdGlvbnMgPSAiYT1zIGFyY2g+YSBi PXMgYnVndXJsPmIgYz1zIGNsYXNzcGF0aD5jIGQ9cyBzZGs+ZCBlPXMgZW5naW5lPmUgZj1zIGZp bGU+ZiAiIC4KICJoIGhlbHA+aCBpIGo9cyBqYXZhcGF0aD5qIGsgY29uZmFpbD5rIGw9cyBsaXN0 PmwgTD1zIG5lZ2xpc3Q+TCAiIC4KICJvPXMgb3B0Pm8gcD1zIHRlc3RwYXRoPnAgcz1zIHNoZWxs cGF0aD5zIHQgdHJhY2U+dCB1PXMgbHhydXJsPnUgIiAuCiAieCBub2V4aXRtdW5nZT54IjsKQEAg LTE3NSw3ICsxNzYsMTAgQEAgc3ViIGV4ZWN1dGVfdGVzdHMgewogIyAob25seSBjaGVjayBmb3Ig dGhlaXIgZXhpc3RhbmNlIGlmIHRoZSBzdWl0ZSBvciB0ZXN0X2RpciBoYXMgY2hhbmdlZAogIyBz aW5jZSB0aGUgbGFzdCB0aW1lIHdlIGxvb2tlZC4pCiAgICAgICAgIGlmICgkbGFzdF9zdWl0ZSBu ZSAkc3VpdGUgfHwgJGxhc3RfdGVzdF9kaXIgbmUgJHRlc3RfZGlyKSB7Ci0gICAgICAgICAgICAk c2hlbGxfY29tbWFuZCA9ICRvcHRfYXJjaCAuICIgIjsKKyAgICAgICAgICAgIGNob21wKCRzaGVs bF9jb21tYW5kID0gYHhjcnVuIC1zZGsgJG9wdF9zaW1fc2RrIC1maW5kIHNpbWApIGlmICRvcHRf c2ltX3NkazsKKyAgICAgICAgICAgICRzaGVsbF9jb21tYW5kIC49ICIgLS1hZG9wdC1waWQgIjsK KworICAgICAgICAgICAgJHNoZWxsX2NvbW1hbmQgLj0gIiAkb3B0X2FyY2ggIjsKICAgICAgICAg ICAgIAogICAgICAgICAgICAgJHNoZWxsX2NvbW1hbmQgLj0gJnhwX3BhdGgoJGVuZ2luZV9jb21t YW5kKSAgLiAiIC1zICI7CiAKQEAgLTQ0OSw2ICs0NTMsMTEgQEAgc3ViIHBhcnNlX2FyZ3Mgewog ICAgICAgICAgICAgJmRkICgib3B0OiBhZGRpbmcgbmVnYXRpdmUgbGlzdCAnJHZhbHVlJy4iKTsK ICAgICAgICAgICAgIHB1c2ggKEBvcHRfbmVnX2xpc3RfZmlsZXMsICR2YWx1ZSk7CiAgICAgICAg ICAgICAKKyAgICAgICAgfSBlbHNpZiAoJG9wdGlvbiBlcSAiZCIpIHsKKyAgICAgICAgICAgICRv cHRpb24gPSAnZCc7CisgICAgICAgICAgICAmZGQgKCJvcHQ6IHVzaW5nICR2YWx1ZSBzaW11bGF0 b3IgU0RLIHRvIHJ1biBqc2MuIik7CisgICAgICAgICAgICAkb3B0X3NpbV9zZGsgPSAkdmFsdWU7 CisKICAgICAgICAgfSBlbHNpZiAoJG9wdGlvbiBlcSAibyIpIHsKICAgICAgICAgICAgICRvcHRf ZW5naW5lX3BhcmFtcyA9ICR2YWx1ZTsKICAgICAgICAgICAgICZkZCAoIm9wdDogc2V0dGluZyBl bmdpbmUgcGFyYW1zIHRvICckb3B0X2VuZ2luZV9wYXJhbXMnLiIpOwpAQCAtNTExLDYgKzUyMCw3 IEBAIHN1YiB1c2FnZSB7CiAgICAgICIoLWJ8LS1idWd1cmwpICAgICAgICAgICAgIEJ1Z3ppbGxh IFVSTC5cbiIgLgogICAgICAiICAgICAgICAgICAgICAgICAgICAgICAgICAoZGVmYXVsdCBpcyAk b3B0X2J1Z191cmwpXG4iIC4KICAgICAgIigtY3wtLWNsYXNzcGF0aCkgICAgICAgICAgQ2xhc3Nw YXRoIChSaGlubyBvbmx5LilcbiIgLgorICAgICAiKC1kfC0tc2RrKSAgICAgICAgICAgICAgICBV c2UgYSBzaW11bGF0b3IgU0RLIHRvIHJ1biBqc2NcbiIgLgogICAgICAiKC1lfC0tZW5naW5lKSA8 dHlwZT4gLi4uICBTcGVjaWZ5IHRoZSB0eXBlIG9mIGVuZ2luZShzKSB0byB0ZXN0LlxuIiAuCiAg ICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgIDx0eXBlPiBpcyBvbmUgb3IgbW9yZSBvZlxu IiAuCiAgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgIChzcXVpcnJlbGZpc2h8c21vcHR8 c21kZWJ1Z3xsY29wdHxsY2RlYnVnfHhwY3NoZWxsfCIgLgo= 202743 2013-05-23 15:09:14 -0700 2013-05-28 13:39:30 -0700 Patch bug-116339-20130523150759.patch text/plain 3344 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZmNmNWMzZmMwNTU2YTZhYTc1NzQ5NTQwOWNiYmMwMDE3OTE3NzA3Li5iMzAwZWZhMjQxZWJiYTg2 Nzc2MDFiNjY5YjVlMjUyMWYyMDlhN2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMy0wNS0yMiAgRGF2aWQgRmFybGVyICA8ZGZhcmxlckBhcHBsZS5jb20+ CisKKyAgICAgICAgQWRkIC0tc2RrIG9wdGlvbiB0byBqc0RyaXZlci5wbCB0byBydW4gd2l0aCBp T1MgU2ltdWxhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTYzMzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHRlc3RzL21vemlsbGEvanNEcml2ZXIucGw6CisgICAgICAgIChleGVjdXRlX3Rlc3Rz KToKKyAgICAgICAgUHJlZml4IHNoZWxsIGNvbW1hbmQgd2l0aCB0aGUgcGF0aCB0byB0aGUgInNp bSIgdG9vbC4KKyAgICAgICAgKHBhcnNlX2FyZ3MpOgorICAgICAgICBBZGQgLWQgLyAtLXNkayBv cHRpb24uCisgICAgICAgICh1c2FnZSk6CisgICAgICAgIEhlbHAgbWVzc2FnZSBmb3IgLWQgLyAt LXNkayBvcHRpb24uCisKIDIwMTMtMDUtMjIgIEp1bGllbiBCcmlhbmNlYXUgIDxqYnJpYW5jZWF1 QG5kcy5jb20+CiAKICAgICAgICAgW3NoNF0gUmVtb3ZlIE1hY3JvQXNzZW1ibGVyU0g0LmNwcCBm aWxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL21vemlsbGEvanNE cml2ZXIucGwgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW96aWxsYS9qc0RyaXZlci5w bAppbmRleCA0YTc3NGNlZmQ3NzhiMjNiZWQzMGI0MGEzNzBmYzZhYzA4MTY5MDhkLi40YWIwMThh ZDk0NjhjNzAyOTczNzZhNzE0ZDQyY2Q3MWVhNjNiNDM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvdGVzdHMvbW96aWxsYS9qc0RyaXZlci5wbAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvdGVzdHMvbW96aWxsYS9qc0RyaXZlci5wbApAQCAtNjUsOSArNjUsMTAgQEAgbXkg JG9wdF9jb25zb2xlX2ZhaWx1cmVzID0gMDsKIG15ICRvcHRfbHhyX3VybCA9ICIuLyI7ICMgImh0 dHA6Ly9seHIubW96aWxsYS5vcmcvbW96aWxsYS9zb3VyY2UvanMvdGVzdHMvIjsKIG15ICRvcHRf ZXhpdF9tdW5nZSA9ICgkb3NfdHlwZSBuZSAiTUFDIikgPyAxIDogMDsKIG15ICRvcHRfYXJjaD0g IiI7CitteSAkb3B0X3NpbV9zZGsgPSAnJzsKIAogIyBjb21tYW5kIGxpbmUgb3B0aW9uIGRlZmlu aXRpb24KLW15ICRvcHRpb25zID0gImE9cyBhcmNoPmEgYj1zIGJ1Z3VybD5iIGM9cyBjbGFzc3Bh dGg+YyBlPXMgZW5naW5lPmUgZj1zIGZpbGU+ZiAiIC4KK215ICRvcHRpb25zID0gImE9cyBhcmNo PmEgYj1zIGJ1Z3VybD5iIGM9cyBjbGFzc3BhdGg+YyBkPXMgc2RrPmQgZT1zIGVuZ2luZT5lIGY9 cyBmaWxlPmYgIiAuCiAiaCBoZWxwPmggaSBqPXMgamF2YXBhdGg+aiBrIGNvbmZhaWw+ayBsPXMg bGlzdD5sIEw9cyBuZWdsaXN0PkwgIiAuCiAibz1zIG9wdD5vIHA9cyB0ZXN0cGF0aD5wIHM9cyBz aGVsbHBhdGg+cyB0IHRyYWNlPnQgdT1zIGx4cnVybD51ICIgLgogInggbm9leGl0bXVuZ2U+eCI7 CkBAIC0xNzUsNyArMTc2LDEyIEBAIHN1YiBleGVjdXRlX3Rlc3RzIHsKICMgKG9ubHkgY2hlY2sg Zm9yIHRoZWlyIGV4aXN0YW5jZSBpZiB0aGUgc3VpdGUgb3IgdGVzdF9kaXIgaGFzIGNoYW5nZWQK ICMgc2luY2UgdGhlIGxhc3QgdGltZSB3ZSBsb29rZWQuKQogICAgICAgICBpZiAoJGxhc3Rfc3Vp dGUgbmUgJHN1aXRlIHx8ICRsYXN0X3Rlc3RfZGlyIG5lICR0ZXN0X2RpcikgewotICAgICAgICAg ICAgJHNoZWxsX2NvbW1hbmQgPSAkb3B0X2FyY2ggLiAiICI7CisgICAgICAgICAgICBpZiAoJG9w dF9zaW1fc2RrKSB7CisgICAgICAgICAgICAgICAgY2hvbXAoJHNoZWxsX2NvbW1hbmQgPSBgeGNy dW4gLXNkayAkb3B0X3NpbV9zZGsgLWZpbmQgc2ltYCkgaWYgJG9wdF9zaW1fc2RrOworICAgICAg ICAgICAgICAgICRzaGVsbF9jb21tYW5kIC49ICIgLS1hZG9wdC1waWQgIjsKKyAgICAgICAgICAg IH0KKworICAgICAgICAgICAgJHNoZWxsX2NvbW1hbmQgLj0gIiAkb3B0X2FyY2ggIjsKICAgICAg ICAgICAgIAogICAgICAgICAgICAgJHNoZWxsX2NvbW1hbmQgLj0gJnhwX3BhdGgoJGVuZ2luZV9j b21tYW5kKSAgLiAiIC1zICI7CiAKQEAgLTQ0OSw2ICs0NTUsMTEgQEAgc3ViIHBhcnNlX2FyZ3Mg ewogICAgICAgICAgICAgJmRkICgib3B0OiBhZGRpbmcgbmVnYXRpdmUgbGlzdCAnJHZhbHVlJy4i KTsKICAgICAgICAgICAgIHB1c2ggKEBvcHRfbmVnX2xpc3RfZmlsZXMsICR2YWx1ZSk7CiAgICAg ICAgICAgICAKKyAgICAgICAgfSBlbHNpZiAoJG9wdGlvbiBlcSAiZCIpIHsKKyAgICAgICAgICAg ICRvcHRpb24gPSAnZCc7CisgICAgICAgICAgICAmZGQgKCJvcHQ6IHVzaW5nICR2YWx1ZSBzaW11 bGF0b3IgU0RLIHRvIHJ1biBqc2MuIik7CisgICAgICAgICAgICAkb3B0X3NpbV9zZGsgPSAkdmFs dWU7CisKICAgICAgICAgfSBlbHNpZiAoJG9wdGlvbiBlcSAibyIpIHsKICAgICAgICAgICAgICRv cHRfZW5naW5lX3BhcmFtcyA9ICR2YWx1ZTsKICAgICAgICAgICAgICZkZCAoIm9wdDogc2V0dGlu ZyBlbmdpbmUgcGFyYW1zIHRvICckb3B0X2VuZ2luZV9wYXJhbXMnLiIpOwpAQCAtNTExLDYgKzUy Miw3IEBAIHN1YiB1c2FnZSB7CiAgICAgICIoLWJ8LS1idWd1cmwpICAgICAgICAgICAgIEJ1Z3pp bGxhIFVSTC5cbiIgLgogICAgICAiICAgICAgICAgICAgICAgICAgICAgICAgICAoZGVmYXVsdCBp cyAkb3B0X2J1Z191cmwpXG4iIC4KICAgICAgIigtY3wtLWNsYXNzcGF0aCkgICAgICAgICAgQ2xh c3NwYXRoIChSaGlubyBvbmx5LilcbiIgLgorICAgICAiKC1kfC0tc2RrKSAgICAgICAgICAgICAg ICBVc2UgYSBzaW11bGF0b3IgU0RLIHRvIHJ1biBqc2NcbiIgLgogICAgICAiKC1lfC0tZW5naW5l KSA8dHlwZT4gLi4uICBTcGVjaWZ5IHRoZSB0eXBlIG9mIGVuZ2luZShzKSB0byB0ZXN0LlxuIiAu CiAgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgIDx0eXBlPiBpcyBvbmUgb3IgbW9yZSBv ZlxuIiAuCiAgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgIChzcXVpcnJlbGZpc2h8c21v cHR8c21kZWJ1Z3xsY29wdHxsY2RlYnVnfHhwY3NoZWxsfCIgLgo=