From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F1E36E1DE for ; Mon, 2 Dec 2019 13:01:19 +0000 (UTC) From: Petri Latvala Date: Mon, 2 Dec 2019 15:01:00 +0200 Message-Id: <20191202130109.929-3-petri.latvala@intel.com> In-Reply-To: <20191202130109.929-1-petri.latvala@intel.com> References: <20191202130109.929-1-petri.latvala@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 02/11] runner/resultgen: Extract finding begin/end lines for a subtest to a helper 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 Cc: Petri Latvala List-ID: U2lnbmVkLW9mZi1ieTogUGV0cmkgTGF0dmFsYSA8cGV0cmkubGF0dmFsYUBpbnRlbC5jb20+Ci0t LQogcnVubmVyL3Jlc3VsdGdlbi5jIHwgOTkgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDQ4IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3J1bm5lci9yZXN1bHRnZW4uYyBiL3J1bm5lci9yZXN1 bHRnZW4uYwppbmRleCAzMWJjMGJiMS4uYmUwNTgzMjcgMTAwNjQ0Ci0tLSBhL3J1bm5lci9yZXN1 bHRnZW4uYworKysgYi9ydW5uZXIvcmVzdWx0Z2VuLmMKQEAgLTM3Niw2ICszNzYsNTQgQEAgc3Rh dGljIHZvaWQgYWRkX2lndF92ZXJzaW9uKHN0cnVjdCBqc29uX29iamVjdCAqdGVzdG9iaiwKIAog fQogCitzdGF0aWMgaW50IGZpbmRfc3VidGVzdF9pZHhfbGltaXRlZChzdHJ1Y3QgbWF0Y2hlcyBt YXRjaGVzLAorCQkJCSAgICBjb25zdCBjaGFyICpidWZlbmQsCisJCQkJICAgIGNvbnN0IGNoYXIg KmxpbmVrZXksCisJCQkJICAgIGNvbnN0IGNoYXIgKnBhdHRlcm4sCisJCQkJICAgIGNvbnN0IGNo YXIgKnN1YnRlc3RfbmFtZSwKKwkJCQkgICAgaW50IGZpcnN0LAorCQkJCSAgICBpbnQgbGFzdCkK K3sKKwljaGFyICpmdWxsX2xpbmU7CisJaW50IGxpbmVfbGVuOworCWludCBrOworCisJLyoKKwkg KiBUaGUgcGF0dGVybiBpcyBhIHN0cmluZyBsaXRlcmFsIGluIGFsbCBjYWxsLXNpdGVzLCBhbmQg d2UKKwkgKiBkb24ndCB3YW50IHRvIGRpc2FibGUgdGhpcyB3YXJuaW5nIGdsb2JhbGx5CisJICov CisjcHJhZ21hIEdDQyBkaWFnbm9zdGljIHB1c2gKKyNwcmFnbWEgR0NDIGRpYWdub3N0aWMgaWdu b3JlZCAiLVdmb3JtYXQtbm9ubGl0ZXJhbCIKKwlsaW5lX2xlbiA9IGFzcHJpbnRmKCZmdWxsX2xp bmUsIHBhdHRlcm4sIGxpbmVrZXksIHN1YnRlc3RfbmFtZSk7CisjcHJhZ21hIEdDQyBkaWFnbm9z dGljIHBvcAorCisJaWYgKGxpbmVfbGVuIDwgMCkKKwkJcmV0dXJuIC0xOworCisJZm9yIChrID0g Zmlyc3Q7IGsgPCBsYXN0OyBrKyspCisJCWlmIChtYXRjaGVzLml0ZW1zW2tdLndoYXQgPT0gbGlu ZWtleSAmJgorCQkgICAgIW1lbWNtcChtYXRjaGVzLml0ZW1zW2tdLndoZXJlLAorCQkJICAgIGZ1 bGxfbGluZSwKKwkJCSAgICBtaW4obGluZV9sZW4sIGJ1ZmVuZCAtIG1hdGNoZXMuaXRlbXNba10u d2hlcmUpKSkKKwkJCWJyZWFrOworCisJZnJlZShmdWxsX2xpbmUpOworCisJaWYgKGsgPT0gbGFz dCkKKwkJayA9IC0xOworCisJcmV0dXJuIGs7Cit9CisKK3N0YXRpYyBpbnQgZmluZF9zdWJ0ZXN0 X2lkeChzdHJ1Y3QgbWF0Y2hlcyBtYXRjaGVzLAorCQkJICAgIGNvbnN0IGNoYXIgKmJ1ZmVuZCwK KwkJCSAgICBjb25zdCBjaGFyICpsaW5la2V5LAorCQkJICAgIGNvbnN0IGNoYXIgKnBhdHRlcm4s CisJCQkgICAgY29uc3QgY2hhciAqc3VidGVzdF9uYW1lKQoreworCXJldHVybiBmaW5kX3N1YnRl c3RfaWR4X2xpbWl0ZWQobWF0Y2hlcywgYnVmZW5kLCBsaW5la2V5LCBwYXR0ZXJuLCBzdWJ0ZXN0 X25hbWUsIDAsIG1hdGNoZXMuc2l6ZSk7Cit9CisKIHN0YXRpYyBib29sIGZpbGxfZnJvbV9vdXRw dXQoaW50IGZkLCBjb25zdCBjaGFyICpiaW5hcnksIGNvbnN0IGNoYXIgKmtleSwKIAkJCSAgICAg c3RydWN0IHN1YnRlc3RfbGlzdCAqc3VidGVzdHMsCiAJCQkgICAgIHN0cnVjdCBqc29uX29iamVj dCAqdGVzdHMpCkBAIC00MzksNDQgKzQ4NywxNiBAQCBzdGF0aWMgYm9vbCBmaWxsX2Zyb21fb3V0 cHV0KGludCBmZCwgY29uc3QgY2hhciAqYmluYXJ5LCBjb25zdCBjaGFyICprZXksCiAJbWF0Y2hl cyA9IGZpbmRfbWF0Y2hlcyhidWYsIGJ1ZmVuZCwgbmVlZGxlcyk7CiAKIAlmb3IgKGkgPSAwOyBp IDwgc3VidGVzdHMtPnNpemU7IGkrKykgewotCQljaGFyICp0aGlzX3N1Yl9iZWdpbiwgKnRoaXNf c3ViX3Jlc3VsdDsKIAkJaW50IGJlZ2luX2lkeCA9IC0xLCByZXN1bHRfaWR4ID0gLTE7CiAJCWNv bnN0IGNoYXIgKnJlc3VsdHRleHQ7CiAJCWNvbnN0IGNoYXIgKmJlZywgKmVuZDsKIAkJZG91Ymxl IHRpbWU7Ci0JCWludCBiZWdpbl9sZW47Ci0JCWludCByZXN1bHRfbGVuOwogCiAJCWdlbmVyYXRl X3BpZ2xpdF9uYW1lKGJpbmFyeSwgc3VidGVzdHMtPnN1YnNbaV0ubmFtZSwgcGlnbGl0X25hbWUs IHNpemVvZihwaWdsaXRfbmFtZSkpOwogCQljdXJyZW50X3Rlc3QgPSBnZXRfb3JfY3JlYXRlX2pz b25fb2JqZWN0KHRlc3RzLCBwaWdsaXRfbmFtZSk7CiAKLQkJYmVnaW5fbGVuID0gYXNwcmludGYo JnRoaXNfc3ViX2JlZ2luLCAiJXMlc1xuIiwgU1RBUlRJTkdfU1VCVEVTVCwgc3VidGVzdHMtPnN1 YnNbaV0ubmFtZSk7Ci0JCXJlc3VsdF9sZW4gPSBhc3ByaW50ZigmdGhpc19zdWJfcmVzdWx0LCAi JXMlczogIiwgU1VCVEVTVF9SRVNVTFQsIHN1YnRlc3RzLT5zdWJzW2ldLm5hbWUpOwotCi0JCWlm IChiZWdpbl9sZW4gPCAwIHx8IHJlc3VsdF9sZW4gPCAwKSB7Ci0JCQlmcHJpbnRmKHN0ZGVyciwg IkZhaWx1cmUgZ2VuZXJhdGluZyBzdHJpbmdzXG4iKTsKLQkJCXJldHVybiBmYWxzZTsKLQkJfQot Ci0JCWZvciAoayA9IDA7IGsgPCBtYXRjaGVzLnNpemU7IGsrKykgewotCQkJaWYgKG1hdGNoZXMu aXRlbXNba10ud2hhdCA9PSBTVEFSVElOR19TVUJURVNUICYmCi0JCQkgICAgIW1lbWNtcChtYXRj aGVzLml0ZW1zW2tdLndoZXJlLAotCQkJCSAgICB0aGlzX3N1Yl9iZWdpbiwKLQkJCQkgICAgbWlu KGJlZ2luX2xlbiwgYnVmZW5kIC0gbWF0Y2hlcy5pdGVtc1trXS53aGVyZSkpKSB7Ci0JCQkJYmVn ID0gbWF0Y2hlcy5pdGVtc1trXS53aGVyZTsKLQkJCQliZWdpbl9pZHggPSBrOwotCQkJfQotCQkJ aWYgKG1hdGNoZXMuaXRlbXNba10ud2hhdCA9PSBTVUJURVNUX1JFU1VMVCAmJgotCQkJICAgICFt ZW1jbXAobWF0Y2hlcy5pdGVtc1trXS53aGVyZSwKLQkJCQkgICAgdGhpc19zdWJfcmVzdWx0LAot CQkJCSAgICBtaW4ocmVzdWx0X2xlbiwgYnVmZW5kIC0gbWF0Y2hlcy5pdGVtc1trXS53aGVyZSkp KSB7Ci0JCQkJZW5kID0gbWF0Y2hlcy5pdGVtc1trXS53aGVyZTsKLQkJCQlyZXN1bHRfaWR4ID0g azsKLQkJCX0KLQkJfQotCi0JCWZyZWUodGhpc19zdWJfYmVnaW4pOwotCQlmcmVlKHRoaXNfc3Vi X3Jlc3VsdCk7CisJCWJlZ2luX2lkeCA9IGZpbmRfc3VidGVzdF9pZHgobWF0Y2hlcywgYnVmZW5k LCBTVEFSVElOR19TVUJURVNULCAiJXMlc1xuIiwgc3VidGVzdHMtPnN1YnNbaV0ubmFtZSk7CisJ CXJlc3VsdF9pZHggPSBmaW5kX3N1YnRlc3RfaWR4KG1hdGNoZXMsIGJ1ZmVuZCwgU1VCVEVTVF9S RVNVTFQsICIlcyVzOiAiLCBzdWJ0ZXN0cy0+c3Vic1tpXS5uYW1lKTsKIAogCQlpZiAoYmVnaW5f aWR4IDwgMCAmJiByZXN1bHRfaWR4IDwgMCkgewogCQkJLyogTm8gb3V0cHV0IGF0IGFsbCAqLwpA QCAtNTYyLDMxICs1ODIsMTQgQEAgc3RhdGljIGJvb2wgZmlsbF9mcm9tX291dHB1dChpbnQgZmQs IGNvbnN0IGNoYXIgKmJpbmFyeSwgY29uc3QgY2hhciAqa2V5LAogCQkJCWludCBkeW5fcmVzdWx0 X2lkeCA9IC0xOwogCQkJCWNoYXIgZHluYW1pY19uYW1lWzI1Nl07CiAJCQkJY2hhciBkeW5hbWlj X3BpZ2xpdF9uYW1lWzI1Nl07Ci0JCQkJY2hhciAqdGhpc19keW5fcmVzdWx0OwotCQkJCWludCBk eW5fcmVzdWx0X2xlbjsKIAkJCQljb25zdCBjaGFyICpkeW5iZWcsICpkeW5lbmQ7Ci0JCQkJaW50 IG47CiAKIAkJCQlpZiAoc3NjYW5mKG1hdGNoZXMuaXRlbXNba10ud2hlcmUgKyBzdHJsZW4oU1RB UlRJTkdfRFlOQU1JQ19TVUJURVNUKSwgIiVzIiwgZHluYW1pY19uYW1lKSAhPSAxKSB7CiAJCQkJ CS8qIENhbm5vdCBwYXJzZSBuYW1lLCBqdXN0IGlnbm9yZSB0aGlzIG9uZSAqLwogCQkJCQljb250 aW51ZTsKIAkJCQl9CiAKLQkJCQlkeW5fcmVzdWx0X2xlbiA9IGFzcHJpbnRmKCZ0aGlzX2R5bl9y ZXN1bHQsICIlcyVzOiAiLCBEWU5BTUlDX1NVQlRFU1RfUkVTVUxULCBkeW5hbWljX25hbWUpOwot CQkJCWlmIChkeW5fcmVzdWx0X2xlbiA8IDApCi0JCQkJCWNvbnRpbnVlOwotCi0JCQkJZm9yIChu ID0gayArIDE7IG4gPCByZXN1bHRfaWR4OyBuKyspIHsKLQkJCQkJaWYgKG1hdGNoZXMuaXRlbXNb bl0ud2hhdCA9PSBEWU5BTUlDX1NVQlRFU1RfUkVTVUxUICYmCi0JCQkJCSAgICAhbWVtY21wKG1h dGNoZXMuaXRlbXNbbl0ud2hlcmUsCi0JCQkJCQkgICAgdGhpc19keW5fcmVzdWx0LAotCQkJCQkJ ICAgIG1pbihkeW5fcmVzdWx0X2xlbiwgYnVmZW5kIC0gbWF0Y2hlcy5pdGVtc1tuXS53aGVyZSkp KSB7Ci0JCQkJCQlkeW5fcmVzdWx0X2lkeCA9IG47Ci0JCQkJCQlicmVhazsKLQkJCQkJfQotCQkJ CX0KLQotCQkJCWZyZWUodGhpc19keW5fcmVzdWx0KTsKKwkJCQlkeW5fcmVzdWx0X2lkeCA9IGZp bmRfc3VidGVzdF9pZHhfbGltaXRlZChtYXRjaGVzLCBlbmQsIERZTkFNSUNfU1VCVEVTVF9SRVNV TFQsICIlcyVzOiAiLCBkeW5hbWljX25hbWUsIGssIHJlc3VsdF9pZHgpOwogCiAJCQkJaWYgKGsg PT0gMCkKIAkJCQkJZHluYmVnID0gYmVnOwotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2lndC1kZXY=