152157 2015-12-10 17:26:30 -0800 run-webkit-tests shouldn't start multiple iOS simulators while only running one test 2015-12-17 12:29:23 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jiewen_tan webkit-unassigned aakash_jain ap commit-queue dbates ddkilzer glenn lforschler webkit-bug-importer oldest_to_newest 1148360 0 jiewen_tan 2015-12-10 17:26:30 -0800 Currently, if I specify commands like this: run-webkit-tests --ios-simulator ./fast/images/image-load-event-crash.html. The script will start multiple iOS simulators. In my case, there are three. However, only one simulator will run the test while others are just idle. Here is a log: Jiewens-Mac-Pro:LayoutTests jwtan$ run-webkit-tests --ios-simulator ./fast/images/image-load-event-crash.html Process limit: 709, current #processes: 333 This machine could support 4 child processes, but only has enough process limit for 3. Run "launchctl limit" to check these limits Using port 'ios-simulator-wk2' Test configuration: <, x86_64, debug> Placing test results in /Users/jwtan/Documents/Build/Products/Debug-iphonesimulator/layout-test-results Baseline search path: ios-simulator-wk2 -> ios-simulator -> wk2 -> generic Using Debug build Pixel tests disabled Regular timeout: 30000, slow test timeout: 150000 Command line: /Users/jwtan/Documents/Build/Products/Debug/LayoutTestRelay -runtime com.apple.CoreSimulator.SimRuntime.iOS-10-0 -deviceType com.apple.CoreSimulator.SimDeviceType.iPhone-5s -suffix 0 -productDir /Users/jwtan/Documents/Build/Products/Debug-iphonesimulator -app /Users/jwtan/Documents/Build/Products/Debug-iphonesimulator/WebKitTestRunnerApp.app -- - --lint-test-files warnings: LayoutTests/platform/ios-simulator-wk2/TestExpectations:497 Path does not exist. http/tests/inspector/console/access-inspected-object.html Found 1 test; running 1, skipping 0. Starting helper ...kill -KILL 72979 Creating app:/tmp/WebKitTestingSimulators/Simulator0.app /tmp/WebKitTestingSimulators/Simulator0.app: replacing existing signature lsregister: processing /tmp/WebKitTestingSimulators/Simulator0.app lsregister: registered /tmp/WebKitTestingSimulators/Simulator0.app Creating app:/tmp/WebKitTestingSimulators/Simulator1.app /tmp/WebKitTestingSimulators/Simulator1.app: replacing existing signature lsregister: processing /tmp/WebKitTestingSimulators/Simulator1.app lsregister: registered /tmp/WebKitTestingSimulators/Simulator1.app Creating app:/tmp/WebKitTestingSimulators/Simulator2.app /tmp/WebKitTestingSimulators/Simulator2.app: replacing existing signature lsregister: processing /tmp/WebKitTestingSimulators/Simulator2.app lsregister: registered /tmp/WebKitTestingSimulators/Simulator2.app Waiting for all iOS Simulators to finish booting. Running 1 WebKitTestRunnerApp.app. kill -KILL 74070 kill -KILL 74067 kill -KILL 74040 kill -KILL 74019 kill -KILL 74016 kill -KILL 73987 kill -KILL 73968 kill -KILL 73965 kill -KILL 73937 kill -KILL 73786 lsregister: processing /tmp/WebKitTestingSimulators/Simulator0.app lsregister: unregistered /tmp/WebKitTestingSimulators/Simulator0.app An error was encountered processing the command (domain=com.apple.CoreSimulator.SimError, code=159): Unable to delete device in current state: Booted lsregister: processing /tmp/WebKitTestingSimulators/Simulator1.app lsregister: unregistered /tmp/WebKitTestingSimulators/Simulator1.app An error was encountered processing the command (domain=com.apple.CoreSimulator.SimError, code=159): Unable to delete device in current state: Booted lsregister: processing /tmp/WebKitTestingSimulators/Simulator2.app lsregister: unregistered /tmp/WebKitTestingSimulators/Simulator2.app An error was encountered processing the command (domain=com.apple.CoreSimulator.SimError, code=159): Unable to delete device in current state: Booted The test ran as expected. 1148362 1 webkit-bug-importer 2015-12-10 17:27:38 -0800 <rdar://problem/23851817> 1149814 2 267509 aakash_jain 2015-12-16 16:41:44 -0800 Created attachment 267509 Proposed patch 1149816 3 267511 aakash_jain 2015-12-16 16:58:09 -0800 Created attachment 267511 Minor improvement in Manager::_update_num_workers() 1149996 4 267511 ap 2015-12-17 09:40:15 -0800 Comment on attachment 267511 Minor improvement in Manager::_update_num_workers() View in context: https://bugs.webkit.org/attachment.cgi?id=267511&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:81 > + def get_num_workers(self, test_inputs, num_child_processes): It still irks me to see "num" in code, WebKit coding style calls for no abbreviations. Could you please update variable and function names to avoid using "num"? > Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:84 > + self._printer.write_update('Number of workers: %d' % num_workers) This is new logging, but I remember that we already print out the number of workers. Is it useful to have more? How does it the end result look? 1150004 5 267570 aakash_jain 2015-12-17 10:48:57 -0800 Created attachment 267570 Proposed patch Changed num to count. Removed the extra logging. 1150025 6 267570 commit-queue 2015-12-17 12:29:17 -0800 Comment on attachment 267570 Proposed patch Clearing flags on attachment: 267570 Committed r194226: <http://trac.webkit.org/changeset/194226> 1150026 7 commit-queue 2015-12-17 12:29:23 -0800 All reviewed patches have been landed. Closing bug. 267509 2015-12-16 16:41:44 -0800 2015-12-16 16:58:09 -0800 Proposed patch patch_min_sim text/plain 4680 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5NDE4NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE1LTEyLTE2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIHNob3VsZG4ndCBzdGFydCBtdWx0aXBsZSBp T1Mgc2ltdWxhdG9ycyB3aGlsZSBvbmx5IHJ1bm5pbmcgb25lIHRlc3QKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjE1NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoTGF5 b3V0VGVzdFJ1bm5lci5nZXRfbnVtX3dvcmtlcnMpOiBDYWxjdWxhdGUgcmVxdWlyZWQgbnVtYmVy IG9mIHdvcmtlcnMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX2dldF90ZXN0X2lucHV0cyk6 IENvbW1vbiBtZXRob2QgdG8gY2FsY3VsYXRlIHRlc3RfaW5wdXRzLgorICAgICAgICAoTWFuYWdl ci5fdXBkYXRlX251bV93b3JrZXJzKTogQ2FsY3VsYXRlIGFuZCB1cGRhdGUgcmVxdWlyZWQgbnVt YmVyIG9mIHdvcmtlcnMuCisKIDIwMTUtMTItMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRv bkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hYy13azJdIGZhc3QvZXZlbnRzIGZvcmNlIGNsaWNr IHRlc3RzIGNyYXNoaW5nCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyLnB5CShyZXZpc2lvbiAxOTQxODYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkJKHdvcmtpbmcgY29weSkK QEAgLTc4LDYgKzc4LDEyIEBAIGNsYXNzIExheW91dFRlc3RSdW5uZXIob2JqZWN0KToKICAgICAg ICAgc2VsZi5fcmV0cnlpbmcgPSBGYWxzZQogICAgICAgICBzZWxmLl9jdXJyZW50X3J1bl9yZXN1 bHRzID0gTm9uZQogCisgICAgZGVmIGdldF9udW1fd29ya2VycyhzZWxmLCB0ZXN0X2lucHV0cywg bnVtX2NoaWxkX3Byb2Nlc3Nlcyk6CisgICAgICAgIGFsbF9zaGFyZHMgPSBzZWxmLl9zaGFyZGVy LnNoYXJkX3Rlc3RzKHRlc3RfaW5wdXRzLCBudW1fY2hpbGRfcHJvY2Vzc2VzLCBzZWxmLl9vcHRp b25zLmZ1bGx5X3BhcmFsbGVsKQorICAgICAgICBudW1fd29ya2VycyA9IG1pbihudW1fY2hpbGRf cHJvY2Vzc2VzLCBsZW4oYWxsX3NoYXJkcykpCisgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVf dXBkYXRlKCdOdW1iZXIgb2Ygd29ya2VyczogJWQnICUgbnVtX3dvcmtlcnMpCisgICAgICAgIHJl dHVybiBudW1fd29ya2VycworCiAgICAgZGVmIHJ1bl90ZXN0cyhzZWxmLCBleHBlY3RhdGlvbnMs IHRlc3RfaW5wdXRzLCB0ZXN0c190b19za2lwLCBudW1fd29ya2VycywgbmVlZHNfaHR0cCwgbmVl ZHNfd2Vic29ja2V0cywgbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyLCByZXRyeWluZyk6 CiAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwogICAgICAgICBzZWxm Ll90ZXN0X2lucHV0cyA9IHRlc3RfaW5wdXRzCkBAIC0xMDYsNyArMTEyLDYgQEAgY2xhc3MgTGF5 b3V0VGVzdFJ1bm5lcihvYmplY3QpOgogICAgICAgICBpZiAoc2VsZi5fbmVlZHNfaHR0cCBhbmQg c2VsZi5fb3B0aW9ucy5odHRwKSBvciBzZWxmLl9uZWVkc193ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2 ZXI6CiAgICAgICAgICAgICBzZWxmLnN0YXJ0X3NlcnZlcnMoKQogCi0gICAgICAgIG51bV93b3Jr ZXJzID0gbWluKG51bV93b3JrZXJzLCBsZW4oYWxsX3NoYXJkcykpCiAgICAgICAgIHNlbGYuX3By aW50ZXIucHJpbnRfd29ya2Vyc19hbmRfc2hhcmRzKG51bV93b3JrZXJzLCBsZW4oYWxsX3NoYXJk cykpCiAKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5kcnlfcnVuOgpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9t YW5hZ2VyLnB5CShyZXZpc2lvbiAxOTQxODYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzUs NiArMTM1LDE5IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICBkZWYgbmVlZHNfc2VydmVy cyhzZWxmLCB0ZXN0X25hbWVzKToKICAgICAgICAgcmV0dXJuIGFueShzZWxmLl9pc19odHRwX3Rl c3QodGVzdF9uYW1lKSBmb3IgdGVzdF9uYW1lIGluIHRlc3RfbmFtZXMpIGFuZCBzZWxmLl9vcHRp b25zLmh0dHAKIAorICAgIGRlZiBfZ2V0X3Rlc3RfaW5wdXRzKHNlbGYsIHRlc3RzX3RvX3J1biwg cmVwZWF0X2VhY2gsIGl0ZXJhdGlvbnMpOgorICAgICAgICB0ZXN0X2lucHV0cyA9IFtdCisgICAg ICAgIGZvciBfIGluIHhyYW5nZShpdGVyYXRpb25zKToKKyAgICAgICAgICAgIGZvciB0ZXN0IGlu IHRlc3RzX3RvX3J1bjoKKyAgICAgICAgICAgICAgICBmb3IgXyBpbiB4cmFuZ2UocmVwZWF0X2Vh Y2gpOgorICAgICAgICAgICAgICAgICAgICB0ZXN0X2lucHV0cy5hcHBlbmQoc2VsZi5fdGVzdF9p bnB1dF9mb3JfZmlsZSh0ZXN0KSkKKyAgICAgICAgcmV0dXJuIHRlc3RfaW5wdXRzCisKKyAgICBk ZWYgX3VwZGF0ZV9udW1fd29ya2VycyhzZWxmLCB0ZXN0X25hbWVzKToKKyAgICAgICAgdGVzdF9p bnB1dHMgPSBzZWxmLl9nZXRfdGVzdF9pbnB1dHModGVzdF9uYW1lcywgc2VsZi5fb3B0aW9ucy5y ZXBlYXRfZWFjaCwgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQorICAgICAgICBudW1fd29ya2Vy cyA9IHNlbGYuX3J1bm5lci5nZXRfbnVtX3dvcmtlcnModGVzdF9pbnB1dHMsIGludChzZWxmLl9v cHRpb25zLmNoaWxkX3Byb2Nlc3NlcykpCisgICAgICAgIHNlbGYuX3BvcnQuc2V0X29wdGlvbign Y2hpbGRfcHJvY2Vzc2VzJywgbnVtX3dvcmtlcnMpCisKICAgICBkZWYgX3NldF91cF9ydW4oc2Vs ZiwgdGVzdF9uYW1lcyk6CiAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJDaGVj a2luZyBidWlsZCAuLi4iKQogICAgICAgICBpZiBub3Qgc2VsZi5fcG9ydC5jaGVja19idWlsZChz ZWxmLm5lZWRzX3NlcnZlcnModGVzdF9uYW1lcykpOgpAQCAtMTQ3LDYgKzE2MCw3IEBAIGNsYXNz IE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgaWYgbm90IHNlbGYuX3BvcnQuc3RhcnRfaGVscGVy KHNlbGYuX29wdGlvbnMucGl4ZWxfdGVzdHMpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAK KyAgICAgICAgc2VsZi5fdXBkYXRlX251bV93b3JrZXJzKHRlc3RfbmFtZXMpCiAgICAgICAgIHNl bGYuX3BvcnQucmVzZXRfcHJlZmVyZW5jZXMoKQogCiAgICAgICAgICMgQ2hlY2sgdGhhdCB0aGUg c3lzdGVtIGRlcGVuZGVuY2llcyAodGhlbWVzLCBmb250cywgLi4uKSBhcmUgY29ycmVjdC4KQEAg LTI1MSwxMSArMjY1LDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBuZWVkc193 ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIgPSBhbnkoc2VsZi5faXNfd2ViX3BsYXRmb3JtX3Rlc3Qo dGVzdCkgZm9yIHRlc3QgaW4gdGVzdHNfdG9fcnVuKQogICAgICAgICBuZWVkc193ZWJzb2NrZXRz ID0gYW55KHNlbGYuX2lzX3dlYnNvY2tldF90ZXN0KHRlc3QpIGZvciB0ZXN0IGluIHRlc3RzX3Rv X3J1bikKIAotICAgICAgICB0ZXN0X2lucHV0cyA9IFtdCi0gICAgICAgIGZvciBfIGluIHhyYW5n ZShpdGVyYXRpb25zKToKLSAgICAgICAgICAgIGZvciB0ZXN0IGluIHRlc3RzX3RvX3J1bjoKLSAg ICAgICAgICAgICAgICBmb3IgXyBpbiB4cmFuZ2UocmVwZWF0X2VhY2gpOgotICAgICAgICAgICAg ICAgICAgICB0ZXN0X2lucHV0cy5hcHBlbmQoc2VsZi5fdGVzdF9pbnB1dF9mb3JfZmlsZSh0ZXN0 KSkKKyAgICAgICAgdGVzdF9pbnB1dHMgPSBzZWxmLl9nZXRfdGVzdF9pbnB1dHModGVzdHNfdG9f cnVuLCByZXBlYXRfZWFjaCwgaXRlcmF0aW9ucykKICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bm5l ci5ydW5fdGVzdHMoc2VsZi5fZXhwZWN0YXRpb25zLCB0ZXN0X2lucHV0cywgdGVzdHNfdG9fc2tp cCwgbnVtX3dvcmtlcnMsIG5lZWRzX2h0dHAsIG5lZWRzX3dlYnNvY2tldHMsIG5lZWRzX3dlYl9w bGF0Zm9ybV90ZXN0X3NlcnZlciwgcmV0cnlpbmcpCiAKICAgICBkZWYgX2NsZWFuX3VwX3J1bihz ZWxmKToK 267511 2015-12-16 16:58:09 -0800 2015-12-17 10:48:57 -0800 Minor improvement in Manager::_update_num_workers() patch_min_sim1 text/plain 4670 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5NDE4NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE1LTEyLTE2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIHNob3VsZG4ndCBzdGFydCBtdWx0aXBsZSBp T1Mgc2ltdWxhdG9ycyB3aGlsZSBvbmx5IHJ1bm5pbmcgb25lIHRlc3QKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjE1NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoTGF5 b3V0VGVzdFJ1bm5lci5nZXRfbnVtX3dvcmtlcnMpOiBDYWxjdWxhdGUgcmVxdWlyZWQgbnVtYmVy IG9mIHdvcmtlcnMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX2dldF90ZXN0X2lucHV0cyk6 IENvbW1vbiBtZXRob2QgdG8gY2FsY3VsYXRlIHRlc3RfaW5wdXRzLgorICAgICAgICAoTWFuYWdl ci5fdXBkYXRlX251bV93b3JrZXJzKTogQ2FsY3VsYXRlIGFuZCB1cGRhdGUgcmVxdWlyZWQgbnVt YmVyIG9mIHdvcmtlcnMuCisKIDIwMTUtMTItMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRv bkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hYy13azJdIGZhc3QvZXZlbnRzIGZvcmNlIGNsaWNr IHRlc3RzIGNyYXNoaW5nCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyLnB5CShyZXZpc2lvbiAxOTQxODYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkJKHdvcmtpbmcgY29weSkK QEAgLTc4LDYgKzc4LDEyIEBAIGNsYXNzIExheW91dFRlc3RSdW5uZXIob2JqZWN0KToKICAgICAg ICAgc2VsZi5fcmV0cnlpbmcgPSBGYWxzZQogICAgICAgICBzZWxmLl9jdXJyZW50X3J1bl9yZXN1 bHRzID0gTm9uZQogCisgICAgZGVmIGdldF9udW1fd29ya2VycyhzZWxmLCB0ZXN0X2lucHV0cywg bnVtX2NoaWxkX3Byb2Nlc3Nlcyk6CisgICAgICAgIGFsbF9zaGFyZHMgPSBzZWxmLl9zaGFyZGVy LnNoYXJkX3Rlc3RzKHRlc3RfaW5wdXRzLCBudW1fY2hpbGRfcHJvY2Vzc2VzLCBzZWxmLl9vcHRp b25zLmZ1bGx5X3BhcmFsbGVsKQorICAgICAgICBudW1fd29ya2VycyA9IG1pbihudW1fY2hpbGRf cHJvY2Vzc2VzLCBsZW4oYWxsX3NoYXJkcykpCisgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVf dXBkYXRlKCdOdW1iZXIgb2Ygd29ya2VyczogJWQnICUgbnVtX3dvcmtlcnMpCisgICAgICAgIHJl dHVybiBudW1fd29ya2VycworCiAgICAgZGVmIHJ1bl90ZXN0cyhzZWxmLCBleHBlY3RhdGlvbnMs IHRlc3RfaW5wdXRzLCB0ZXN0c190b19za2lwLCBudW1fd29ya2VycywgbmVlZHNfaHR0cCwgbmVl ZHNfd2Vic29ja2V0cywgbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyLCByZXRyeWluZyk6 CiAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwogICAgICAgICBzZWxm Ll90ZXN0X2lucHV0cyA9IHRlc3RfaW5wdXRzCkBAIC0xMDYsNyArMTEyLDYgQEAgY2xhc3MgTGF5 b3V0VGVzdFJ1bm5lcihvYmplY3QpOgogICAgICAgICBpZiAoc2VsZi5fbmVlZHNfaHR0cCBhbmQg c2VsZi5fb3B0aW9ucy5odHRwKSBvciBzZWxmLl9uZWVkc193ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2 ZXI6CiAgICAgICAgICAgICBzZWxmLnN0YXJ0X3NlcnZlcnMoKQogCi0gICAgICAgIG51bV93b3Jr ZXJzID0gbWluKG51bV93b3JrZXJzLCBsZW4oYWxsX3NoYXJkcykpCiAgICAgICAgIHNlbGYuX3By aW50ZXIucHJpbnRfd29ya2Vyc19hbmRfc2hhcmRzKG51bV93b3JrZXJzLCBsZW4oYWxsX3NoYXJk cykpCiAKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5kcnlfcnVuOgpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9t YW5hZ2VyLnB5CShyZXZpc2lvbiAxOTQxODYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzUs NiArMTM1LDE5IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICBkZWYgbmVlZHNfc2VydmVy cyhzZWxmLCB0ZXN0X25hbWVzKToKICAgICAgICAgcmV0dXJuIGFueShzZWxmLl9pc19odHRwX3Rl c3QodGVzdF9uYW1lKSBmb3IgdGVzdF9uYW1lIGluIHRlc3RfbmFtZXMpIGFuZCBzZWxmLl9vcHRp b25zLmh0dHAKIAorICAgIGRlZiBfZ2V0X3Rlc3RfaW5wdXRzKHNlbGYsIHRlc3RzX3RvX3J1biwg cmVwZWF0X2VhY2gsIGl0ZXJhdGlvbnMpOgorICAgICAgICB0ZXN0X2lucHV0cyA9IFtdCisgICAg ICAgIGZvciBfIGluIHhyYW5nZShpdGVyYXRpb25zKToKKyAgICAgICAgICAgIGZvciB0ZXN0IGlu IHRlc3RzX3RvX3J1bjoKKyAgICAgICAgICAgICAgICBmb3IgXyBpbiB4cmFuZ2UocmVwZWF0X2Vh Y2gpOgorICAgICAgICAgICAgICAgICAgICB0ZXN0X2lucHV0cy5hcHBlbmQoc2VsZi5fdGVzdF9p bnB1dF9mb3JfZmlsZSh0ZXN0KSkKKyAgICAgICAgcmV0dXJuIHRlc3RfaW5wdXRzCisKKyAgICBk ZWYgX3VwZGF0ZV9udW1fd29ya2VycyhzZWxmLCB0ZXN0X25hbWVzKToKKyAgICAgICAgdGVzdF9p bnB1dHMgPSBzZWxmLl9nZXRfdGVzdF9pbnB1dHModGVzdF9uYW1lcywgc2VsZi5fb3B0aW9ucy5y ZXBlYXRfZWFjaCwgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQorICAgICAgICBudW1fd29ya2Vy cyA9IHNlbGYuX3J1bm5lci5nZXRfbnVtX3dvcmtlcnModGVzdF9pbnB1dHMsIGludChzZWxmLl9v cHRpb25zLmNoaWxkX3Byb2Nlc3NlcykpCisgICAgICAgIHNlbGYuX29wdGlvbnMuY2hpbGRfcHJv Y2Vzc2VzID0gbnVtX3dvcmtlcnMKKwogICAgIGRlZiBfc2V0X3VwX3J1bihzZWxmLCB0ZXN0X25h bWVzKToKICAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNoZWNraW5nIGJ1aWxk IC4uLiIpCiAgICAgICAgIGlmIG5vdCBzZWxmLl9wb3J0LmNoZWNrX2J1aWxkKHNlbGYubmVlZHNf c2VydmVycyh0ZXN0X25hbWVzKSk6CkBAIC0xNDcsNiArMTYwLDcgQEAgY2xhc3MgTWFuYWdlcihv YmplY3QpOgogICAgICAgICBpZiBub3Qgc2VsZi5fcG9ydC5zdGFydF9oZWxwZXIoc2VsZi5fb3B0 aW9ucy5waXhlbF90ZXN0cyk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAorICAgICAgICBz ZWxmLl91cGRhdGVfbnVtX3dvcmtlcnModGVzdF9uYW1lcykKICAgICAgICAgc2VsZi5fcG9ydC5y ZXNldF9wcmVmZXJlbmNlcygpCiAKICAgICAgICAgIyBDaGVjayB0aGF0IHRoZSBzeXN0ZW0gZGVw ZW5kZW5jaWVzICh0aGVtZXMsIGZvbnRzLCAuLi4pIGFyZSBjb3JyZWN0LgpAQCAtMjUxLDExICsy NjUsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIG5lZWRzX3dlYl9wbGF0Zm9y bV90ZXN0X3NlcnZlciA9IGFueShzZWxmLl9pc193ZWJfcGxhdGZvcm1fdGVzdCh0ZXN0KSBmb3Ig dGVzdCBpbiB0ZXN0c190b19ydW4pCiAgICAgICAgIG5lZWRzX3dlYnNvY2tldHMgPSBhbnkoc2Vs Zi5faXNfd2Vic29ja2V0X3Rlc3QodGVzdCkgZm9yIHRlc3QgaW4gdGVzdHNfdG9fcnVuKQogCi0g ICAgICAgIHRlc3RfaW5wdXRzID0gW10KLSAgICAgICAgZm9yIF8gaW4geHJhbmdlKGl0ZXJhdGlv bnMpOgotICAgICAgICAgICAgZm9yIHRlc3QgaW4gdGVzdHNfdG9fcnVuOgotICAgICAgICAgICAg ICAgIGZvciBfIGluIHhyYW5nZShyZXBlYXRfZWFjaCk6Ci0gICAgICAgICAgICAgICAgICAgIHRl c3RfaW5wdXRzLmFwcGVuZChzZWxmLl90ZXN0X2lucHV0X2Zvcl9maWxlKHRlc3QpKQorICAgICAg ICB0ZXN0X2lucHV0cyA9IHNlbGYuX2dldF90ZXN0X2lucHV0cyh0ZXN0c190b19ydW4sIHJlcGVh dF9lYWNoLCBpdGVyYXRpb25zKQogICAgICAgICByZXR1cm4gc2VsZi5fcnVubmVyLnJ1bl90ZXN0 cyhzZWxmLl9leHBlY3RhdGlvbnMsIHRlc3RfaW5wdXRzLCB0ZXN0c190b19za2lwLCBudW1fd29y a2VycywgbmVlZHNfaHR0cCwgbmVlZHNfd2Vic29ja2V0cywgbmVlZHNfd2ViX3BsYXRmb3JtX3Rl c3Rfc2VydmVyLCByZXRyeWluZykKIAogICAgIGRlZiBfY2xlYW5fdXBfcnVuKHNlbGYpOgo= 267570 2015-12-17 10:48:57 -0800 2015-12-17 12:29:17 -0800 Proposed patch patch_min_sim2 text/plain 4617 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5NDIyMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE1LTEyLTE3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIHNob3VsZG4ndCBzdGFydCBtdWx0aXBsZSBp T1Mgc2ltdWxhdG9ycyB3aGlsZSBvbmx5IHJ1bm5pbmcgb25lIHRlc3QKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjE1NworICAgICAgICA8cmRhcjov L3Byb2JsZW0vMjM4NTE4MTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9s YXlvdXRfdGVzdF9ydW5uZXIucHk6CisgICAgICAgIChMYXlvdXRUZXN0UnVubmVyLmdldF93b3Jr ZXJfY291bnQpOiBDYWxjdWxhdGUgcmVxdWlyZWQgbnVtYmVyIG9mIHdvcmtlcnMuCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToK KyAgICAgICAgKE1hbmFnZXIuX2dldF90ZXN0X2lucHV0cyk6IENvbW1vbiBtZXRob2QgdG8gY2Fs Y3VsYXRlIHRlc3RfaW5wdXRzLgorICAgICAgICAoTWFuYWdlci5fdXBkYXRlX3dvcmtlcl9jb3Vu dCk6IENhbGN1bGF0ZSBhbmQgdXBkYXRlIHJlcXVpcmVkIG51bWJlciBvZiB3b3JrZXJzLgorCiAy MDE1LTEyLTE2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAg ICBydW4td2Via2l0LXRlc3RzIGZhaWxzIHRvIGRlbGV0ZSBTaW11bGF0b3IgZGV2aWNlIGR1cmlu ZyBjbGVhbnVwCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5 CShyZXZpc2lvbiAxOTQyMjApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTc4 LDYgKzc4LDEwIEBAIGNsYXNzIExheW91dFRlc3RSdW5uZXIob2JqZWN0KToKICAgICAgICAgc2Vs Zi5fcmV0cnlpbmcgPSBGYWxzZQogICAgICAgICBzZWxmLl9jdXJyZW50X3J1bl9yZXN1bHRzID0g Tm9uZQogCisgICAgZGVmIGdldF93b3JrZXJfY291bnQoc2VsZiwgdGVzdF9pbnB1dHMsIGNoaWxk X3Byb2Nlc3NfY291bnQpOgorICAgICAgICBhbGxfc2hhcmRzID0gc2VsZi5fc2hhcmRlci5zaGFy ZF90ZXN0cyh0ZXN0X2lucHV0cywgY2hpbGRfcHJvY2Vzc19jb3VudCwgc2VsZi5fb3B0aW9ucy5m dWxseV9wYXJhbGxlbCkKKyAgICAgICAgcmV0dXJuIG1pbihjaGlsZF9wcm9jZXNzX2NvdW50LCBs ZW4oYWxsX3NoYXJkcykpCisKICAgICBkZWYgcnVuX3Rlc3RzKHNlbGYsIGV4cGVjdGF0aW9ucywg dGVzdF9pbnB1dHMsIHRlc3RzX3RvX3NraXAsIG51bV93b3JrZXJzLCBuZWVkc19odHRwLCBuZWVk c193ZWJzb2NrZXRzLCBuZWVkc193ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIsIHJldHJ5aW5nKToK ICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zCiAgICAgICAgIHNlbGYu X3Rlc3RfaW5wdXRzID0gdGVzdF9pbnB1dHMKQEAgLTEwNiw3ICsxMTAsNiBAQCBjbGFzcyBMYXlv dXRUZXN0UnVubmVyKG9iamVjdCk6CiAgICAgICAgIGlmIChzZWxmLl9uZWVkc19odHRwIGFuZCBz ZWxmLl9vcHRpb25zLmh0dHApIG9yIHNlbGYuX25lZWRzX3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZl cjoKICAgICAgICAgICAgIHNlbGYuc3RhcnRfc2VydmVycygpCiAKLSAgICAgICAgbnVtX3dvcmtl cnMgPSBtaW4obnVtX3dvcmtlcnMsIGxlbihhbGxfc2hhcmRzKSkKICAgICAgICAgc2VsZi5fcHJp bnRlci5wcmludF93b3JrZXJzX2FuZF9zaGFyZHMobnVtX3dvcmtlcnMsIGxlbihhbGxfc2hhcmRz KSkKIAogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmRyeV9ydW46CkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXIucHkJKHJldmlzaW9uIDE5NDIyMCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTEzNSw2 ICsxMzUsMTkgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgIGRlZiBuZWVkc19zZXJ2ZXJz KHNlbGYsIHRlc3RfbmFtZXMpOgogICAgICAgICByZXR1cm4gYW55KHNlbGYuX2lzX2h0dHBfdGVz dCh0ZXN0X25hbWUpIGZvciB0ZXN0X25hbWUgaW4gdGVzdF9uYW1lcykgYW5kIHNlbGYuX29wdGlv bnMuaHR0cAogCisgICAgZGVmIF9nZXRfdGVzdF9pbnB1dHMoc2VsZiwgdGVzdHNfdG9fcnVuLCBy ZXBlYXRfZWFjaCwgaXRlcmF0aW9ucyk6CisgICAgICAgIHRlc3RfaW5wdXRzID0gW10KKyAgICAg ICAgZm9yIF8gaW4geHJhbmdlKGl0ZXJhdGlvbnMpOgorICAgICAgICAgICAgZm9yIHRlc3QgaW4g dGVzdHNfdG9fcnVuOgorICAgICAgICAgICAgICAgIGZvciBfIGluIHhyYW5nZShyZXBlYXRfZWFj aCk6CisgICAgICAgICAgICAgICAgICAgIHRlc3RfaW5wdXRzLmFwcGVuZChzZWxmLl90ZXN0X2lu cHV0X2Zvcl9maWxlKHRlc3QpKQorICAgICAgICByZXR1cm4gdGVzdF9pbnB1dHMKKworICAgIGRl ZiBfdXBkYXRlX3dvcmtlcl9jb3VudChzZWxmLCB0ZXN0X25hbWVzKToKKyAgICAgICAgdGVzdF9p bnB1dHMgPSBzZWxmLl9nZXRfdGVzdF9pbnB1dHModGVzdF9uYW1lcywgc2VsZi5fb3B0aW9ucy5y ZXBlYXRfZWFjaCwgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQorICAgICAgICB3b3JrZXJfY291 bnQgPSBzZWxmLl9ydW5uZXIuZ2V0X3dvcmtlcl9jb3VudCh0ZXN0X2lucHV0cywgaW50KHNlbGYu X29wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzKSkKKyAgICAgICAgc2VsZi5fb3B0aW9ucy5jaGlsZF9w cm9jZXNzZXMgPSB3b3JrZXJfY291bnQKKwogICAgIGRlZiBfc2V0X3VwX3J1bihzZWxmLCB0ZXN0 X25hbWVzKToKICAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNoZWNraW5nIGJ1 aWxkIC4uLiIpCiAgICAgICAgIGlmIG5vdCBzZWxmLl9wb3J0LmNoZWNrX2J1aWxkKHNlbGYubmVl ZHNfc2VydmVycyh0ZXN0X25hbWVzKSk6CkBAIC0xNDcsNiArMTYwLDcgQEAgY2xhc3MgTWFuYWdl cihvYmplY3QpOgogICAgICAgICBpZiBub3Qgc2VsZi5fcG9ydC5zdGFydF9oZWxwZXIoc2VsZi5f b3B0aW9ucy5waXhlbF90ZXN0cyk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAorICAgICAg ICBzZWxmLl91cGRhdGVfd29ya2VyX2NvdW50KHRlc3RfbmFtZXMpCiAgICAgICAgIHNlbGYuX3Bv cnQucmVzZXRfcHJlZmVyZW5jZXMoKQogCiAgICAgICAgICMgQ2hlY2sgdGhhdCB0aGUgc3lzdGVt IGRlcGVuZGVuY2llcyAodGhlbWVzLCBmb250cywgLi4uKSBhcmUgY29ycmVjdC4KQEAgLTI1MSwx MSArMjY1LDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBuZWVkc193ZWJfcGxh dGZvcm1fdGVzdF9zZXJ2ZXIgPSBhbnkoc2VsZi5faXNfd2ViX3BsYXRmb3JtX3Rlc3QodGVzdCkg Zm9yIHRlc3QgaW4gdGVzdHNfdG9fcnVuKQogICAgICAgICBuZWVkc193ZWJzb2NrZXRzID0gYW55 KHNlbGYuX2lzX3dlYnNvY2tldF90ZXN0KHRlc3QpIGZvciB0ZXN0IGluIHRlc3RzX3RvX3J1bikK IAotICAgICAgICB0ZXN0X2lucHV0cyA9IFtdCi0gICAgICAgIGZvciBfIGluIHhyYW5nZShpdGVy YXRpb25zKToKLSAgICAgICAgICAgIGZvciB0ZXN0IGluIHRlc3RzX3RvX3J1bjoKLSAgICAgICAg ICAgICAgICBmb3IgXyBpbiB4cmFuZ2UocmVwZWF0X2VhY2gpOgotICAgICAgICAgICAgICAgICAg ICB0ZXN0X2lucHV0cy5hcHBlbmQoc2VsZi5fdGVzdF9pbnB1dF9mb3JfZmlsZSh0ZXN0KSkKKyAg ICAgICAgdGVzdF9pbnB1dHMgPSBzZWxmLl9nZXRfdGVzdF9pbnB1dHModGVzdHNfdG9fcnVuLCBy ZXBlYXRfZWFjaCwgaXRlcmF0aW9ucykKICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bm5lci5ydW5f dGVzdHMoc2VsZi5fZXhwZWN0YXRpb25zLCB0ZXN0X2lucHV0cywgdGVzdHNfdG9fc2tpcCwgbnVt X3dvcmtlcnMsIG5lZWRzX2h0dHAsIG5lZWRzX3dlYnNvY2tldHMsIG5lZWRzX3dlYl9wbGF0Zm9y bV90ZXN0X3NlcnZlciwgcmV0cnlpbmcpCiAKICAgICBkZWYgX2NsZWFuX3VwX3J1bihzZWxmKToK