From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 892AC898BF for ; Fri, 10 May 2019 00:06:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2853A3083394 for ; Fri, 10 May 2019 00:06:20 +0000 (UTC) From: Lyude Date: Thu, 9 May 2019 20:06:04 -0400 Message-Id: <20190510000604.3580-1-lyude@redhat.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] runner: Use glib's regex utilities instead of POSIX ERE List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: RnJvbTogTHl1ZGUgUGF1bCA8bHl1ZGVAcmVkaGF0LmNvbT4KClBPU0lYIEVSRSwgd2hpbGUgcHJl dHR5IHN0YW5kYXJkIGlzIGFsc28gdmVyeSBvbGQgYW5kIHNldmVyZWx5IGxpbWl0ZWQuCkluIGZh Y3QsIGl0J3Mgc28gbGltaXRlZCB0aGF0IEludGVsIENJJ3Mgb3duIHRlc3QgYmxhY2tsaXN0LAp0 ZXN0cy9pbnRlbC1jaS9ibGFja2xpc3QudHh0LCBkb2Vzbid0IGV2ZW4gd29yayB3aXRoIGl0IGR1 ZSB0byB0aGUgbGFjawpvZiBzdXBwb3J0IGZvciBiYWNrcmVmZXJlbmNlcy4KClNpbmNlIHdlJ3Jl IGFscmVhZHkgdXNpbmcgZ2xpYiBpbiBvdGhlciBwYXJ0cyBvZiBpZ3QsIGxldCdzIGp1c3Qgc3Rh cnQKdXNpbmcgZ2xpYidzIHJlZ3VsYXIgZXhwcmVzc2lvbiBtYXRjaGluZyBpbnN0ZWFkIG9mIHRo ZSBQT1NJWCByZWdleCBBUEkuClRoaXMgZ2l2ZXMgdXMgZnVsbCBwZXJsIGNvbXBhdGlibGUgcmVn dWxhciBleHByZXNzaW9ucyBhbmQgaW4gdHVybiwgYWxzbwpnaXZlcyB1cyBweXRob24gY29tcGF0 aWJsZSByZWd1bGFyIGV4cHJlc3Npb25zIHRvIG1hdGNoIHBpZ2xpdC4KClNpZ25lZC1vZmYtYnk6 IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhhdC5jb20+Ci0tLQogcnVubmVyL2pvYl9saXN0LmMgIHwg IDQgKy0tLQogcnVubmVyL21lc29uLmJ1aWxkIHwgIDIgKy0KIHJ1bm5lci9yZXN1bHRnZW4uYyB8 IDE1ICsrKysrKysrKy0tLS0tLQogcnVubmVyL3NldHRpbmdzLmMgIHwgMjYgKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0KIHJ1bm5lci9zZXR0aW5ncy5oICB8ICA0ICsrLS0KIDUgZmlsZXMgY2hh bmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvcnVu bmVyL2pvYl9saXN0LmMgYi9ydW5uZXIvam9iX2xpc3QuYwppbmRleCA5NDFlMmVlMC4uNGExNjc0 MmYgMTAwNjQ0Ci0tLSBhL3J1bm5lci9qb2JfbGlzdC5jCisrKyBiL3J1bm5lci9qb2JfbGlzdC5j CkBAIC0xNywxMCArMTcsOCBAQCBzdGF0aWMgYm9vbCBtYXRjaGVzX2FueShjb25zdCBjaGFyICpz dHIsIHN0cnVjdCByZWdleF9saXN0ICpsaXN0KQogCXNpemVfdCBpOwogCiAJZm9yIChpID0gMDsg aSA8IGxpc3QtPnNpemU7IGkrKykgewotCQlpZiAocmVnZXhlYyhsaXN0LT5yZWdleGVzW2ldLCBz dHIsCi0JCQkgICAgKHNpemVfdCkwLCBOVUxMLCAwKSA9PSAwKSB7CisJCWlmIChnX3JlZ2V4X21h dGNoKGxpc3QtPnJlZ2V4ZXNbaV0sIHN0ciwgMCwgTlVMTCkpCiAJCQlyZXR1cm4gdHJ1ZTsKLQkJ fQogCX0KIAogCXJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL3J1bm5lci9tZXNvbi5idWlsZCBi L3J1bm5lci9tZXNvbi5idWlsZAppbmRleCBkZTZlNmYxYy4uMWZmYzk1YjQgMTAwNjQ0Ci0tLSBh L3J1bm5lci9tZXNvbi5idWlsZAorKysgYi9ydW5uZXIvbWVzb24uYnVpbGQKQEAgLTE3LDcgKzE3 LDcgQEAgaWYgX2J1aWxkX3J1bm5lciBhbmQganNvbmMuZm91bmQoKQogCiAJcnVubmVybGliID0g c3RhdGljX2xpYnJhcnkoJ2lndF9ydW5uZXInLCBydW5uZXJsaWJfc291cmNlcywKIAkJCQkgICBp bmNsdWRlX2RpcmVjdG9yaWVzIDogaW5jLAotCQkJCSAgIGRlcGVuZGVuY2llcyA6IGpzb25jKQor CQkJCSAgIGRlcGVuZGVuY2llcyA6IFtqc29uYywgZ2xpYl0pCiAKIAlydW5uZXIgPSBleGVjdXRh YmxlKCdpZ3RfcnVubmVyJywgcnVubmVyX3NvdXJjZXMsCiAJCQkgICAgbGlua193aXRoIDogcnVu bmVybGliLApkaWZmIC0tZ2l0IGEvcnVubmVyL3Jlc3VsdGdlbi5jIGIvcnVubmVyL3Jlc3VsdGdl bi5jCmluZGV4IGQ5NzAyYTE5Li4yYjdkMjZkNSAxMDA2NDQKLS0tIGEvcnVubmVyL3Jlc3VsdGdl bi5jCisrKyBiL3J1bm5lci9yZXN1bHRnZW4uYwpAQCAtNDk5LDE0ICs0OTksMTcgQEAgc3RhdGlj IGNvbnN0IGNoYXIgaWd0X2RtZXNnX3doaXRlbGlzdFtdID0KIHN0YXRpYyBjb25zdCBjaGFyIGln dF9waWdsaXRfc3R5bGVfZG1lc2dfYmxhY2tsaXN0W10gPQogCSIoXFxbZHJtOnxkcm1ffGludGVs X3xpOTE1XykiOwogCi1zdGF0aWMgYm9vbCBpbml0X3JlZ2V4X3doaXRlbGlzdChzdHJ1Y3Qgc2V0 dGluZ3MqIHNldHRpbmdzLCByZWdleF90KiByZSkKK3N0YXRpYyBib29sIGluaXRfcmVnZXhfd2hp dGVsaXN0KHN0cnVjdCBzZXR0aW5ncyogc2V0dGluZ3MsIEdSZWdleCAqKnJlKQogeworCUdFcnJv ciAqZXJyID0gTlVMTDsKIAljb25zdCBjaGFyICpyZWdleCA9IHNldHRpbmdzLT5waWdsaXRfc3R5 bGVfZG1lc2cgPwogCQlpZ3RfcGlnbGl0X3N0eWxlX2RtZXNnX2JsYWNrbGlzdCA6CiAJCWlndF9k bWVzZ193aGl0ZWxpc3Q7CiAKLQlpZiAocmVnY29tcChyZSwgcmVnZXgsIFJFR19FWFRFTkRFRCB8 IFJFR19OT1NVQikgIT0gMCkgeworCSpyZSA9IGdfcmVnZXhfbmV3KHJlZ2V4LCBHX1JFR0VYX09Q VElNSVpFLCAwLCAmZXJyKTsKKwlpZiAoZXJyKSB7CiAJCWZwcmludGYoc3RkZXJyLCAiQ2Fubm90 IGNvbXBpbGUgZG1lc2cgcmVnZXhwXG4iKTsKKwkJZ19lcnJvcl9mcmVlKGVycik7CiAJCXJldHVy biBmYWxzZTsKIAl9CiAKQEAgLTYzMCw3ICs2MzMsNyBAQCBzdGF0aWMgYm9vbCBmaWxsX2Zyb21f ZG1lc2coaW50IGZkLAogCWNoYXIgcGlnbGl0X25hbWVbMjU2XTsKIAlzc2l6ZV90IHJlYWQ7CiAJ c2l6ZV90IGk7Ci0JcmVnZXhfdCByZTsKKwlHUmVnZXggKnJlOwogCiAJaWYgKCFmKSB7CiAJCXJl dHVybiBmYWxzZTsKQEAgLTY3MSwxMiArNjc0LDEyIEBAIHN0YXRpYyBib29sIGZpbGxfZnJvbV9k bWVzZyhpbnQgZmQsCiAKIAkJaWYgKHNldHRpbmdzLT5waWdsaXRfc3R5bGVfZG1lc2cpIHsKIAkJ CWlmICgoZmxhZ3MgJiAweDA3KSA8PSBzZXR0aW5ncy0+ZG1lc2dfd2Fybl9sZXZlbCAmJiBjb250 aW51YXRpb24gIT0gJ2MnICYmCi0JCQkgICAgcmVnZXhlYygmcmUsIG1lc3NhZ2UsIChzaXplX3Qp MCwgTlVMTCwgMCkgIT0gUkVHX05PTUFUQ0gpIHsKKwkJCSAgICBnX3JlZ2V4X21hdGNoKHJlLCBt ZXNzYWdlLCAwLCBOVUxMKSkgewogCQkJCWFwcGVuZF9saW5lKCZ3YXJuaW5ncywgJndhcm5pbmdz bGVuLCBmb3JtYXR0ZWQpOwogCQkJfQogCQl9IGVsc2UgewogCQkJaWYgKChmbGFncyAmIDB4MDcp IDw9IHNldHRpbmdzLT5kbWVzZ193YXJuX2xldmVsICYmIGNvbnRpbnVhdGlvbiAhPSAnYycgJiYK LQkJCSAgICByZWdleGVjKCZyZSwgbWVzc2FnZSwgKHNpemVfdCkwLCBOVUxMLCAwKSA9PSBSRUdf Tk9NQVRDSCkgeworCQkJICAgICFnX3JlZ2V4X21hdGNoKHJlLCBtZXNzYWdlLCAwLCBOVUxMKSkg ewogCQkJCWFwcGVuZF9saW5lKCZ3YXJuaW5ncywgJndhcm5pbmdzbGVuLCBmb3JtYXR0ZWQpOwog CQkJfQogCQl9CkBAIC03MTUsNyArNzE4LDcgQEAgc3RhdGljIGJvb2wgZmlsbF9mcm9tX2RtZXNn KGludCBmZCwKIAogCWZyZWUoZG1lc2cpOwogCWZyZWUod2FybmluZ3MpOwotCXJlZ2ZyZWUoJnJl KTsKKwlnX3JlZ2V4X3VucmVmKHJlKTsKIAlmY2xvc2UoZik7CiAJcmV0dXJuIHRydWU7CiB9CmRp ZmYgLS1naXQgYS9ydW5uZXIvc2V0dGluZ3MuYyBiL3J1bm5lci9zZXR0aW5ncy5jCmluZGV4IDI1 YmNmNTMxLi5hZDM4YWU4ZCAxMDA2NDQKLS0tIGEvcnVubmVyL3NldHRpbmdzLmMKKysrIGIvcnVu bmVyL3NldHRpbmdzLmMKQEAgLTE4NywyMyArMTg3LDE4IEBAIHN0YXRpYyB2b2lkIHVzYWdlKGNv bnN0IGNoYXIgKmV4dHJhX21lc3NhZ2UsIEZJTEUgKmYpCiAKIHN0YXRpYyBib29sIGFkZF9yZWdl eChzdHJ1Y3QgcmVnZXhfbGlzdCAqbGlzdCwgY2hhciAqbmV3KQogewotCXJlZ2V4X3QgKnJlZ2V4 OwotCXNpemVfdCBidWZsZW47Ci0JY2hhciAqYnVmOwotCWludCBzOwotCi0JcmVnZXggPSBtYWxs b2Moc2l6ZW9mKCpyZWdleCkpOwotCi0JaWYgKChzID0gcmVnY29tcChyZWdleCwgbmV3LAotCQkJ IFJFR19FWFRFTkRFRCB8IFJFR19OT1NVQikpICE9IDApIHsKLQkJYnVmbGVuID0gcmVnZXJyb3Io cywgcmVnZXgsIE5VTEwsIDApOwotCQlidWYgPSBtYWxsb2MoYnVmbGVuKTsKLQkJcmVnZXJyb3Io cywgcmVnZXgsIGJ1ZiwgYnVmbGVuKTsKKwlHUmVnZXggKnJlZ2V4OworCUdFcnJvciAqZXJyb3Ig PSBOVUxMOworCisJcmVnZXggPSBnX3JlZ2V4X25ldyhuZXcsIEdfUkVHRVhfT1BUSU1JWkUsIDAs ICZlcnJvcik7CisJaWYgKGVycm9yKSB7CisJCWNoYXIgKmJ1ZiA9IG1hbGxvYyhzbnByaW50ZihO VUxMLCAwLCAiSW52YWxpZCByZWdleCAnJXMnOiAlcyIsIG5ldywgZXJyb3ItPm1lc3NhZ2UpICsg MSk7CisKKwkJc3ByaW50ZihidWYsICJJbnZhbGlkIHJlZ2V4ICclcyc6ICVzIiwgbmV3LCBlcnJv ci0+bWVzc2FnZSk7CiAJCXVzYWdlKGJ1Ziwgc3RkZXJyKTsKIAogCQlmcmVlKGJ1Zik7Ci0JCXJl Z2ZyZWUocmVnZXgpOwotCQlmcmVlKHJlZ2V4KTsKKwkJZ19lcnJvcl9mcmVlKGVycm9yKTsKIAkJ cmV0dXJuIGZhbHNlOwogCX0KIApAQCAtMjI0LDggKzIxOSw3IEBAIHN0YXRpYyB2b2lkIGZyZWVf cmVnZXhlcyhzdHJ1Y3QgcmVnZXhfbGlzdCAqcmVnZXhlcykKIAogCWZvciAoaSA9IDA7IGkgPCBy ZWdleGVzLT5zaXplOyBpKyspIHsKIAkJZnJlZShyZWdleGVzLT5yZWdleF9zdHJpbmdzW2ldKTsK LQkJcmVnZnJlZShyZWdleGVzLT5yZWdleGVzW2ldKTsKLQkJZnJlZShyZWdleGVzLT5yZWdleGVz W2ldKTsKKwkJZ19yZWdleF91bnJlZihyZWdleGVzLT5yZWdleGVzW2ldKTsKIAl9CiAJZnJlZShy ZWdleGVzLT5yZWdleF9zdHJpbmdzKTsKIAlmcmVlKHJlZ2V4ZXMtPnJlZ2V4ZXMpOwpkaWZmIC0t Z2l0IGEvcnVubmVyL3NldHRpbmdzLmggYi9ydW5uZXIvc2V0dGluZ3MuaAppbmRleCA2NzJhM2Fm OC4uMGExZWUwOGQgMTAwNjQ0Ci0tLSBhL3J1bm5lci9zZXR0aW5ncy5oCisrKyBiL3J1bm5lci9z ZXR0aW5ncy5oCkBAIC00LDggKzQsOCBAQAogI2luY2x1ZGUgPHN0ZGJvb2wuaD4KICNpbmNsdWRl IDxzdGRkZWYuaD4KICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KLSNpbmNsdWRlIDxyZWdleC5oPgog I2luY2x1ZGUgPHN0ZGlvLmg+CisjaW5jbHVkZSA8Z2xpYi5oPgogCiBlbnVtIHsKIAlMT0dfTEVW RUxfTk9STUFMID0gMCwKQEAgLTIxLDcgKzIxLDcgQEAgX1N0YXRpY19hc3NlcnQoQUJPUlRfQUxM ID09IChBQk9SVF9UQUlOVCB8IEFCT1JUX0xPQ0tERVApLCAiQUJPUlRfQUxMIG11c3QgYmUgYWwK IAogc3RydWN0IHJlZ2V4X2xpc3QgewogCWNoYXIgKipyZWdleF9zdHJpbmdzOwotCXJlZ2V4X3Qq KiByZWdleGVzOworCUdSZWdleCAqKnJlZ2V4ZXM7CiAJc2l6ZV90IHNpemU7CiB9OwogCi0tIAoy LjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmln dC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldg==