139734 2014-12-17 09:54:25 -0800 REGRESSION (r177363): Gtk and Efl testing is broken 2014-12-18 05:32:55 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=139671 P2 Normal --- 139749 139671 1 ap ap clopez commit-queue glenn ossy oldest_to_newest 1056352 0 ap 2014-12-17 09:54:25 -0800 1) On the GTK port, the timeout is 6000ms (release), 12000ms (debug) or 60000ms (if checking memory leaks with valgrind) http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/port/gtk.py?rev=177363#L83 So, subtracting 5 seconds is not ok for this port. 2) r177363 breakes all ports that don't enable supports_per_test_timeout() on Tools/Scripts/webkitpy/port/$port.py This is because m_timeout is initialized to 0 <http://trac.webkit.org/browser/trunk/Tools/WebKitTestRunner/TestInvocation.cpp?rev=177363#L96>, and never updated with the port default value because the python scripts don't pass the --timeout argument when the previous is not enabled. 1056362 1 243442 ap 2014-12-17 10:15:45 -0800 Created attachment 243442 proposed fix 1056371 2 243442 clopez 2014-12-17 10:40:53 -0800 Comment on attachment 243442 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=243442&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:73 > + elif self._timeout > 5: Shouldn't this be 5000 instead of 5? Otherwise we could end with negative values. > Tools/Scripts/webkitpy/port/gtk.py:95 > I would suggest adding 6000 and 2000 (that is, 1 second more than what later is going to be substracted). Otherwise the timeouts for WTRK and run-webkit-test are going to be the same (and therefore the race condition we talked before would happen). Or I'm wrong? 1056386 3 ap 2014-12-17 11:15:27 -0800 > Shouldn't this be 5000 instead of 5? Otherwise we could end with negative values. Oops, thanks for catching that. > I would suggest adding 6000 and 2000 (that is, 1 second more than what later is going to be substracted). > Otherwise the timeouts for WTRK and run-webkit-test are going to be the same (and therefore the race condition we talked before would happen). Or I'm wrong? Hmm, let me double check the flow of the timeout value. 1056490 4 243448 ap 2014-12-17 12:04:08 -0800 Created attachment 243448 proposed fix You are right, and I didn't realize that the script timeout was passed through the driver. The correct solution is to pass both timeouts as part of DriverInput. That would likely require updating regression tests, and I'm out of time for further refactoring today, so let's just do the hacky fix. 1056517 5 ap 2014-12-17 13:03:17 -0800 Committed <http://trac.webkit.org/r177456>. 1056549 6 commit-queue 2014-12-17 14:18:17 -0800 Re-opened since this is blocked by bug 139749 1056559 7 243462 ap 2014-12-17 15:07:20 -0800 Created attachment 243462 proposed fix I missed an important part in the original patch; not sure how tests almost worked. 1056573 8 ap 2014-12-17 15:57:14 -0800 Committed <http://trac.webkit.org/r177471>. 243442 2014-12-17 10:15:45 -0800 2014-12-17 12:04:08 -0800 proposed fix FixGtkEfl.txt text/plain 5251 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NzQ0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE0LTEyLTE3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxNzczNjMpOiBHdGsgYW5kIEVmbCB0ZXN0aW5nIGlz IGJyb2tlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM5NzM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9y dW5uZXIucHk6CisgICAgICAgIChTaW5nbGVUZXN0UnVubmVyLl9faW5pdF9fKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5OiAoR3RrUG9ydC5kZWZhdWx0X3RpbWVvdXRf bXMpOgorICAgICAgICBVcGRhdGUgdGltZW91dCBhZGp1c3RtZW50IGxvZ2ljIGZvciBHdGsgcG9y dC4gVGhpcyBpcyBub3QgdGhlIGNsZWFuZXN0IHNvbHV0aW9uLAorICAgICAgICBob3dldmVyIEkg dGhpbmsgdGhhdCBpdCdzIGEgZ29vZCBpZGVhIHRvIGV4cGVyaW1lbnQgd2l0aCBkaWZmZXJlbnQg dmFsdWVzIGJlZm9yZQorICAgICAgICBhYnN0cmFjdGluZyBpdCBvdXQuIE1heWJlIHdlIGNvdWxk IGV2ZW4gZmluZCBvdXQgdGhhdCB3ZSBkb24ndCBuZWVkIGRpZmZlcmVudAorICAgICAgICB0aW1l b3V0IHZhbHVlcyBmb3IgZGlmZmVyZW50IHBvcnRzOyB0aGVyZSBpc24ndCByZWFsbHkgYSBnb29k IHJlYXNvbiB0byBoYXZlIHRoaXMKKyAgICAgICAgY29uZmlndXJhYmxlLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHk6IChQb3J0LnN1cHBvcnRzX3Blcl90ZXN0X3Rp bWVvdXQpOiBBZGRlZCBhIEZJWE1FLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHA6IChXVFI6OkluamVjdGVkQnVuZGxlOjpiZWdp blRlc3RpbmcpOgorICAgICAgICBVc2UgVGVzdFJ1bm5lciBkZWZhdWx0IHRpbWVvdXQgd2hlbiB0 aGVyZSBpc24ndCBhIHRpbWVvdXQgcGFzc2VkIGZyb20gY29tbWFuZCBsaW5lIGZvciB0aGUgdGVz dC4KKwogMjAxNC0xMi0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dUS10gU2ltcGxpZnkgdGltZW91dCBoYW5kbGluZyBpbiBUZXN0UnVu bmVyOjppbml0aWFsaXplV2FpdFRvRHVtcFdhdGNoZG9nVGltZXJJZk5lZWRlZApJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3Rf cnVubmVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQkocmV2aXNpb24gMTc3MzYzKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xl X3Rlc3RfcnVubmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MiwxMSArNjIsMTYgQEAgY2xhc3Mg U2luZ2xlVGVzdFJ1bm5lcihvYmplY3QpOgogICAgICAgICBzZWxmLl9zdG9wX3doZW5fZG9uZSA9 IHN0b3Bfd2hlbl9kb25lCiAKICAgICAgICAgc2VsZi5fdGltZW91dCA9IHRlc3RfaW5wdXQudGlt ZW91dAotICAgICAgICBpZiBzZWxmLl90aW1lb3V0ID4gNTAwMDoKLSAgICAgICAgICAgICMgVGlt ZW91dHMgYXJlIGRldGVjdGVkIGJ5IGJvdGggc2NyaXB0IGFuZCB0b29sOyB0b29sIGRldGVjdGVk IHRpbWVvdXRzIGFyZQotICAgICAgICAgICAgIyBiZXR0ZXIsIGJlY2F1c2UgdGhleSBjb250YWlu IHBhcnRpYWwgb3V0cHV0LiBHaXZlIHRoZSB0b29sIHNvbWUgdGltZSB0bwotICAgICAgICAgICAg IyByZXBvcnQgdGhlIHRpbWVvdXQgaW5zdGVhZCBvZiBiZWluZyBraWxsZWQuCisgICAgICAgICMg VGltZW91dHMgYXJlIGRldGVjdGVkIGJ5IGJvdGggc2NyaXB0IGFuZCB0b29sOyB0b29sIGRldGVj dGVkIHRpbWVvdXRzIGFyZQorICAgICAgICAjIGJldHRlciwgYmVjYXVzZSB0aGV5IGNvbnRhaW4g cGFydGlhbCBvdXRwdXQuIEdpdmUgdGhlIHRvb2wgc29tZSB0aW1lIHRvCisgICAgICAgICMgcmVw b3J0IHRoZSB0aW1lb3V0IGluc3RlYWQgb2YgYmVpbmcga2lsbGVkLgorICAgICAgICAjIEZJWE1F OiBUaGVzZSB2YWx1ZXMgc2hvdWxkIG5vdCBiZSBoYXJkY29kZWQgaGVyZSwgd2Ugc2hvdWxkIGdp dmUgcG9ydHMgYSB3YXkKKyAgICAgICAgIyB0byBkZWZpbmUgdGhlbSBleHBsaWNpdGx5LiBIb3dl dmVyLCB3ZSB3b3VsZCBzdGlsbCBuZWVkIHRvIGNvbXB1dGUgYSBzZW5zaWJsZQorICAgICAgICAj IGRlZmF1bHQgZm9yIGN1c3RvbSB0aW1lb3V0cyBwYXNzZWQgdmlhIGNvbW1hbmQgbGluZS4KKyAg ICAgICAgaWYgc2VsZi5fdGltZW91dCA+IDIwMDAwOgogICAgICAgICAgICAgc2VsZi5fdGltZW91 dCA9IGludChzZWxmLl90aW1lb3V0KSAtIDUwMDAKKyAgICAgICAgZWxpZiBzZWxmLl90aW1lb3V0 ID4gNToKKyAgICAgICAgICAgIHNlbGYuX3RpbWVvdXQgPSBpbnQoc2VsZi5fdGltZW91dCkgLSAx MDAwCiAKICAgICAgICAgaWYgc2VsZi5fcmVmZXJlbmNlX2ZpbGVzOgogICAgICAgICAgICAgIyBE ZXRlY3QgYW5kIHJlcG9ydCBhIHRlc3Qgd2hpY2ggaGFzIGEgd3JvbmcgY29tYmluYXRpb24gb2Yg ZXhwZWN0YXRpb24gZmlsZXMuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFz ZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQko cmV2aXNpb24gMTc3MzYzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJ KHdvcmtpbmcgY29weSkKQEAgLTEzMSw2ICsxMzEsOCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAg ICAgICAgIHJldHVybiBbXQogCiAgICAgZGVmIHN1cHBvcnRzX3Blcl90ZXN0X3RpbWVvdXQoc2Vs Zik6CisgICAgICAgICMgRklYTUU6IE1ha2UgcGVyLXRlc3QgdGltZW91dHMgdW5jb25kaXRpb25h bCBvbmNlIGFsbCBwb3J0cycgRHVtcFJlbmRlclRyZWVzIHN1cHBvcnQgdGhhdC4KKyAgICAgICAg IyBXaW5kb3dzIER1bXBSZW5kZXJUcmVlIG1heSBiZSB0aGUgb25seSBvbmUgcmVtYWluaW5nIHRv IGJlIGZpeGVkIGF0IHRoaXMgdGltZS4KICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICBkZWYg ZGVmYXVsdF9waXhlbF90ZXN0cyhzZWxmKToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9ndGsucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0 ay5weQkocmV2aXNpb24gMTc3Mjc5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0 ay5weQkod29ya2luZyBjb3B5KQpAQCAtODMsMTAgKzgzLDE1IEBAIGNsYXNzIEd0a1BvcnQoUG9y dCk6CiAgICAgZGVmIGRlZmF1bHRfdGltZW91dF9tcyhzZWxmKToKICAgICAgICAgIyBTdGFydGlu ZyBhbiBhcHBsaWNhdGlvbiB1bmRlciBWYWxncmluZCB0YWtlcyBhIGxvdCBsb25nZXIgdGhhbiBu b3JtYWwKICAgICAgICAgIyBzbyBpbmNyZWFzZSB0aGUgdGltZW91dCAoZW1waXJpY2FsbHkgMTB4 IGlzIGVub3VnaCB0byBhdm9pZCB0aW1lb3V0cykuCi0gICAgICAgIG11bHRpcGxpZXIgPSAxMCBp ZiBzZWxmLmdldF9vcHRpb24oImxlYWtzIikgZWxzZSAxCisgICAgICAgICMgVGhpcyBmdW5jdGlv biByZXR1cm5zIGFuIG92ZXJhbGwgdGltZW91dCB0aGF0IGlzIGRldGVjdGVkIGJ5IHRoZSBzY3Jp cHQ7CisgICAgICAgICMgdG9vbCB0aW1lb3V0IGlzIGxhdGVyIGFkanVzdGVkIHRvIGJlIGxvd2Vy IGluIG9yZGVyIHRvIGF2b2lkIHJhY2VzLgorICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oImxl YWtzIik6CisgICAgICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSA9 PSAnRGVidWcnOgorICAgICAgICAgICAgICAgIHJldHVybiAxMjAgKiAxMDAwICsgNTAwMAorICAg ICAgICAgICAgcmV0dXJuIDYwICogMTAwMCArIDUwMDAKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0 aW9uKCdjb25maWd1cmF0aW9uJykgPT0gJ0RlYnVnJzoKLSAgICAgICAgICAgIHJldHVybiBtdWx0 aXBsaWVyICogMTIgKiAxMDAwCi0gICAgICAgIHJldHVybiBtdWx0aXBsaWVyICogNiAqIDEwMDAK KyAgICAgICAgICAgIHJldHVybiAxMiAqIDEwMDAgKyAxMDAwCisgICAgICAgIHJldHVybiA2ICog MTAwMCArIDEwMDAKIAogICAgIGRlZiBkcml2ZXJfc3RvcF90aW1lb3V0KHNlbGYpOgogICAgICAg ICBpZiBzZWxmLmdldF9vcHRpb24oImxlYWtzIik6CkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAkocmV2 aXNpb24gMTc3Mjc5KQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2Niw3ICsyNjYsOCBAQCB2b2lk IEluamVjdGVkQnVuZGxlOjpiZWdpblRlc3RpbmcoV0tEaWN0CiAgICAgbV90ZXN0UnVubmVyLT5z ZXRBY2NlcHRzRWRpdGluZyh0cnVlKTsKICAgICBtX3Rlc3RSdW5uZXItPnNldFRhYktleUN5Y2xl c1Rocm91Z2hFbGVtZW50cyh0cnVlKTsKIAotICAgIG1fdGVzdFJ1bm5lci0+c2V0Q3VzdG9tVGlt ZW91dChtX3RpbWVvdXQpOworICAgIGlmIChtX3RpbWVvdXQgPiAwKQorICAgICAgICBtX3Rlc3RS dW5uZXItPnNldEN1c3RvbVRpbWVvdXQobV90aW1lb3V0KTsKIAogICAgIHBhZ2UoKS0+cHJlcGFy ZSgpOwogCg== 243448 2014-12-17 12:04:08 -0800 2014-12-17 15:07:20 -0800 proposed fix FixGtkEfl.txt text/plain 5015 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NzQ1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE0LTEyLTE3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxNzczNjMpOiBHdGsgYW5kIEVmbCB0ZXN0aW5nIGlz IGJyb2tlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM5NzM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9y dW5uZXIucHk6CisgICAgICAgIChTaW5nbGVUZXN0UnVubmVyLl9faW5pdF9fKTogUmVtb3ZlIHRp bWVvdXQgYWRqdXN0bWVudCBmcm9tIGhlcmUsIGJlY2F1c2UgaXQKKyAgICAgICAgYWZmZWN0ZWQg Ym90aCBzY3JpcHQgYW5kIHRvb2wgdGltZW91dC4gVGhpcyBpcyBzdGlsbCB0aGUgcmlnaHQgcGxh Y2UgZm9yIHRoaXMgbG9naWMsCisgICAgICAgIGJ1dCBpdCB3b3VsZCBiZSBhIGxhcmdlciByZWZh Y3RvcmluZyB0aGFuIEkgY2FuIGRvIHJpZ2h0IG5vdy4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5zdXBwb3J0c19wZXJfdGVzdF90aW1l b3V0KTogQWRkZWQgYSBGSVhNRS4KKyAgICAgICAgKFBvcnQuZGVmYXVsdF90aW1lb3V0X21zKTog Tm93IHRoYXQgdGhlIGVmZmVjdGl2ZSB0aW1lb3V0IGlzIGxvbmdlciwgY2hhbmdlIHRoaXMKKyAg ICAgICAgdG8gYXZvaWQgbWFraW5nIHRlc3RzIHRha2UgbW9yZSB0aW1lLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weTogKERyaXZlci5ydW5fdGVzdCk6IEFkanVz dCBzY3JpcHQgdGltZW91dCBoZXJlLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHA6IChXVFI6OkluamVjdGVkQnVuZGxlOjpiZWdp blRlc3RpbmcpOgorICAgICAgICBVc2UgVGVzdFJ1bm5lciBkZWZhdWx0IHRpbWVvdXQgd2hlbiB0 aGVyZSBpc24ndCBhIHRpbWVvdXQgcGFzc2VkIGZyb20gY29tbWFuZCBsaW5lIGZvciB0aGUgdGVz dC4KKwogMjAxNC0xMi0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dUS10gU2ltcGxpZnkgdGltZW91dCBoYW5kbGluZyBpbiBUZXN0UnVu bmVyOjppbml0aWFsaXplV2FpdFRvRHVtcFdhdGNoZG9nVGltZXJJZk5lZWRlZApJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3Rf cnVubmVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQkocmV2aXNpb24gMTc3MzYzKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xl X3Rlc3RfcnVubmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MCwxMyArNjAsNyBAQCBjbGFzcyBT aW5nbGVUZXN0UnVubmVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3Nob3VsZF9ydW5fcGl4ZWxf dGVzdCA9IHRlc3RfaW5wdXQuc2hvdWxkX3J1bl9waXhlbF90ZXN0CiAgICAgICAgIHNlbGYuX3Jl ZmVyZW5jZV9maWxlcyA9IHRlc3RfaW5wdXQucmVmZXJlbmNlX2ZpbGVzCiAgICAgICAgIHNlbGYu X3N0b3Bfd2hlbl9kb25lID0gc3RvcF93aGVuX2RvbmUKLQogICAgICAgICBzZWxmLl90aW1lb3V0 ID0gdGVzdF9pbnB1dC50aW1lb3V0Ci0gICAgICAgIGlmIHNlbGYuX3RpbWVvdXQgPiA1MDAwOgot ICAgICAgICAgICAgIyBUaW1lb3V0cyBhcmUgZGV0ZWN0ZWQgYnkgYm90aCBzY3JpcHQgYW5kIHRv b2w7IHRvb2wgZGV0ZWN0ZWQgdGltZW91dHMgYXJlCi0gICAgICAgICAgICAjIGJldHRlciwgYmVj YXVzZSB0aGV5IGNvbnRhaW4gcGFydGlhbCBvdXRwdXQuIEdpdmUgdGhlIHRvb2wgc29tZSB0aW1l IHRvCi0gICAgICAgICAgICAjIHJlcG9ydCB0aGUgdGltZW91dCBpbnN0ZWFkIG9mIGJlaW5nIGtp bGxlZC4KLSAgICAgICAgICAgIHNlbGYuX3RpbWVvdXQgPSBpbnQoc2VsZi5fdGltZW91dCkgLSA1 MDAwCiAKICAgICAgICAgaWYgc2VsZi5fcmVmZXJlbmNlX2ZpbGVzOgogICAgICAgICAgICAgIyBE ZXRlY3QgYW5kIHJlcG9ydCBhIHRlc3Qgd2hpY2ggaGFzIGEgd3JvbmcgY29tYmluYXRpb24gb2Yg ZXhwZWN0YXRpb24gZmlsZXMuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFz ZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQko cmV2aXNpb24gMTc3MzYzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJ KHdvcmtpbmcgY29weSkKQEAgLTEzMSw2ICsxMzEsOCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAg ICAgICAgIHJldHVybiBbXQogCiAgICAgZGVmIHN1cHBvcnRzX3Blcl90ZXN0X3RpbWVvdXQoc2Vs Zik6CisgICAgICAgICMgRklYTUU6IE1ha2UgcGVyLXRlc3QgdGltZW91dHMgdW5jb25kaXRpb25h bCBvbmNlIGFsbCBwb3J0cycgRHVtcFJlbmRlclRyZWVzIHN1cHBvcnQgdGhhdC4KKyAgICAgICAg IyBXaW5kb3dzIER1bXBSZW5kZXJUcmVlIG1heSBiZSB0aGUgb25seSBvbmUgcmVtYWluaW5nIHRv IGJlIGZpeGVkIGF0IHRoaXMgdGltZS4KICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICBkZWYg ZGVmYXVsdF9waXhlbF90ZXN0cyhzZWxmKToKQEAgLTEzOCw3ICsxNDAsNyBAQCBjbGFzcyBQb3J0 KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgZGVmIGRlZmF1bHRfdGltZW91 dF9tcyhzZWxmKToKLSAgICAgICAgcmV0dXJuIDM1ICogMTAwMAorICAgICAgICByZXR1cm4gMzAg KiAxMDAwCiAKICAgICBkZWYgZHJpdmVyX3N0b3BfdGltZW91dChzZWxmKToKICAgICAgICAgIiIi IFJldHVybnMgdGhlIGFtb3VudCBvZiB0aW1lIGluIHNlY29uZHMgdG8gd2FpdCBiZWZvcmUga2ls bGluZyB0aGUgcHJvY2VzcyBpbiBkcml2ZXIuc3RvcCgpLiIiIgpJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvZHJpdmVyLnB5CShyZXZpc2lvbiAxNzczNjMpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNzksNyArMTc5LDEz IEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAgICBzZWxmLmVycl9zZWVuX2VvZiA9IEZh bHNlCiAKICAgICAgICAgY29tbWFuZCA9IHNlbGYuX2NvbW1hbmRfZnJvbV9kcml2ZXJfaW5wdXQo ZHJpdmVyX2lucHV0KQotICAgICAgICBkZWFkbGluZSA9IHRlc3RfYmVnaW5fdGltZSArIGludChk cml2ZXJfaW5wdXQudGltZW91dCkgLyAxMDAwLjAKKworICAgICAgICAjIENlcnRhaW4gdGltZW91 dHMgYXJlIGRldGVjdGVkIGJ5IHRoZSB0b29sIGl0c2VsZjsgdG9vbCBkZXRlY3Rpb24gaXMgYmV0 dGVyLAorICAgICAgICAjIGJlY2F1c2UgcmVzdWx0cyBjb250YWluIHBhcnRpYWwgb3V0cHV0IGlu IHRoaXMgY2FzZS4gTWFrZSBzY3JpcHQgdGltZW91dCBsb25nZXIKKyAgICAgICAgIyBieSA1IHNl Y29uZHMgdG8gYXZvaWQgcmFjaW5nIGZvciB3aGljaCB0aW1lb3V0IGlzIGRldGVjdGVkIGZpcnN0 LgorICAgICAgICAjIEZJWE1FOiBJdCdzIG5vdCB0aGUgam9iIG9mIHRoZSBkcml2ZXIgdG8gZGVj aWRlIHdoYXQgdGhlIHRpbWVvdXRzIHNob3VsZCBiZS4KKyAgICAgICAgIyBNb3ZlIHRoZSBhZGRp dGlvbmFsIHRpbWVvdXQgdG8gZHJpdmVyX2lucHV0LgorICAgICAgICBkZWFkbGluZSA9IHRlc3Rf YmVnaW5fdGltZSArIGludChkcml2ZXJfaW5wdXQudGltZW91dCkgLyAxMDAwLjAgKyA1CiAKICAg ICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3Mud3JpdGUoY29tbWFuZCkKICAgICAgICAgdGV4dCwg YXVkaW8gPSBzZWxmLl9yZWFkX2ZpcnN0X2Jsb2NrKGRlYWRsaW5lKSAgIyBGaXJzdCBibG9jayBp cyBlaXRoZXIgdGV4dCBvciBhdWRpbwpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJKHJldmlzaW9uIDE3 NzI3OSkKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRC dW5kbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjYsNyArMjY2LDggQEAgdm9pZCBJbmplY3Rl ZEJ1bmRsZTo6YmVnaW5UZXN0aW5nKFdLRGljdAogICAgIG1fdGVzdFJ1bm5lci0+c2V0QWNjZXB0 c0VkaXRpbmcodHJ1ZSk7CiAgICAgbV90ZXN0UnVubmVyLT5zZXRUYWJLZXlDeWNsZXNUaHJvdWdo RWxlbWVudHModHJ1ZSk7CiAKLSAgICBtX3Rlc3RSdW5uZXItPnNldEN1c3RvbVRpbWVvdXQobV90 aW1lb3V0KTsKKyAgICBpZiAobV90aW1lb3V0ID4gMCkKKyAgICAgICAgbV90ZXN0UnVubmVyLT5z ZXRDdXN0b21UaW1lb3V0KG1fdGltZW91dCk7CiAKICAgICBwYWdlKCktPnByZXBhcmUoKTsKIAo= 243462 2014-12-17 15:07:20 -0800 2014-12-17 15:09:12 -0800 proposed fix FixGtkEfl.txt text/plain 8289 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NzQ2NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM1IEBACisyMDE0LTEyLTE3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxNzczNjMpOiBHdGsgYW5kIEVmbCB0ZXN0aW5nIGlz IGJyb2tlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM5NzM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9y dW5uZXIucHk6CisgICAgICAgIChTaW5nbGVUZXN0UnVubmVyLl9faW5pdF9fKTogUmVtb3ZlIHRp bWVvdXQgYWRqdXN0bWVudCBmcm9tIGhlcmUsIGJlY2F1c2UgaXQKKyAgICAgICAgYWZmZWN0ZWQg Ym90aCBzY3JpcHQgYW5kIHRvb2wgdGltZW91dC4gVGhpcyBpcyBzdGlsbCB0aGUgcmlnaHQgcGxh Y2UgZm9yIHRoaXMgbG9naWMsCisgICAgICAgIGJ1dCBpdCB3b3VsZCBiZSBhIGxhcmdlciByZWZh Y3RvcmluZyB0aGFuIEkgY2FuIGRvIHJpZ2h0IG5vdy4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5zdXBwb3J0c19wZXJfdGVzdF90aW1l b3V0KTogQWRkZWQgYSBGSVhNRS4KKyAgICAgICAgKFBvcnQuZGVmYXVsdF90aW1lb3V0X21zKTog Tm93IHRoYXQgdGhlIGVmZmVjdGl2ZSB0aW1lb3V0IGlzIGxvbmdlciwgY2hhbmdlIHRoaXMKKyAg ICAgICAgdG8gYXZvaWQgbWFraW5nIHRlc3RzIHRha2UgbW9yZSB0aW1lLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAgICAgICAgKERyaXZlci5ydW5fdGVz dCk6IEFkanVzdCBzY3JpcHQgdGltZW91dCBoZXJlLgorICAgICAgICAoRHJpdmVyLl9jaGVja19m b3JfZHJpdmVyX3RpbWVvdXQpOiBGaXggdGhlIHRpbWVvdXQgZGV0ZWN0aW9uLgorICAgICAgICAo RHJpdmVyLl9yZWFkX2Jsb2NrKTogQWN0dWFsbHkgdXNlIHRoZSB0aW1lb3V0IGRldGVjdGlvbiBj b2RlLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3Rl ZEJ1bmRsZS5jcHA6IChXVFI6OkluamVjdGVkQnVuZGxlOjpiZWdpblRlc3RpbmcpOgorICAgICAg ICBVc2UgVGVzdFJ1bm5lciBkZWZhdWx0IHRpbWVvdXQgd2hlbiB0aGVyZSBpc24ndCBhIHRpbWVv dXQgcGFzc2VkIGZyb20gY29tbWFuZCBsaW5lIGZvciB0aGUgdGVzdC4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5OiAoUG9ydFRlc3RDYXNlLnRlc3Rf ZGVmYXVsdF90aW1lb3V0X21zKToKKyAgICAgICAgVXBkYXRlIHJlc3VsdHMgZm9yIHRoZSBuZXcg ZGVmYXVsdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoUnVuVGVzdC50ZXN0X2h1 bmdfdGhyZWFkKTogUmVzdG9yZSBhIHRlc3QgdGhhdCBJIHByZXZpb3VzbHkgZGVsZXRlZCwgaXQg d2FzCisgICAgICAgIGFjdHVhbGx5IGEgZ29vZCBvbmUuCisKIDIwMTQtMTItMTcgIENvbW1pdCBR dWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIxNzc0NTYuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVn cmF0aW9udGVzdC5weQkocmV2aXNpb24gMTc3NDY2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTI2Niw2ICsyNjYsMTMgQEAgY2xhc3MgUnVuVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSwgU3RyZWFtVAogICAgICAgICBkZXRhaWxzLCBfLCBfID0gbG9nZ2luZ19ydW4oWyctLWZ1 bGwtcmVzdWx0cy1odG1sJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZGV0YWlscy5leGl0 X2NvZGUsIDApCiAKKyAgICBkZWYgdGVzdF9odW5nX3RocmVhZChzZWxmKToKKyAgICAgICAgZGV0 YWlscywgZXJyLCBfID0gbG9nZ2luZ19ydW4oWyctLXJ1bi1zaW5nbHknLCAnLS10aW1lLW91dC1t cz01MCcsICdmYWlsdXJlcy9leHBlY3RlZC9oYW5nLmh0bWwnXSwgdGVzdHNfaW5jbHVkZWQ9VHJ1 ZSkKKyAgICAgICAgIyBOb3RlIHRoYXQgaGFuZy5odG1sIGlzIG1hcmtlZCBhcyBXb250Rml4IGFu ZCBhbGwgV29udEZpeCB0ZXN0cyBhcmUKKyAgICAgICAgIyBleHBlY3RlZCB0byBQYXNzLCBzbyB0 aGF0IGFjdHVhbGx5IHJ1bm5pbmcgdGhlbSBnZW5lcmF0ZXMgYW4gInVuZXhwZWN0ZWQiIGVycm9y LgorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRldGFpbHMuZXhpdF9jb2RlLCAxKQorICAgICAg ICBzZWxmLmFzc2VydE5vdEVtcHR5KGVycikKKwogICAgIGRlZiB0ZXN0X2tleWJvYXJkX2ludGVy cnVwdChzZWxmKToKICAgICAgICAgIyBOb3RlIHRoYXQgdGhpcyBhbHNvIHRlc3RzIHJ1bm5pbmcg YSB0ZXN0IG1hcmtlZCBhcyBTS0lQIGlmCiAgICAgICAgICMgeW91IHNwZWNpZnkgaXQgZXhwbGlj aXRseS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkJKHJl dmlzaW9uIDE3NzQ2NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQkod29ya2luZyBjb3B5KQpAQCAtNjAsMTMg KzYwLDcgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcihvYmplY3QpOgogICAgICAgICBzZWxmLl9z aG91bGRfcnVuX3BpeGVsX3Rlc3QgPSB0ZXN0X2lucHV0LnNob3VsZF9ydW5fcGl4ZWxfdGVzdAog ICAgICAgICBzZWxmLl9yZWZlcmVuY2VfZmlsZXMgPSB0ZXN0X2lucHV0LnJlZmVyZW5jZV9maWxl cwogICAgICAgICBzZWxmLl9zdG9wX3doZW5fZG9uZSA9IHN0b3Bfd2hlbl9kb25lCi0KICAgICAg ICAgc2VsZi5fdGltZW91dCA9IHRlc3RfaW5wdXQudGltZW91dAotICAgICAgICBpZiBzZWxmLl90 aW1lb3V0ID4gNTAwMDoKLSAgICAgICAgICAgICMgVGltZW91dHMgYXJlIGRldGVjdGVkIGJ5IGJv dGggc2NyaXB0IGFuZCB0b29sOyB0b29sIGRldGVjdGVkIHRpbWVvdXRzIGFyZQotICAgICAgICAg ICAgIyBiZXR0ZXIsIGJlY2F1c2UgdGhleSBjb250YWluIHBhcnRpYWwgb3V0cHV0LiBHaXZlIHRo ZSB0b29sIHNvbWUgdGltZSB0bwotICAgICAgICAgICAgIyByZXBvcnQgdGhlIHRpbWVvdXQgaW5z dGVhZCBvZiBiZWluZyBraWxsZWQuCi0gICAgICAgICAgICBzZWxmLl90aW1lb3V0ID0gaW50KHNl bGYuX3RpbWVvdXQpIC0gNTAwMAogCiAgICAgICAgIGlmIHNlbGYuX3JlZmVyZW5jZV9maWxlczoK ICAgICAgICAgICAgICMgRGV0ZWN0IGFuZCByZXBvcnQgYSB0ZXN0IHdoaWNoIGhhcyBhIHdyb25n IGNvbWJpbmF0aW9uIG9mIGV4cGVjdGF0aW9uIGZpbGVzLgpJbmRleDogVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDE3NzQ2NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsNiArMTMxLDggQEAgY2xhc3Mg UG9ydChvYmplY3QpOgogICAgICAgICByZXR1cm4gW10KIAogICAgIGRlZiBzdXBwb3J0c19wZXJf dGVzdF90aW1lb3V0KHNlbGYpOgorICAgICAgICAjIEZJWE1FOiBNYWtlIHBlci10ZXN0IHRpbWVv dXRzIHVuY29uZGl0aW9uYWwgb25jZSBhbGwgcG9ydHMnIER1bXBSZW5kZXJUcmVlcyBzdXBwb3J0 IHRoYXQuCisgICAgICAgICMgV2luZG93cyBEdW1wUmVuZGVyVHJlZSBtYXkgYmUgdGhlIG9ubHkg b25lIHJlbWFpbmluZyB0byBiZSBmaXhlZCBhdCB0aGlzIHRpbWUuCiAgICAgICAgIHJldHVybiBG YWxzZQogCiAgICAgZGVmIGRlZmF1bHRfcGl4ZWxfdGVzdHMoc2VsZik6CkBAIC0xMzgsNyArMTQw LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgIGRl ZiBkZWZhdWx0X3RpbWVvdXRfbXMoc2VsZik6Ci0gICAgICAgIHJldHVybiAzNSAqIDEwMDAKKyAg ICAgICAgcmV0dXJuIDMwICogMTAwMAogCiAgICAgZGVmIGRyaXZlcl9zdG9wX3RpbWVvdXQoc2Vs Zik6CiAgICAgICAgICIiIiBSZXR1cm5zIHRoZSBhbW91bnQgb2YgdGltZSBpbiBzZWNvbmRzIHRv IHdhaXQgYmVmb3JlIGtpbGxpbmcgdGhlIHByb2Nlc3MgaW4gZHJpdmVyLnN0b3AoKS4iIiIKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQkocmV2aXNpb24gMTc3NDY2KQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQkod29ya2luZyBjb3B5KQpA QCAtMTc5LDcgKzE3OSwxMyBAQCBjbGFzcyBEcml2ZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5l cnJfc2Vlbl9lb2YgPSBGYWxzZQogCiAgICAgICAgIGNvbW1hbmQgPSBzZWxmLl9jb21tYW5kX2Zy b21fZHJpdmVyX2lucHV0KGRyaXZlcl9pbnB1dCkKLSAgICAgICAgZGVhZGxpbmUgPSB0ZXN0X2Jl Z2luX3RpbWUgKyBpbnQoZHJpdmVyX2lucHV0LnRpbWVvdXQpIC8gMTAwMC4wCisKKyAgICAgICAg IyBDZXJ0YWluIHRpbWVvdXRzIGFyZSBkZXRlY3RlZCBieSB0aGUgdG9vbCBpdHNlbGY7IHRvb2wg ZGV0ZWN0aW9uIGlzIGJldHRlciwKKyAgICAgICAgIyBiZWNhdXNlIHJlc3VsdHMgY29udGFpbiBw YXJ0aWFsIG91dHB1dCBpbiB0aGlzIGNhc2UuIE1ha2Ugc2NyaXB0IHRpbWVvdXQgbG9uZ2VyCisg ICAgICAgICMgYnkgNSBzZWNvbmRzIHRvIGF2b2lkIHJhY2luZyBmb3Igd2hpY2ggdGltZW91dCBp cyBkZXRlY3RlZCBmaXJzdC4KKyAgICAgICAgIyBGSVhNRTogSXQncyBub3QgdGhlIGpvYiBvZiB0 aGUgZHJpdmVyIHRvIGRlY2lkZSB3aGF0IHRoZSB0aW1lb3V0cyBzaG91bGQgYmUuCisgICAgICAg ICMgTW92ZSB0aGUgYWRkaXRpb25hbCB0aW1lb3V0IHRvIGRyaXZlcl9pbnB1dC4KKyAgICAgICAg ZGVhZGxpbmUgPSB0ZXN0X2JlZ2luX3RpbWUgKyBpbnQoZHJpdmVyX2lucHV0LnRpbWVvdXQpIC8g MTAwMC4wICsgNQogCiAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLndyaXRlKGNvbW1hbmQp CiAgICAgICAgIHRleHQsIGF1ZGlvID0gc2VsZi5fcmVhZF9maXJzdF9ibG9jayhkZWFkbGluZSkg ICMgRmlyc3QgYmxvY2sgaXMgZWl0aGVyIHRleHQgb3IgYXVkaW8KQEAgLTM2Myw3ICszNjksNyBA QCBjbGFzcyBEcml2ZXIob2JqZWN0KToKICAgICAgICAgcmV0dXJuIGNtZAogCiAgICAgZGVmIF9j aGVja19mb3JfZHJpdmVyX3RpbWVvdXQoc2VsZiwgb3V0X2xpbmUpOgotICAgICAgICBpZiBvdXRf bGluZSA9PSAiRkFJTDogVGltZWQgb3V0IHdhaXRpbmcgZm9yIG5vdGlmeURvbmUgdG8gYmUgY2Fs bGVkIjoKKyAgICAgICAgaWYgb3V0X2xpbmUgPT0gIkZBSUw6IFRpbWVkIG91dCB3YWl0aW5nIGZv ciBub3RpZnlEb25lIHRvIGJlIGNhbGxlZFxuIjoKICAgICAgICAgICAgIHNlbGYuX2RyaXZlcl90 aW1lZF9vdXQgPSBUcnVlCiAKICAgICBkZWYgX2NoZWNrX2Zvcl9kcml2ZXJfY3Jhc2goc2VsZiwg ZXJyb3JfbGluZSk6CkBAIC00ODQsNiArNDkwLDcgQEAgY2xhc3MgRHJpdmVyKG9iamVjdCk6CiAg ICAgICAgICAgICAgICAgZXJyX2xpbmUsIHNlbGYuZXJyX3NlZW5fZW9mID0gc2VsZi5fc3RyaXBf ZW9mKGVycl9saW5lKQogCiAgICAgICAgICAgICBpZiBvdXRfbGluZToKKyAgICAgICAgICAgICAg ICBzZWxmLl9jaGVja19mb3JfZHJpdmVyX3RpbWVvdXQob3V0X2xpbmUpCiAgICAgICAgICAgICAg ICAgaWYgb3V0X2xpbmVbLTFdICE9ICJcbiI6CiAgICAgICAgICAgICAgICAgICAgIF9sb2cuZXJy b3IoIkxhc3QgY2hhcmFjdGVyIHJlYWQgZnJvbSBEUlQgc3Rkb3V0IGxpbmUgd2FzIG5vdCBhIG5l d2xpbmUhICBUaGlzIGluZGljYXRlcyBlaXRoZXIgYSBOUldUIG9yIERSVCBidWcuIikKICAgICAg ICAgICAgICAgICBjb250ZW50X2xlbmd0aF9iZWZvcmVfaGVhZGVyX2NoZWNrID0gYmxvY2suX2Nv bnRlbnRfbGVuZ3RoCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90ZXN0 Y2FzZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90 ZXN0Y2FzZS5weQkocmV2aXNpb24gMTc3NDY2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L3BvcnRfdGVzdGNhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTkyLDggKzkyLDggQEAgY2xh c3MgUG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcmV0dXJuIHBvcnQK IAogICAgIGRlZiB0ZXN0X2RlZmF1bHRfdGltZW91dF9tcyhzZWxmKToKLSAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChzZWxmLm1ha2VfcG9ydChvcHRpb25zPU1vY2tPcHRpb25zKGNvbmZpZ3VyYXRp b249J1JlbGVhc2UnKSkuZGVmYXVsdF90aW1lb3V0X21zKCksIDM1MDAwKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHNlbGYubWFrZV9wb3J0KG9wdGlvbnM9TW9ja09wdGlvbnMoY29uZmlndXJh dGlvbj0nRGVidWcnKSkuZGVmYXVsdF90aW1lb3V0X21zKCksIDM1MDAwKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHNlbGYubWFrZV9wb3J0KG9wdGlvbnM9TW9ja09wdGlvbnMoY29uZmlndXJh dGlvbj0nUmVsZWFzZScpKS5kZWZhdWx0X3RpbWVvdXRfbXMoKSwgMzAwMDApCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoc2VsZi5tYWtlX3BvcnQob3B0aW9ucz1Nb2NrT3B0aW9ucyhjb25maWd1 cmF0aW9uPSdEZWJ1ZycpKS5kZWZhdWx0X3RpbWVvdXRfbXMoKSwgMzAwMDApCiAKICAgICBkZWYg dGVzdF9kZWZhdWx0X3BpeGVsX3Rlc3RzKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHNlbGYubWFrZV9wb3J0KCkuZGVmYXVsdF9waXhlbF90ZXN0cygpLCBGYWxzZSkKSW5kZXg6IFRv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0 ZWRCdW5kbGUuY3BwCShyZXZpc2lvbiAxNzc0NjYpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVy L0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY2 LDcgKzI2Niw4IEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGU6OmJlZ2luVGVzdGluZyhXS0RpY3QKICAg ICBtX3Rlc3RSdW5uZXItPnNldEFjY2VwdHNFZGl0aW5nKHRydWUpOwogICAgIG1fdGVzdFJ1bm5l ci0+c2V0VGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1lbnRzKHRydWUpOwogCi0gICAgbV90ZXN0UnVu bmVyLT5zZXRDdXN0b21UaW1lb3V0KG1fdGltZW91dCk7CisgICAgaWYgKG1fdGltZW91dCA+IDAp CisgICAgICAgIG1fdGVzdFJ1bm5lci0+c2V0Q3VzdG9tVGltZW91dChtX3RpbWVvdXQpOwogCiAg ICAgcGFnZSgpLT5wcmVwYXJlKCk7CiAK