78303 2012-02-09 17:54:34 -0800 [PerformanceTests] run-perf-tests should be able to handle Hz-based score. 2012-03-15 20:25:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76156 1 morrita morrita abarth haraken ojan rniwa webkit.review.bot oldest_to_newest 553655 0 morrita 2012-02-09 17:54:34 -0800 Dromaeo reports score (run/s) by default. I should report time taken. 553793 1 morrita 2012-02-09 21:21:16 -0800 I'd like to close this as WONTFIX beucause: - We already have data. Changing the dimension will kill these data. - What we area doing is how the official Dromaeo counts. We can understand our score as "Dromaeo score" even though it differs from how other tests is doing. - Since the tests run so fast, we need to give some scale. But determining such scale is a tricky job. Currnet "run/s" is further simpler. Ryosuke, what do you think? 553859 2 rniwa 2012-02-09 22:59:02 -0800 I think we need to update run-perf-tests so that it doesn't it doesn't erroneously add "ms" at the end. It's extremely confusing. The correct unit for these values is "Hz". 553861 3 rniwa 2012-02-09 23:02:44 -0800 By the way, having historical data is okay though. We've already had a bunch of bogus data due to the bot issues so switching the unit type at this point shouldn't be that big of a deal. Also, I'm thinking that we can add collect historical data for tests once tests have stabilized so I don't think losing historical data now should affect our decision here. 553868 4 morrita 2012-02-09 23:11:26 -0800 (In reply to comment #2) > I think we need to update run-perf-tests so that it doesn't it doesn't erroneously add "ms" at the end. It's extremely confusing. The correct unit for these values is "Hz". Good point. I changed the bug title. BTW, I personally prefer hz over ms. I guess Ojan has some opinion here. (IIRC I read he talking about that somewhere.) 553874 5 abarth 2012-02-09 23:19:36 -0800 Either way is fine as long as it's clearly labeled on the graphs and the text output whether bigger-is-better or smaller-is-better. 553876 6 rniwa 2012-02-09 23:23:17 -0800 (In reply to comment #5) > Either way is fine as long as it's clearly labeled on the graphs and the text output whether bigger-is-better or smaller-is-better. For labeling, we need upstream changes to perf-o-matic since we currently don't have any notion of units :( 578949 7 haraken 2012-03-14 16:59:40 -0700 Reporting "runs/s" as "ms" is extremely confusing (Actually I've so far given up a few patches because I thought they "regressed" performance). We should fix it somehow. As far as I see the discussion, the possible fixes are as follows: [1] Just change the label from "ms" to "Hz". (Nit: I would prefer "runs/s" to "Hz" since the official Dromaeo is using "runs/s") [2] Convert "runs/s" measured by Dromaeo to "ms", and report "ms". (patch: https://bugs.webkit.org/show_bug.cgi?id=80974) [3] Run Dromaeo with the "runStyle=ms" mode, by which Dromaeo measures "ms" instead of "runs/s". Then report "ms". IMHO, - I do not like [1]. Mixing "larger-is-better" graphs and "smaller-is-better" graphs is really confusing. If we do not care historical data, I guess we can avoid [1]. - Both [2] and [3] sound good to me, but [2] would be better. In case of [3], we need to slightly modify webrunner.js to run the "runStyle=ms" mode with the same scale as the "runStyle=runs/s" mode (patch: https://bugs.webkit.org/attachment.cgi?id=131576&action=review). On the other hand, the disadvantage of [2] is that we cannot output the median and stdev, since we cannot calculate the median and stdev of "ms" from those of "runs/s". WDYT? 578957 8 rniwa 2012-03-14 17:06:49 -0700 (In reply to comment #7) > Reporting "runs/s" as "ms" is extremely confusing (Actually I've so far given up a few patches because I thought they "regressed" performance). We should fix it somehow. As far as I see the discussion, the possible fixes are as follows: > > [1] Just change the label from "ms" to "Hz". (Nit: I would prefer "runs/s" to "Hz" since the official Dromaeo is using "runs/s") > [2] Convert "runs/s" measured by Dromaeo to "ms", and report "ms". (patch: https://bugs.webkit.org/show_bug.cgi?id=80974) > [3] Run Dromaeo with the "runStyle=ms" mode, by which Dromaeo measures "ms" instead of "runs/s". Then report "ms". > > - I do not like [1]. Mixing "larger-is-better" graphs and "smaller-is-better" graphs is really confusing. If we do not care historical data, I guess we can avoid [1]. > - Both [2] and [3] sound good to me, but [2] would be better. In case of [3], we need to slightly modify webrunner.js to run the "runStyle=ms" mode with the same scale as the "runStyle=runs/s" mode (patch: https://bugs.webkit.org/attachment.cgi?id=131576&action=review). On the other hand, the disadvantage of [2] is that we cannot output the median and stdev, since we cannot calculate the median and stdev of "ms" from those of "runs/s". Let's not do [2] or [3]. It's extremely confusing to invent our own metrics for Dromaeo. Also see https://bugs.webkit.org/show_bug.cgi?id=80776. 578961 9 haraken 2012-03-14 17:10:42 -0700 (In reply to comment #8) > Let's not do [2] or [3]. It's extremely confusing to invent our own metrics for Dromaeo. Also see https://bugs.webkit.org/show_bug.cgi?id=80776. Is it because we want to compare the perf-test results with the results when we run Dromaeo manually on the browser? 578967 10 rniwa 2012-03-14 17:13:01 -0700 (In reply to comment #9) > Is it because we want to compare the perf-test results with the results when we run Dromaeo manually on the browser? Right. 578968 11 haraken 2012-03-14 17:15:30 -0700 (In reply to comment #10) > (In reply to comment #9) > > Is it because we want to compare the perf-test results with the results when we run Dromaeo manually on the browser? > > Right. OK, then I'll take the approach [1]. (although I still think that [2] or [3] would be less confusing in total, IMO) 578970 12 rniwa 2012-03-14 17:16:40 -0700 (In reply to comment #11) > OK, then I'll take the approach [1]. (although I still think that [2] or [3] would be less confusing in total, IMO) I think this is just an UI issue on perf-o-matic. We just need to put some information about whether larger is better or smaller is better for each graph (maybe just use different colors?). 579024 13 131973 haraken 2012-03-14 18:56:44 -0700 Created attachment 131973 Patch 579165 14 131973 rniwa 2012-03-14 23:56:02 -0700 Comment on attachment 131973 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131973&action=review > Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:294 > results[score.group(1)] = float(score.group(2)) > + if score.group(3): > + unit = score.group(3) Can we used the named groups instead? e.g. "(?Pblah...)" then match.group('blah') > PerformanceTests/ChangeLog:16 > + Running Dromaeo/dom-attr.html (1 of 1) This > PerformanceTests/ChangeLog:19 > + Finished: 30.616529 s And this line are actually output into stderr so you should probably exclude them (you can confirm this by piping stdout). 579166 15 rniwa 2012-03-14 23:56:47 -0700 I think we need to include the units in JSON file as well so that perf-o-matic can display them. Could you either file a new bug or address that in your patch as well? 579173 16 131996 haraken 2012-03-15 00:16:27 -0700 Created attachment 131996 patch for landing 580060 17 131996 webkit.review.bot 2012-03-15 20:13:44 -0700 Comment on attachment 131996 patch for landing Clearing flags on attachment: 131996 Committed r110933: <http://trac.webkit.org/changeset/110933> 131973 2012-03-14 18:56:44 -0700 2012-03-15 20:25:22 -0700 Patch bug-78303-20120315105643.patch text/plain 6683 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwODAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGU5YzA2ZWU2YmYyZDJkNzFiZDFhZTUyNWY5ZWZiNjA2 YjU2ZjQzOS4uMjMyYjUxYzk1N2JmMTg3MGZhYzlhZDIwYTFmMzE5MTJmNDkwN2JjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTAzLTE0ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbUGVyZm9ybWFuY2VUZXN0c10gcnVuLXBlcmYtdGVzdHMgc2hvdWxkIG91dHB1dCBj b3JyZWN0IHVuaXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03ODMwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFByZXZpb3VzbHkgcnVuLXBlcmYtdGVzdHMganVzdCBzdXBwb3J0ZWQgIm1zIiBmb3IgdW5p dHMuCisgICAgICAgIENvbnNlcXVlbnRseSwgRHJvbWFlbyBwZXJmIHRlc3RzIGhhZCBiZWVuIHJl cG9ydGluZyBydW5zL3MgYXMgIm1zIi4KKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBydW4tcGVy Zi10ZXN0cyBzbyB0aGF0IHRoZXkgY2FuIHN1cHBvcnQgY3VzdG9tIHVuaXRzLgorICAgICAgICBU aGUgZGVmYXVsdCB1bml0IGlzICJtcyIuCisKKyAgICAgICAgVGhlIHRlc3QgcmVzdWx0IGxvb2tz IGxpa2UgdGhpczoKKworICAgICAgICAkIC4vVG9vbHMvU2NyaXB0cy9ydW4tcGVyZi10ZXN0cyBE cm9tYWVvL2RvbS1hdHRyLmh0bWwKKyAgICAgICAgUnVubmluZyBEcm9tYWVvL2RvbS1hdHRyLmh0 bWwgKDEgb2YgMSkKKyAgICAgICAgUkVTVUxUIERyb21hZW86IGRvbS1hdHRyPSA2NDY1Ljk1MjU0 ODMgcnVucy9zCisgICAgICAgIG1lZGlhbj0gMC4wIHJ1bnMvcywgc3RkZXY9IDI0LjI5ODM0MzM0 MzYgcnVucy9zLCBtaW49IDY0MzUuODc2NDk0MDIgcnVucy9zLCBtYXg9IDY1MTUuNjM2OTMzOTIg cnVucy9zCisgICAgICAgIEZpbmlzaGVkOiAzMC42MTY1MjkgcworCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHk6CisgICAgICAg IChQZXJmVGVzdHNSdW5uZXIuX3Byb2Nlc3NfcGFyc2VyX3Rlc3RfcmVzdWx0KToKKwogMjAxMi0w My0xNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBO UldUIHNob3VsZCByZXNwZWN0IC0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3RvcnkncyBTa2lw cGVkIGxpc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2Vf dGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3Jt YW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKaW5kZXggOGNjMGQ3NDVlMmNhMjI3MGRlZTZm Yjk1MGViY2I0NmFmNmFmOGY0Ni4uMmJkZjA4Y2FiYmRlYTdlNDYwNTZkM2M0ZTcyN2RkZWNkY2Y5 MzFlNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0 cy9wZXJmdGVzdHNydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3Jt YW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKQEAgLTI4NCwxMSArMjg0LDE0IEBAIGNsYXNz IFBlcmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAgICB0ZXN0X25hbWUgPSBmaWxlc3lzdGVt LnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0KICAgICAgICAgcmVzdWx0cyA9IHt9CiAgICAgICAgIGtl eXMgPSBbJ2F2ZycsICdtZWRpYW4nLCAnc3RkZXYnLCAnbWluJywgJ21heCddCi0gICAgICAgIHNj b3JlX3JlZ2V4ID0gcmUuY29tcGlsZShyJ14oJyArIHInfCcuam9pbihrZXlzKSArIHInKVxzKyhb MC05XC5dKyknKQorICAgICAgICBzY29yZV9yZWdleCA9IHJlLmNvbXBpbGUocideKCcgKyByJ3wn LmpvaW4oa2V5cykgKyByJylccysoWzAtOVwuXSspXHMqKC4qKScpCisgICAgICAgIHVuaXQgPSAi bXMiCiAgICAgICAgIGZvciBsaW5lIGluIHJlLnNwbGl0KCdcbicsIG91dHB1dC50ZXh0KToKICAg ICAgICAgICAgIHNjb3JlID0gc2NvcmVfcmVnZXgubWF0Y2gobGluZSkKICAgICAgICAgICAgIGlm IHNjb3JlOgogICAgICAgICAgICAgICAgIHJlc3VsdHNbc2NvcmUuZ3JvdXAoMSldID0gZmxvYXQo c2NvcmUuZ3JvdXAoMikpCisgICAgICAgICAgICAgICAgaWYgc2NvcmUuZ3JvdXAoMyk6CisgICAg ICAgICAgICAgICAgICAgIHVuaXQgPSBzY29yZS5ncm91cCgzKQogICAgICAgICAgICAgICAgIGNv bnRpbnVlCiAKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9zaG91bGRfaWdub3JlX2xpbmVfaW5f cGFyc2VyX3Rlc3RfcmVzdWx0KGxpbmUpOgpAQCAtMjk4LDggKzMwMSw4IEBAIGNsYXNzIFBlcmZU ZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAgICBpZiB0ZXN0X2ZhaWxlZCBvciBzZXQoa2V5cykg IT0gc2V0KHJlc3VsdHMua2V5cygpKToKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAgICAgICAg IHNlbGYuX3Jlc3VsdHNbZmlsZXN5c3RlbS5qb2luKGNhdGVnb3J5LCB0ZXN0X25hbWUpLnJlcGxh Y2UoJ1xcJywgJy8nKV0gPSByZXN1bHRzCi0gICAgICAgIHNlbGYuX2J1aWxkYm90X291dHB1dC53 cml0ZSgnUkVTVUxUICVzOiAlcz0gJXMgbXNcbicgJSAoY2F0ZWdvcnksIHRlc3RfbmFtZSwgcmVz dWx0c1snYXZnJ10pKQotICAgICAgICBzZWxmLl9idWlsZGJvdF9vdXRwdXQud3JpdGUoJywgJy5q b2luKFsnJXM9ICVzIG1zJyAlIChrZXksIHJlc3VsdHNba2V5XSkgZm9yIGtleSBpbiBrZXlzWzE6 XV0pICsgJ1xuJykKKyAgICAgICAgc2VsZi5fYnVpbGRib3Rfb3V0cHV0LndyaXRlKCdSRVNVTFQg JXM6ICVzPSAlcyAlc1xuJyAlIChjYXRlZ29yeSwgdGVzdF9uYW1lLCByZXN1bHRzWydhdmcnXSwg dW5pdCkpCisgICAgICAgIHNlbGYuX2J1aWxkYm90X291dHB1dC53cml0ZSgnLCAnLmpvaW4oWycl cz0gJXMgJXMnICUgKGtleSwgcmVzdWx0c1trZXldLCB1bml0KSBmb3Iga2V5IGluIGtleXNbMTpd XSkgKyAnXG4nKQogICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgIGRlZiBfcnVuX3NpbmdsZV90 ZXN0KHNlbGYsIHRlc3QsIGRyaXZlciwgaXNfY2hyb21pdW1fc3R5bGUpOgpkaWZmIC0tZ2l0IGEv UGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VMb2cgYi9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZwpp bmRleCA3ZmRlYmM2NmQ2ZDYzZGYyOWQwZjNhNDJjZDZhZGY4OTdiMjE3N2Q1Li4zMTdlNDBiNGQ3 ZDc0Zjk5OTQ5NDlkNmFlZWUwMTNiMDA0Mjg2MmZiIDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRl c3RzL0NoYW5nZUxvZworKysgYi9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDI5IEBACisyMDEyLTAzLTE0ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4K KworICAgICAgICBbUGVyZm9ybWFuY2VUZXN0c10gcnVuLXBlcmYtdGVzdHMgc2hvdWxkIG91dHB1 dCBjb3JyZWN0IHVuaXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03ODMwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFByZXZpb3VzbHkgcnVuLXBlcmYtdGVzdHMganVzdCBzdXBwb3J0ZWQgIm1zIiBmb3Ig dW5pdHMuCisgICAgICAgIENvbnNlcXVlbnRseSwgRHJvbWFlbyBwZXJmIHRlc3RzIGhhZCBiZWVu IHJlcG9ydGluZyBydW5zL3MgYXMgIm1zIi4KKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBydW4t cGVyZi10ZXN0cyBzbyB0aGF0IHRoZXkgY2FuIHN1cHBvcnQgY3VzdG9tIHVuaXRzLgorICAgICAg ICBUaGUgZGVmYXVsdCB1bml0IGlzICJtcyIuCisKKyAgICAgICAgVGhlIHRlc3QgcmVzdWx0IGxv b2tzIGxpa2UgdGhpczoKKworICAgICAgICAkIC4vVG9vbHMvU2NyaXB0cy9ydW4tcGVyZi10ZXN0 cyBEcm9tYWVvL2RvbS1hdHRyLmh0bWwKKyAgICAgICAgUnVubmluZyBEcm9tYWVvL2RvbS1hdHRy Lmh0bWwgKDEgb2YgMSkKKyAgICAgICAgUkVTVUxUIERyb21hZW86IGRvbS1hdHRyPSA2NDY1Ljk1 MjU0ODMgcnVucy9zCisgICAgICAgIG1lZGlhbj0gMC4wIHJ1bnMvcywgc3RkZXY9IDI0LjI5ODM0 MzM0MzYgcnVucy9zLCBtaW49IDY0MzUuODc2NDk0MDIgcnVucy9zLCBtYXg9IDY1MTUuNjM2OTMz OTIgcnVucy9zCisgICAgICAgIEZpbmlzaGVkOiAzMC42MTY1MjkgcworCisgICAgICAgICogRHJv bWFlby9yZXNvdXJjZXMvZHJvbWFlb3J1bm5lci5qczoKKyAgICAgICAgKC4pOgorICAgICAgICAq IHJlc291cmNlcy9ydW5uZXIuanM6CisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5jb21wdXRlU3Rh dGlzdGljcyk6CisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5wcmludFN0YXRpc3RpY3MpOgorCiAy MDEyLTAzLTE0ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KIAogICAg ICAgICBMYXlvdXQvZmxvYXRzLmh0bWwgc2hvdWxkIGJlIHJ1bm5hYmxlIGJ5IHJ1bi1wZXJmLXRl c3RzCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL0Ryb21hZW8vcmVzb3VyY2VzL2Ryb21h ZW9ydW5uZXIuanMgYi9QZXJmb3JtYW5jZVRlc3RzL0Ryb21hZW8vcmVzb3VyY2VzL2Ryb21hZW9y dW5uZXIuanMKaW5kZXggMTM2MDkzZThkZjQ1NTI3MzI5ZGI2NTgyYmM2ZjQ0MGQwNjc1YTJiZC4u Yzg5YWM3MWU3ZjQ5NmQ3NTY5MmE0ZWRlNTE0NGNmZGQzNmNiNzc5OCAxMDA2NDQKLS0tIGEvUGVy Zm9ybWFuY2VUZXN0cy9Ecm9tYWVvL3Jlc291cmNlcy9kcm9tYWVvcnVubmVyLmpzCisrKyBiL1Bl cmZvcm1hbmNlVGVzdHMvRHJvbWFlby9yZXNvdXJjZXMvZHJvbWFlb3J1bm5lci5qcwpAQCAtMTgs NyArMTgsOCBAQAogICAgICAgICAgICAgICAgICBtZWFuOiBtZWFuLAogICAgICAgICAgICAgICAg ICBtaW46IG1pbiwKICAgICAgICAgICAgICAgICAgbWF4OiBtYXgsCi0gICAgICAgICAgICAgICAg IHN0ZGV2OiBNYXRoLnNxcnQodmFyc3VtKQorICAgICAgICAgICAgICAgICBzdGRldjogTWF0aC5z cXJ0KHZhcnN1bSksCisgICAgICAgICAgICAgICAgIHVuaXQ6ICJydW5zL3MiCiAgICAgICAgICAg ICAgfTsKICAgICAgICAgIH0sCiAKQEAgLTMyLDcgKzMzLDcgQEAKICAgICAgICAgICAgICAgICAg ICAgIERSVC50YXJnZXREb2N1bWVudCA9IGlmcmFtZS5jb250ZW50RG9jdW1lbnQ7CiAgICAgICAg ICAgICAgICAgICAgICBEUlQudGFyZ2V0V2luZG93ID0gaWZyYW1lLmNvbnRlbnREb2N1bWVudC5k ZWZhdWx0VmlldzsKICAgICAgICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICAgCisKICAgICAg ICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigKICAgICAgICAgICAgICAgICAgIm1lc3Nh Z2UiLAogICAgICAgICAgICAgICAgICBmdW5jdGlvbihldmVudCkgewpkaWZmIC0tZ2l0IGEvUGVy Zm9ybWFuY2VUZXN0cy9yZXNvdXJjZXMvcnVubmVyLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9yZXNv dXJjZXMvcnVubmVyLmpzCmluZGV4IDlhN2Q5YWQ0ZTgxYWY0OTg2YjBiNzAxNTIzZDViZDI5NDQw NjM2ZWUuLjFiYzJhMTBiNjllYWQ1OWUwYmQ2Zjk5N2M0MDQ4MjBmYWNhZjY4NzAgMTAwNjQ0Ci0t LSBhL1BlcmZvcm1hbmNlVGVzdHMvcmVzb3VyY2VzL3J1bm5lci5qcworKysgYi9QZXJmb3JtYW5j ZVRlc3RzL3Jlc291cmNlcy9ydW5uZXIuanMKQEAgLTc1LDYgKzc1LDcgQEAgUGVyZlRlc3RSdW5u ZXIuY29tcHV0ZVN0YXRpc3RpY3MgPSBmdW5jdGlvbiAodGltZXMpIHsKICAgICB9CiAgICAgcmVz dWx0LnZhcmlhbmNlID0gc3F1YXJlU3VtIC8gZGF0YS5sZW5ndGg7CiAgICAgcmVzdWx0LnN0ZGV2 ID0gTWF0aC5zcXJ0KHJlc3VsdC52YXJpYW5jZSk7CisgICAgcmVzdWx0LnVuaXQgPSAibXMiOwog CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KQEAgLTg3LDExICs4OCwxMSBAQCBQZXJmVGVzdFJ1bm5l ci5sb2dTdGF0aXN0aWNzID0gZnVuY3Rpb24gKHRpbWVzKSB7CiAKIFBlcmZUZXN0UnVubmVyLnBy aW50U3RhdGlzdGljcyA9IGZ1bmN0aW9uIChzdGF0aXN0aWNzKSB7CiAgICAgdGhpcy5sb2coIiIp OwotICAgIHRoaXMubG9nKCJhdmcgIiArIHN0YXRpc3RpY3MubWVhbik7Ci0gICAgdGhpcy5sb2co Im1lZGlhbiAiICsgc3RhdGlzdGljcy5tZWRpYW4pOwotICAgIHRoaXMubG9nKCJzdGRldiAiICsg c3RhdGlzdGljcy5zdGRldik7Ci0gICAgdGhpcy5sb2coIm1pbiAiICsgc3RhdGlzdGljcy5taW4p OwotICAgIHRoaXMubG9nKCJtYXggIiArIHN0YXRpc3RpY3MubWF4KTsKKyAgICB0aGlzLmxvZygi YXZnICIgKyBzdGF0aXN0aWNzLm1lYW4gKyAiICIgKyBzdGF0aXN0aWNzLnVuaXQpOworICAgIHRo aXMubG9nKCJtZWRpYW4gIiArIHN0YXRpc3RpY3MubWVkaWFuICsgIiAiICsgc3RhdGlzdGljcy51 bml0KTsKKyAgICB0aGlzLmxvZygic3RkZXYgIiArIHN0YXRpc3RpY3Muc3RkZXYgKyAiICIgKyBz dGF0aXN0aWNzLnVuaXQpOworICAgIHRoaXMubG9nKCJtaW4gIiArIHN0YXRpc3RpY3MubWluICsg IiAiICsgc3RhdGlzdGljcy51bml0KTsKKyAgICB0aGlzLmxvZygibWF4ICIgKyBzdGF0aXN0aWNz Lm1heCArICIgIiArIHN0YXRpc3RpY3MudW5pdCk7CiB9CiAKIFBlcmZUZXN0UnVubmVyLmdjID0g ZnVuY3Rpb24gKCkgewo= 131996 2012-03-15 00:16:27 -0700 2012-03-15 20:13:44 -0700 patch for landing bug-78303-20120315161626.patch text/plain 6630 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwODAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGU5YzA2ZWU2YmYyZDJkNzFiZDFhZTUyNWY5ZWZiNjA2 YjU2ZjQzOS4uZDExMmQ3YjllZDIwNjRmZWEyY2U3MDgwYTMxN2U0NTkwNDdmMDc5OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAzLTE0ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbUGVyZm9ybWFuY2VUZXN0c10gcnVuLXBlcmYtdGVzdHMgc2hvdWxkIG91dHB1dCBj b3JyZWN0IHVuaXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03ODMwMworCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KKworICAgICAg ICBQcmV2aW91c2x5IHJ1bi1wZXJmLXRlc3RzIGp1c3Qgc3VwcG9ydGVkICJtcyIgZm9yIHVuaXRz LgorICAgICAgICBDb25zZXF1ZW50bHksIERyb21hZW8gcGVyZiB0ZXN0cyBoYWQgYmVlbiByZXBv cnRpbmcgcnVucy9zIGFzICJtcyIuCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgcnVuLXBlcmYt dGVzdHMgc28gdGhhdCB0aGV5IGNhbiBzdXBwb3J0IGN1c3RvbSB1bml0cy4KKyAgICAgICAgVGhl IGRlZmF1bHQgdW5pdCBpcyAibXMiLgorCisgICAgICAgIFRoZSB0ZXN0IHJlc3VsdCBsb29rcyBs aWtlIHRoaXM6CisKKyAgICAgICAgJCAuL1Rvb2xzL1NjcmlwdHMvcnVuLXBlcmYtdGVzdHMgRHJv bWFlby9kb20tYXR0ci5odG1sCisgICAgICAgIFJFU1VMVCBEcm9tYWVvOiBkb20tYXR0cj0gNjQ2 NS45NTI1NDgzIHJ1bnMvcworICAgICAgICBtZWRpYW49IDAuMCBydW5zL3MsIHN0ZGV2PSAyNC4y OTgzNDMzNDM2IHJ1bnMvcywgbWluPSA2NDM1Ljg3NjQ5NDAyIHJ1bnMvcywgbWF4PSA2NTE1LjYz NjkzMzkyIHJ1bnMvcworCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90 ZXN0cy9wZXJmdGVzdHNydW5uZXIucHk6CisgICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX3Byb2Nl c3NfcGFyc2VyX3Rlc3RfcmVzdWx0KToKKwogMjAxMi0wMy0xNCAgVGltIEhvcnRvbiAgPHRpbW90 aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBOUldUIHNob3VsZCByZXNwZWN0IC0tYWRk aXRpb25hbC1wbGF0Zm9ybS1kaXJlY3RvcnkncyBTa2lwcGVkIGxpc3QKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5u ZXIucHkKaW5kZXggOGNjMGQ3NDVlMmNhMjI3MGRlZTZmYjk1MGViY2I0NmFmNmFmOGY0Ni4uY2Ux YzdlOTAzODUzMjRjYjU2ZGRkODYwOTFmNDgxZjYzNzYxNmQ5ZiAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5u ZXIucHkKQEAgLTI4NCwxMSArMjg0LDE0IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmplY3Qp OgogICAgICAgICB0ZXN0X25hbWUgPSBmaWxlc3lzdGVtLnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0K ICAgICAgICAgcmVzdWx0cyA9IHt9CiAgICAgICAgIGtleXMgPSBbJ2F2ZycsICdtZWRpYW4nLCAn c3RkZXYnLCAnbWluJywgJ21heCddCi0gICAgICAgIHNjb3JlX3JlZ2V4ID0gcmUuY29tcGlsZShy J14oJyArIHInfCcuam9pbihrZXlzKSArIHInKVxzKyhbMC05XC5dKyknKQorICAgICAgICBzY29y ZV9yZWdleCA9IHJlLmNvbXBpbGUocideKD9QPGtleT4nICsgcid8Jy5qb2luKGtleXMpICsgcicp XHMrKD9QPHZhbHVlPlswLTlcLl0rKVxzKig/UDx1bml0Pi4qKScpCisgICAgICAgIHVuaXQgPSAi bXMiCiAgICAgICAgIGZvciBsaW5lIGluIHJlLnNwbGl0KCdcbicsIG91dHB1dC50ZXh0KToKICAg ICAgICAgICAgIHNjb3JlID0gc2NvcmVfcmVnZXgubWF0Y2gobGluZSkKICAgICAgICAgICAgIGlm IHNjb3JlOgotICAgICAgICAgICAgICAgIHJlc3VsdHNbc2NvcmUuZ3JvdXAoMSldID0gZmxvYXQo c2NvcmUuZ3JvdXAoMikpCisgICAgICAgICAgICAgICAgcmVzdWx0c1tzY29yZS5ncm91cCgna2V5 JyldID0gZmxvYXQoc2NvcmUuZ3JvdXAoJ3ZhbHVlJykpCisgICAgICAgICAgICAgICAgaWYgc2Nv cmUuZ3JvdXAoJ3VuaXQnKToKKyAgICAgICAgICAgICAgICAgICAgdW5pdCA9IHNjb3JlLmdyb3Vw KCd1bml0JykKICAgICAgICAgICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAgICBpZiBub3Qg c2VsZi5fc2hvdWxkX2lnbm9yZV9saW5lX2luX3BhcnNlcl90ZXN0X3Jlc3VsdChsaW5lKToKQEAg LTI5OCw4ICszMDEsOCBAQCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAgICAg aWYgdGVzdF9mYWlsZWQgb3Igc2V0KGtleXMpICE9IHNldChyZXN1bHRzLmtleXMoKSk6CiAgICAg ICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICBzZWxmLl9yZXN1bHRzW2ZpbGVzeXN0ZW0uam9p bihjYXRlZ29yeSwgdGVzdF9uYW1lKS5yZXBsYWNlKCdcXCcsICcvJyldID0gcmVzdWx0cwotICAg ICAgICBzZWxmLl9idWlsZGJvdF9vdXRwdXQud3JpdGUoJ1JFU1VMVCAlczogJXM9ICVzIG1zXG4n ICUgKGNhdGVnb3J5LCB0ZXN0X25hbWUsIHJlc3VsdHNbJ2F2ZyddKSkKLSAgICAgICAgc2VsZi5f YnVpbGRib3Rfb3V0cHV0LndyaXRlKCcsICcuam9pbihbJyVzPSAlcyBtcycgJSAoa2V5LCByZXN1 bHRzW2tleV0pIGZvciBrZXkgaW4ga2V5c1sxOl1dKSArICdcbicpCisgICAgICAgIHNlbGYuX2J1 aWxkYm90X291dHB1dC53cml0ZSgnUkVTVUxUICVzOiAlcz0gJXMgJXNcbicgJSAoY2F0ZWdvcnks IHRlc3RfbmFtZSwgcmVzdWx0c1snYXZnJ10sIHVuaXQpKQorICAgICAgICBzZWxmLl9idWlsZGJv dF9vdXRwdXQud3JpdGUoJywgJy5qb2luKFsnJXM9ICVzICVzJyAlIChrZXksIHJlc3VsdHNba2V5 XSwgdW5pdCkgZm9yIGtleSBpbiBrZXlzWzE6XV0pICsgJ1xuJykKICAgICAgICAgcmV0dXJuIEZh bHNlCiAKICAgICBkZWYgX3J1bl9zaW5nbGVfdGVzdChzZWxmLCB0ZXN0LCBkcml2ZXIsIGlzX2No cm9taXVtX3N0eWxlKToKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nIGIv UGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2ZkZWJjNjZkNmQ2M2RmMjlkMGYzYTQy Y2Q2YWRmODk3YjIxNzdkNS4uZjA5YjE3ZmU2ODkwYWI4NGE0NDM0ZWY3OTQyOWFhZTZhNzcxYjcw NiAxMDA2NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VMb2cKKysrIGIvUGVyZm9ybWFu Y2VUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0wMy0xNCAgS2VudGFybyBI YXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1BlcmZvcm1hbmNlVGVzdHNd IHJ1bi1wZXJmLXRlc3RzIHNob3VsZCBvdXRwdXQgY29ycmVjdCB1bml0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzgzMDMKKworICAgICAgICBSZXZp ZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgUHJldmlvdXNseSBydW4tcGVyZi10ZXN0 cyBqdXN0IHN1cHBvcnRlZCAibXMiIGZvciB1bml0cy4KKyAgICAgICAgQ29uc2VxdWVudGx5LCBE cm9tYWVvIHBlcmYgdGVzdHMgaGFkIGJlZW4gcmVwb3J0aW5nIHJ1bnMvcyBhcyAibXMiLgorICAg ICAgICBUaGlzIHBhdGNoIGZpeGVzIHJ1bi1wZXJmLXRlc3RzIHNvIHRoYXQgdGhleSBjYW4gc3Vw cG9ydCBjdXN0b20gdW5pdHMuCisgICAgICAgIFRoZSBkZWZhdWx0IHVuaXQgaXMgIm1zIi4KKwor ICAgICAgICBUaGUgdGVzdCByZXN1bHQgbG9va3MgbGlrZSB0aGlzOgorCisgICAgICAgICQgLi9U b29scy9TY3JpcHRzL3J1bi1wZXJmLXRlc3RzIERyb21hZW8vZG9tLWF0dHIuaHRtbAorICAgICAg ICBSRVNVTFQgRHJvbWFlbzogZG9tLWF0dHI9IDY0NjUuOTUyNTQ4MyBydW5zL3MKKyAgICAgICAg bWVkaWFuPSAwLjAgcnVucy9zLCBzdGRldj0gMjQuMjk4MzQzMzQzNiBydW5zL3MsIG1pbj0gNjQz NS44NzY0OTQwMiBydW5zL3MsIG1heD0gNjUxNS42MzY5MzM5MiBydW5zL3MKKworICAgICAgICAq IERyb21hZW8vcmVzb3VyY2VzL2Ryb21hZW9ydW5uZXIuanM6CisgICAgICAgICguKToKKyAgICAg ICAgKiByZXNvdXJjZXMvcnVubmVyLmpzOgorICAgICAgICAoUGVyZlRlc3RSdW5uZXIuY29tcHV0 ZVN0YXRpc3RpY3MpOgorICAgICAgICAoUGVyZlRlc3RSdW5uZXIucHJpbnRTdGF0aXN0aWNzKToK KwogMjAxMi0wMy0xNCAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CiAK ICAgICAgICAgTGF5b3V0L2Zsb2F0cy5odG1sIHNob3VsZCBiZSBydW5uYWJsZSBieSBydW4tcGVy Zi10ZXN0cwpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Ecm9tYWVvL3Jlc291cmNlcy9k cm9tYWVvcnVubmVyLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Ecm9tYWVvL3Jlc291cmNlcy9kcm9t YWVvcnVubmVyLmpzCmluZGV4IDEzNjA5M2U4ZGY0NTUyNzMyOWRiNjU4MmJjNmY0NDBkMDY3NWEy YmQuLmM4OWFjNzFlN2Y0OTZkNzU2OTJhNGVkZTUxNDRjZmRkMzZjYjc3OTggMTAwNjQ0Ci0tLSBh L1BlcmZvcm1hbmNlVGVzdHMvRHJvbWFlby9yZXNvdXJjZXMvZHJvbWFlb3J1bm5lci5qcworKysg Yi9QZXJmb3JtYW5jZVRlc3RzL0Ryb21hZW8vcmVzb3VyY2VzL2Ryb21hZW9ydW5uZXIuanMKQEAg LTE4LDcgKzE4LDggQEAKICAgICAgICAgICAgICAgICAgbWVhbjogbWVhbiwKICAgICAgICAgICAg ICAgICAgbWluOiBtaW4sCiAgICAgICAgICAgICAgICAgIG1heDogbWF4LAotICAgICAgICAgICAg ICAgICBzdGRldjogTWF0aC5zcXJ0KHZhcnN1bSkKKyAgICAgICAgICAgICAgICAgc3RkZXY6IE1h dGguc3FydCh2YXJzdW0pLAorICAgICAgICAgICAgICAgICB1bml0OiAicnVucy9zIgogICAgICAg ICAgICAgIH07CiAgICAgICAgICB9LAogCkBAIC0zMiw3ICszMyw3IEBACiAgICAgICAgICAgICAg ICAgICAgICBEUlQudGFyZ2V0RG9jdW1lbnQgPSBpZnJhbWUuY29udGVudERvY3VtZW50OwogICAg ICAgICAgICAgICAgICAgICAgRFJULnRhcmdldFdpbmRvdyA9IGlmcmFtZS5jb250ZW50RG9jdW1l bnQuZGVmYXVsdFZpZXc7CiAgICAgICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgIAorCiAg ICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoCiAgICAgICAgICAgICAgICAgICJt ZXNzYWdlIiwKICAgICAgICAgICAgICAgICAgZnVuY3Rpb24oZXZlbnQpIHsKZGlmZiAtLWdpdCBh L1BlcmZvcm1hbmNlVGVzdHMvcmVzb3VyY2VzL3J1bm5lci5qcyBiL1BlcmZvcm1hbmNlVGVzdHMv cmVzb3VyY2VzL3J1bm5lci5qcwppbmRleCA5YTdkOWFkNGU4MWFmNDk4NmIwYjcwMTUyM2Q1YmQy OTQ0MDYzNmVlLi4xYmMyYTEwYjY5ZWFkNTllMGJkNmY5OTdjNDA0ODIwZmFjYWY2ODcwIDEwMDY0 NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL3Jlc291cmNlcy9ydW5uZXIuanMKKysrIGIvUGVyZm9y bWFuY2VUZXN0cy9yZXNvdXJjZXMvcnVubmVyLmpzCkBAIC03NSw2ICs3NSw3IEBAIFBlcmZUZXN0 UnVubmVyLmNvbXB1dGVTdGF0aXN0aWNzID0gZnVuY3Rpb24gKHRpbWVzKSB7CiAgICAgfQogICAg IHJlc3VsdC52YXJpYW5jZSA9IHNxdWFyZVN1bSAvIGRhdGEubGVuZ3RoOwogICAgIHJlc3VsdC5z dGRldiA9IE1hdGguc3FydChyZXN1bHQudmFyaWFuY2UpOworICAgIHJlc3VsdC51bml0ID0gIm1z IjsKIAogICAgIHJldHVybiByZXN1bHQ7CiB9CkBAIC04NywxMSArODgsMTEgQEAgUGVyZlRlc3RS dW5uZXIubG9nU3RhdGlzdGljcyA9IGZ1bmN0aW9uICh0aW1lcykgewogCiBQZXJmVGVzdFJ1bm5l ci5wcmludFN0YXRpc3RpY3MgPSBmdW5jdGlvbiAoc3RhdGlzdGljcykgewogICAgIHRoaXMubG9n KCIiKTsKLSAgICB0aGlzLmxvZygiYXZnICIgKyBzdGF0aXN0aWNzLm1lYW4pOwotICAgIHRoaXMu bG9nKCJtZWRpYW4gIiArIHN0YXRpc3RpY3MubWVkaWFuKTsKLSAgICB0aGlzLmxvZygic3RkZXYg IiArIHN0YXRpc3RpY3Muc3RkZXYpOwotICAgIHRoaXMubG9nKCJtaW4gIiArIHN0YXRpc3RpY3Mu bWluKTsKLSAgICB0aGlzLmxvZygibWF4ICIgKyBzdGF0aXN0aWNzLm1heCk7CisgICAgdGhpcy5s b2coImF2ZyAiICsgc3RhdGlzdGljcy5tZWFuICsgIiAiICsgc3RhdGlzdGljcy51bml0KTsKKyAg ICB0aGlzLmxvZygibWVkaWFuICIgKyBzdGF0aXN0aWNzLm1lZGlhbiArICIgIiArIHN0YXRpc3Rp Y3MudW5pdCk7CisgICAgdGhpcy5sb2coInN0ZGV2ICIgKyBzdGF0aXN0aWNzLnN0ZGV2ICsgIiAi ICsgc3RhdGlzdGljcy51bml0KTsKKyAgICB0aGlzLmxvZygibWluICIgKyBzdGF0aXN0aWNzLm1p biArICIgIiArIHN0YXRpc3RpY3MudW5pdCk7CisgICAgdGhpcy5sb2coIm1heCAiICsgc3RhdGlz dGljcy5tYXggKyAiICIgKyBzdGF0aXN0aWNzLnVuaXQpOwogfQogCiBQZXJmVGVzdFJ1bm5lci5n YyA9IGZ1bmN0aW9uICgpIHsK