From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id C501E892F1 for ; Mon, 2 Dec 2019 13:01:15 +0000 (UTC) From: Petri Latvala Date: Mon, 2 Dec 2019 15:01:05 +0200 Message-Id: <20191202130109.929-8-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 07/11] runner/resultgen: Make subtest result line finding more robust 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: T24gYW4gYXNzZXJ0aW9uIGZhaWx1cmUsIHRoZSBzdHJpbmcgIlN1YnRlc3QgeHl6IGZhaWxlZCIg aXMKcHJpbnRlZC4gTWFrZSBzdXJlIHdlIGRvbid0IG1hdGNoIHRoYXQgZm9yIFNVQlRFU1RfUkVT VUxULCBvciB0aGUKZXF1aXZhbGVudCBmb3IgZHluYW1pYyBzdWJ0ZXN0cy4KClBhcnNpbmcgdGhl IHJlc3VsdHMgYWxyZWFkeSBleHBsaWNpdGx5IHNlYXJjaGVkIGZvciB0aGUgcHJvcGVyIHJlc3Vs dApsaW5lLCB0aGUgZGlmZmVyZW5jZSBpcyB3aGVuIHdlIGRlbGltaXQgb3V0cHV0IHVwIHRvICJ0 aGUgbmV4dCBsaW5lIG9mCmludGVyZXN0Ii4KClNpZ25lZC1vZmYtYnk6IFBldHJpIExhdHZhbGEg PHBldHJpLmxhdHZhbGFAaW50ZWwuY29tPgotLS0KIHJ1bm5lci9yZXN1bHRnZW4uYyB8IDQxICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwg MzcgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ydW5uZXIvcmVz dWx0Z2VuLmMgYi9ydW5uZXIvcmVzdWx0Z2VuLmMKaW5kZXggYjAxZTBhNDguLjY0Yjg5OWNhIDEw MDY0NAotLS0gYS9ydW5uZXIvcmVzdWx0Z2VuLmMKKysrIGIvcnVubmVyL3Jlc3VsdGdlbi5jCkBA IC0zNjcsNiArMzY3LDM5IEBAIHN0YXRpYyBzdHJ1Y3QgbWF0Y2hlcyBmaW5kX21hdGNoZXMoY29u c3QgY2hhciAqYnVmLCBjb25zdCBjaGFyICpidWZlbmQsCiAJcmV0dXJuIHJldDsKIH0KIAorc3Rh dGljIGJvb2wgdmFsaWRfY2hhcl9mb3Jfc3VidGVzdF9uYW1lKGNoYXIgeCkKK3sKKwlyZXR1cm4g eCA9PSAnLScgfHwgeCA9PSAnXycgfHwgaXNhbG51bSh4KTsKK30KKworc3RhdGljIGJvb2wgaXNf c3VidGVzdF9yZXN1bHRfbGluZShjb25zdCBjaGFyICpuZWVkbGUsIGNvbnN0IGNoYXIgKmxpbmUs IGNvbnN0IGNoYXIgKmJ1ZmVuZCkKK3sKKwlsaW5lICs9IHN0cmxlbihuZWVkbGUpOworCisJLyoK KwkgKiBBdCB0aGlzIHBvaW50IG9mIHRoZSBzdHJpbmcgd2UncmUgZXhwZWN0aW5nOgorCSAqIC0g VGhlIHN1YnRlc3QgbmFtZSAob25lIG9yIG1vcmUgb2YgYS16LCBBLVosIDAtOSwgJy0nIGFuZCAn XycpCisJICogLSBUaGUgY2hhcmFjdGVycyAnOicgYW5kICcgJworCSAqCisJICogSWYgd2UgZmlu ZCBhbGwgdGhvc2UsIGFsbG93IHBhcnNpbmcgdGhpcyBsaW5lIGFzIFtkeW5hbWljXQorCSAqIHN1 YnRlc3QgcmVzdWx0LgorCSAqLworCisJaWYgKCF2YWxpZF9jaGFyX2Zvcl9zdWJ0ZXN0X25hbWUo KmxpbmUpKQorCQlyZXR1cm4gZmFsc2U7CisKKwl3aGlsZSAobGluZSA8IGJ1ZmVuZCAmJiB2YWxp ZF9jaGFyX2Zvcl9zdWJ0ZXN0X25hbWUoKmxpbmUpKQorCQlsaW5lKys7CisKKwlpZiAobGluZSA+ PSBidWZlbmQgfHwgKmxpbmUrKyAhPSAnOicpCisJCXJldHVybiBmYWxzZTsKKworCWlmIChsaW5l ID49IGJ1ZmVuZCB8fCAqbGluZSsrICE9ICcgJykKKwkJcmV0dXJuIGZhbHNlOworCisJcmV0dXJu IHRydWU7Cit9CisKIHN0YXRpYyB2b2lkIGZyZWVfbWF0Y2hlcyhzdHJ1Y3QgbWF0Y2hlcyAqbWF0 Y2hlcykKIHsKIAlmcmVlKG1hdGNoZXMtPml0ZW1zKTsKQEAgLTU5OCw5ICs2MzEsOSBAQCBzdGF0 aWMgYm9vbCBmaWxsX2Zyb21fb3V0cHV0KGludCBmZCwgY29uc3QgY2hhciAqYmluYXJ5LCBjb25z dCBjaGFyICprZXksCiAJc3RydWN0IGpzb25fb2JqZWN0ICpjdXJyZW50X3Rlc3QgPSBOVUxMOwog CXN0cnVjdCBtYXRjaF9uZWVkbGUgbmVlZGxlc1tdID0gewogCQl7IFNUQVJUSU5HX1NVQlRFU1Qs IE5VTEwgfSwKLQkJeyBTVUJURVNUX1JFU1VMVCwgTlVMTCB9LAorCQl7IFNVQlRFU1RfUkVTVUxU LCBpc19zdWJ0ZXN0X3Jlc3VsdF9saW5lIH0sCiAJCXsgU1RBUlRJTkdfRFlOQU1JQ19TVUJURVNU LCBOVUxMIH0sCi0JCXsgRFlOQU1JQ19TVUJURVNUX1JFU1VMVCwgTlVMTCB9LAorCQl7IERZTkFN SUNfU1VCVEVTVF9SRVNVTFQsIGlzX3N1YnRlc3RfcmVzdWx0X2xpbmUgfSwKIAkJeyBOVUxMLCBO VUxMIH0sCiAJfTsKIAlzdHJ1Y3QgbWF0Y2hlcyBtYXRjaGVzID0ge307CkBAIC0xMTE5LDkgKzEx NTIsOSBAQCBzdGF0aWMgYm9vbCBzdGRlcnJfY29udGFpbnNfd2FybmluZ3MoY29uc3QgY2hhciAq YmVnLCBjb25zdCBjaGFyICplbmQpCiB7CiAJc3RydWN0IG1hdGNoX25lZWRsZSBuZWVkbGVzW10g PSB7CiAJCXsgU1RBUlRJTkdfU1VCVEVTVCwgTlVMTCB9LAotCQl7IFNVQlRFU1RfUkVTVUxULCBO VUxMIH0sCisJCXsgU1VCVEVTVF9SRVNVTFQsIGlzX3N1YnRlc3RfcmVzdWx0X2xpbmUgfSwKIAkJ eyBTVEFSVElOR19EWU5BTUlDX1NVQlRFU1QsIE5VTEwgfSwKLQkJeyBEWU5BTUlDX1NVQlRFU1Rf UkVTVUxULCBOVUxMIH0sCisJCXsgRFlOQU1JQ19TVUJURVNUX1JFU1VMVCwgaXNfc3VidGVzdF9y ZXN1bHRfbGluZSB9LAogCQl7IE5VTEwsIE5VTEwgfSwKIAl9OwogCXN0cnVjdCBtYXRjaGVzIG1h dGNoZXM7Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRl dg==