146305 2015-06-24 18:47:01 -0700 Add command line option and private function to set timeout in jsc command 2015-06-25 11:29:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All ASSIGNED P2 Normal --- 1 msaboff msaboff fpizlo oldest_to_newest 1104579 0 msaboff 2015-06-24 18:47:01 -0700 The jsc command can accept the JSC_timeout environment variable to set a "watch dog" type of timeout. There should be a way to set this from the command line and for a test to call a function to set this as well. 1104582 1 msaboff 2015-06-24 18:49:17 -0700 Add a timeout to the test created for https://bugs.webkit.org/show_bug.cgi?id=146298 after this is complete. 1104685 2 255564 msaboff 2015-06-25 11:25:12 -0700 Created attachment 255564 Patch 1104687 3 fpizlo 2015-06-25 11:29:18 -0700 Please hold off on this until you figure out why your test didn't timeout using the existing timeout machinery. 1104688 4 255564 fpizlo 2015-06-25 11:29:56 -0700 Comment on attachment 255564 Patch Lets hold off on this. 255564 2015-06-25 11:25:12 -0700 2015-06-25 11:29:56 -0700 Patch 146305.patch text/plain 5433 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg1OTU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDE1LTA2LTI1ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIEFkZCBjb21tYW5kIGxpbmUgb3B0aW9uIGFuZCBwcml2YXRlIGZ1bmN0aW9uIHRvIHNldCB0 aW1lb3V0IGluIGpzYyBjb21tYW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDYzMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZSBjdXJyZW50bHkgcHJvdmlkZSBhIHdhdGNoIGRvZyB0aW1lb3V0IGZv ciBodW5nIHNjcmlwdHMgdG8gdGhlIGpzYyBjb21tYW5kIHZpYSB0aGUgZW52aXJvbm1lbnQKKyAg ICAgICAgdmFyaWFibGUgSlNDX3RpbWVvdXQuICBUaGlzIGNoYW5nZSBleHRlbmRzIHRoZSB3YXlz IHRvIHNldCBhIHRpbWVvdXQgdG8gaW5jdWRlIHRoZSBjb21tYW5kIGxpbmUsCisgICAgICAgIHZp YSB0aGUgLXQgPHRpbWU+IG9wdGlvbiwgb3IgdmlhIHRoZSBqc2Mgb25seSBmdW5jdGlvbiBzZXRK U0NUaW1lb3V0KCkuICBPbmx5IG9uZSB0aW1lb3V0IGNhbiBiZSBzZXQuICAKKyAgICAgICAgVGhl IHByaW9yaXR5IG9yZGVyIGlzIGVudmlyb25tZW50IHZhcmlhYmxlLCBjb21tYW5kIGxpbmUgYW5k IHRoZW4gdmlhIHRoZSBmdW5jdGlvbi4KKworICAgICAgICAqIGpzYy5jcHA6CisgICAgICAgIChH bG9iYWxPYmplY3Q6OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAgKGZ1bmN0aW9uVmVyc2lvbik6 CisgICAgICAgIChmdW5jdGlvblNldEpTQ1RpbWVvdXQpOgorICAgICAgICAoZnVuY3Rpb25SdW4p OgorICAgICAgICAodGltZW91dFRocmVhZE1haW4pOgorICAgICAgICAoY3JlYXRlVGltZW91dFRo cmVhZCk6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKHByaW50VXNhZ2VTdGF0ZW1lbnQpOgor ICAgICAgICAoQ29tbWFuZExpbmU6OnBhcnNlQXJndW1lbnRzKToKKwogMjAxNS0wNi0yNSAgTWlj aGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChy MTgxODg5KTogYmFzc3Byby5jb20gaGFuZ3Mgb24gbG9hZCB1bmRlciBKU0M6OkVycm9ySW5zdGFu Y2U6OmZpbmlzaENyZWF0aW9uKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpWTSYsIFdURjo6U3RyaW5n IGNvbnN0JiwgYm9vbCkgKyAyODAxIChKYXZhU2NyaXB0Q29yZSArIDM1NjA2ODkpCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvanNjLmNwcAkocmV2aXNpb24gMTg1OTUzKQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2pzYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzNyw2ICs0MzcsNyBAQCB2b2lkIEVsZW1l bnQ6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgUm9vCiAKIH0KIAorc3RhdGljIHZvaWQgY3JlYXRl VGltZW91dFRocmVhZChjb25zdCBjaGFyKik7CiBzdGF0aWMgYm9vbCBmaWxsQnVmZmVyV2l0aENv bnRlbnRzT2ZGaWxlKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIFZlY3RvcjxjaGFyPiYgYnVmZmVy KTsKIAogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25DcmVhdGVQ cm94eShFeGVjU3RhdGUqKTsKQEAgLTQ2NCw2ICs0NjUsNyBAQCBzdGF0aWMgRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBmdW5jCiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBmdW5jdGlvbkR1bXBDYWxsRnJhbWUoRXhlY1N0YXRlKik7CiAjZW5kaWYKIHN0YXRpYyBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uVmVyc2lvbihFeGVjU3RhdGUqKTsKK3N0 YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uU2V0SlNDVGltZW91dChF eGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9u UnVuKEV4ZWNTdGF0ZSopOwogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVu Y3Rpb25Mb2FkKEV4ZWNTdGF0ZSopOwogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwgZnVuY3Rpb25SZWFkRmlsZShFeGVjU3RhdGUqKTsKQEAgLTYwNiw2ICs2MDgsNyBAQCBwcm90 ZWN0ZWQ6CiAgICAgICAgIGFkZEZ1bmN0aW9uKHZtLCAicmVsZWFzZUV4ZWN1dGFibGVNZW1vcnki LCBmdW5jdGlvblJlbGVhc2VFeGVjdXRhYmxlTWVtb3J5LCAwKTsKICNlbmRpZgogICAgICAgICBh ZGRGdW5jdGlvbih2bSwgInZlcnNpb24iLCBmdW5jdGlvblZlcnNpb24sIDEpOworICAgICAgICBh ZGRGdW5jdGlvbih2bSwgInNldEpTQ1RpbWVvdXQiLCBmdW5jdGlvblNldEpTQ1RpbWVvdXQsIDEp OwogICAgICAgICBhZGRGdW5jdGlvbih2bSwgInJ1biIsIGZ1bmN0aW9uUnVuLCAxKTsKICAgICAg ICAgYWRkRnVuY3Rpb24odm0sICJsb2FkIiwgZnVuY3Rpb25Mb2FkLCAxKTsKICAgICAgICAgYWRk RnVuY3Rpb24odm0sICJyZWFkRmlsZSIsIGZ1bmN0aW9uUmVhZEZpbGUsIDEpOwpAQCAtOTEwLDYg KzkxMywxMyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uVmVyCiAgICAg cmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIAorRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvblNldEpTQ1RpbWVvdXQoRXhlY1N0YXRlKiBleGVjKQor eworICAgIFN0cmluZyB0aW1lb3V0U3RyaW5nID0gZXhlYy0+YXJndW1lbnQoMCkudG9TdHJpbmco ZXhlYyktPnZhbHVlKGV4ZWMpOworICAgIGNyZWF0ZVRpbWVvdXRUaHJlYWQodGltZW91dFN0cmlu Zy5hc2NpaSgpLmRhdGEoKSk7CisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5l ZCgpKTsKK30KKwogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvblJ1bihFeGVj U3RhdGUqIGV4ZWMpCiB7CiAgICAgU3RyaW5nIGZpbGVOYW1lID0gZXhlYy0+YXJndW1lbnQoMCku dG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpOwpAQCAtMTIwOCw2ICsxMjE4LDI0IEBAIHN0YXRp YyBOT19SRVRVUk5fRFVFX1RPX0NSQVNIIHZvaWQgdGltZW8KICAgICBDUkFTSCgpOwogfQogCitz dGF0aWMgdm9pZCBjcmVhdGVUaW1lb3V0VGhyZWFkKGNvbnN0IGNoYXIqIHRpbWVvdXRTdHJpbmcp Cit7CisgICAgc3RhdGljIGJvb2wgc3RhcnRlZFRpbWVvdXRUaHJlYWQgPSBmYWxzZTsKKworICAg IGlmIChzdGFydGVkVGltZW91dFRocmVhZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKHNz Y2FuZih0aW1lb3V0U3RyaW5nLCAiJWxmIiwgJnNfZGVzaXJlZFRpbWVvdXQpICE9IDEpIHsKKyAg ICAgICAgZGF0YUxvZygiV0FSTklORzogdGltZW91dCBzdHJpbmcgaXMgbWFsZm9ybWVkLCBnb3Qg IiwgdGltZW91dFN0cmluZywKKyAgICAgICAgICAgICIgYnV0IGV4cGVjdGVkIGEgbnVtYmVyLiBO b3QgdXNpbmcgYSB0aW1lb3V0LlxuIik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisg ICAgY3JlYXRlVGhyZWFkKHRpbWVvdXRUaHJlYWRNYWluLCAwLCAianNjIFRpbWVvdXQgVGhyZWFk Iik7CisKKyAgICBzdGFydGVkVGltZW91dFRocmVhZCA9IHRydWU7Cit9CisKIGludCBtYWluKGlu dCBhcmdjLCBjaGFyKiogYXJndikKIHsKICNpZiBQTEFURk9STShJT1MpICYmIENQVShBUk1fVEhV TUIyKQpAQCAtMTI1MywxNCArMTI4MSw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJn dikKICNlbmRpZgogICAgIEpTQzo6aW5pdGlhbGl6ZVRocmVhZGluZygpOwogCi0gICAgaWYgKGNo YXIqIHRpbWVvdXRTdHJpbmcgPSBnZXRlbnYoIkpTQ190aW1lb3V0IikpIHsKLSAgICAgICAgaWYg KHNzY2FuZih0aW1lb3V0U3RyaW5nLCAiJWxmIiwgJnNfZGVzaXJlZFRpbWVvdXQpICE9IDEpIHsK LSAgICAgICAgICAgIGRhdGFMb2coCi0gICAgICAgICAgICAgICAgIldBUk5JTkc6IHRpbWVvdXQg c3RyaW5nIGlzIG1hbGZvcm1lZCwgZ290ICIsIHRpbWVvdXRTdHJpbmcsCi0gICAgICAgICAgICAg ICAgIiBidXQgZXhwZWN0ZWQgYSBudW1iZXIuIE5vdCB1c2luZyBhIHRpbWVvdXQuXG4iKTsKLSAg ICAgICAgfSBlbHNlCi0gICAgICAgICAgICBjcmVhdGVUaHJlYWQodGltZW91dFRocmVhZE1haW4s IDAsICJqc2MgVGltZW91dCBUaHJlYWQiKTsKLSAgICB9CisgICAgaWYgKGNoYXIqIHRpbWVvdXRT dHJpbmcgPSBnZXRlbnYoIkpTQ190aW1lb3V0IikpCisgICAgICAgIGNyZWF0ZVRpbWVvdXRUaHJl YWQodGltZW91dFN0cmluZyk7CiAKICNpZiBQTEFURk9STShJT1MpCiAgICAgT3B0aW9uczo6Y3Jh c2hJZkNhbnRBbGxvY2F0ZUpJVE1lbW9yeSgpID0gdHJ1ZTsKQEAgLTE0MTUsNiArMTQzNyw3IEBA IHN0YXRpYyBOT19SRVRVUk4gdm9pZCBwcmludFVzYWdlU3RhdGVtZW4KICNpZiBIQVZFKFNJR05B TF9IKQogICAgIGZwcmludGYoc3RkZXJyLCAiICAtcyAgICAgICAgIEluc3RhbGxzIHNpZ25hbCBo YW5kbGVycyB0aGF0IGV4aXQgb24gYSBjcmFzaCAoVW5peCBwbGF0Zm9ybXMgb25seSlcbiIpOwog I2VuZGlmCisgICAgZnByaW50ZihzdGRlcnIsICIgIC10IDx0aW1lPiAgSW5zdGFsbHMgd2F0Y2gg ZG9nIHRpbWVyIG9mIDx0aW1lPiBzZWNvbmRzXG4iKTsKICAgICBmcHJpbnRmKHN0ZGVyciwgIiAg LXAgPGZpbGU+ICBPdXRwdXRzIHByb2ZpbGluZyBkYXRhIHRvIGEgZmlsZVxuIik7CiAgICAgZnBy aW50ZihzdGRlcnIsICIgIC14ICAgICAgICAgT3V0cHV0IGV4aXQgY29kZSBiZWZvcmUgdGVybWlu YXRpbmdcbiIpOwogICAgIGZwcmludGYoc3RkZXJyLCAiXG4iKTsKQEAgLTE0NzAsNiArMTQ5Mywx MiBAQCB2b2lkIENvbW1hbmRMaW5lOjpwYXJzZUFyZ3VtZW50cyhpbnQgYXJnCiAjZW5kaWYKICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CisgICAgICAgIGlmICghc3RyY21wKGFyZywg Ii10IikpIHsKKyAgICAgICAgICAgIGlmICgrK2kgPT0gYXJnYykKKyAgICAgICAgICAgICAgICBw cmludFVzYWdlU3RhdGVtZW50KCk7CisgICAgICAgICAgICBjcmVhdGVUaW1lb3V0VGhyZWFkKGFy Z3ZbaV0pOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KICAgICAgICAgaWYgKCFz dHJjbXAoYXJnLCAiLXgiKSkgewogICAgICAgICAgICAgbV9leGl0Q29kZSA9IHRydWU7CiAgICAg ICAgICAgICBjb250aW51ZTsK