From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CA9A892F1 for ; Mon, 2 Dec 2019 13:01:16 +0000 (UTC) From: Petri Latvala Date: Mon, 2 Dec 2019 15:01:03 +0200 Message-Id: <20191202130109.929-6-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 05/11] runner/resultgen: Extrude dynamic subtest result texts 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: VGhlIGZpcnN0IGR5bmFtaWMgcGFydCBub3cgc3RhcnRzIGl0cyByZXBvcnRlZCBvdXRwdXQgYXQg dGhlIGJlZ2lubmluZwpvZiBpdHMgc3VidGVzdCdzIG91dHB1dCwgYW5kIHRoZSBsYXN0IGR5bmFt aWMgcGFydCBlbmRzIGl0cyByZXBvcnRlZApvdXRwdXQgYXQgdGhlIGVuZCBvZiBpdHMgc3VidGVz dCdzIG91dHB1dC4KClNpZ25lZC1vZmYtYnk6IFBldHJpIExhdHZhbGEgPHBldHJpLmxhdHZhbGFA aW50ZWwuY29tPgotLS0KIHJ1bm5lci9yZXN1bHRnZW4uYyB8IDY0ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MiBpbnNlcnRp b25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ydW5uZXIvcmVzdWx0Z2VuLmMg Yi9ydW5uZXIvcmVzdWx0Z2VuLmMKaW5kZXggOGY0YmJlOTguLmUxMzllM2ZjIDEwMDY0NAotLS0g YS9ydW5uZXIvcmVzdWx0Z2VuLmMKKysrIGIvcnVubmVyL3Jlc3VsdGdlbi5jCkBAIC00MjQsMTcg KzQyNCwxOCBAQCBzdGF0aWMgaW50IGZpbmRfc3VidGVzdF9pZHgoc3RydWN0IG1hdGNoZXMgbWF0 Y2hlcywKIAlyZXR1cm4gZmluZF9zdWJ0ZXN0X2lkeF9saW1pdGVkKG1hdGNoZXMsIGJ1ZmVuZCwg bGluZWtleSwgcGF0dGVybiwgc3VidGVzdF9uYW1lLCAwLCBtYXRjaGVzLnNpemUpOwogfQogCi1z dGF0aWMgY29uc3QgY2hhciAqZmluZF9zdWJ0ZXN0X2JlZ2luX2xpbWl0KHN0cnVjdCBtYXRjaGVz IG1hdGNoZXMsCi0JCQkJCSAgICBpbnQgYmVnaW5faWR4LAotCQkJCQkgICAgaW50IHJlc3VsdF9p ZHgsCi0JCQkJCSAgICBjb25zdCBjaGFyICpidWYsCi0JCQkJCSAgICBjb25zdCBjaGFyICpidWZl bmQpCitzdGF0aWMgY29uc3QgY2hhciAqZmluZF9zdWJ0ZXN0X2JlZ2luX2xpbWl0X2xpbWl0ZWQo c3RydWN0IG1hdGNoZXMgbWF0Y2hlcywKKwkJCQkJCSAgICBpbnQgYmVnaW5faWR4LAorCQkJCQkJ ICAgIGludCByZXN1bHRfaWR4LAorCQkJCQkJICAgIGNvbnN0IGNoYXIgKmJ1ZiwKKwkJCQkJCSAg ICBjb25zdCBjaGFyICpidWZlbmQsCisJCQkJCQkgICAgaW50IGZpcnN0X2lkeCkKIHsKIAkvKiBO byBtYXRjaGluZyBvdXRwdXQgYXQgYWxsLCBpbmNsdWRlIGV2ZXJ5dGhpbmcgKi8KLQlpZiAoYmVn aW5faWR4IDwgMCAmJiByZXN1bHRfaWR4IDwgMCkKKwlpZiAoYmVnaW5faWR4IDwgZmlyc3RfaWR4 ICYmIHJlc3VsdF9pZHggPCBmaXJzdF9pZHgpCiAJCXJldHVybiBidWY7CiAKLQlpZiAoYmVnaW5f aWR4IDwgMCkgeworCWlmIChiZWdpbl9pZHggPCBmaXJzdF9pZHgpIHsKIAkJLyoKIAkJICogU3Vi dGVzdCBkaWRuJ3Qgc3RhcnQsIGJ1dCB3ZSBoYXZlIHRoZQogCQkgKiByZXN1bHQuIFByb2JhYmx5 IGJlY2F1c2UgYW4gaWd0X2ZpeHR1cmUKQEAgLTQ0MywzNyArNDQ0LDQ4IEBAIHN0YXRpYyBjb25z dCBjaGFyICpmaW5kX3N1YnRlc3RfYmVnaW5fbGltaXQoc3RydWN0IG1hdGNoZXMgbWF0Y2hlcywK IAkJICogV2UgZ28gYmFja3dhcmRzIG9uZSBtYXRjaCBmcm9tIHRoZSByZXN1bHQgbWF0Y2gsCiAJ CSAqIGFuZCBzdGFydCBmcm9tIHRoZSBuZXh0IGxpbmUuCiAJCSAqLwotCQlpZiAocmVzdWx0X2lk eCA+IDApCisJCWlmIChyZXN1bHRfaWR4ID4gZmlyc3RfaWR4KQogCQkJcmV0dXJuIG5leHRfbGlu ZShtYXRjaGVzLml0ZW1zW3Jlc3VsdF9pZHggLSAxXS53aGVyZSwgYnVmZW5kKTsKIAkJZWxzZQog CQkJcmV0dXJuIGJ1ZjsKIAl9CiAKIAkvKiBJbmNsdWRlIGFsbCBub24tc3BlY2lhbCBvdXRwdXQg YmVmb3JlIHRoZSBiZWdpbm5pbmcgbGluZS4gKi8KLQlpZiAoYmVnaW5faWR4ID09IDApCisJaWYg KGJlZ2luX2lkeCA8PSBmaXJzdF9pZHgpCiAJCXJldHVybiBidWY7CiAKIAlyZXR1cm4gbmV4dF9s aW5lKG1hdGNoZXMuaXRlbXNbYmVnaW5faWR4IC0gMV0ud2hlcmUsIGJ1ZmVuZCk7CiB9CiAKLXN0 YXRpYyBjb25zdCBjaGFyICpmaW5kX3N1YnRlc3RfZW5kX2xpbWl0KHN0cnVjdCBtYXRjaGVzIG1h dGNoZXMsCi0JCQkJCSAgaW50IGJlZ2luX2lkeCwKLQkJCQkJICBpbnQgcmVzdWx0X2lkeCwKLQkJ CQkJICBjb25zdCBjaGFyICpidWYsCi0JCQkJCSAgY29uc3QgY2hhciAqYnVmZW5kKQorc3RhdGlj IGNvbnN0IGNoYXIgKmZpbmRfc3VidGVzdF9iZWdpbl9saW1pdChzdHJ1Y3QgbWF0Y2hlcyBtYXRj aGVzLAorCQkJCQkgICAgaW50IGJlZ2luX2lkeCwKKwkJCQkJICAgIGludCByZXN1bHRfaWR4LAor CQkJCQkgICAgY29uc3QgY2hhciAqYnVmLAorCQkJCQkgICAgY29uc3QgY2hhciAqYnVmZW5kKQor eworCXJldHVybiBmaW5kX3N1YnRlc3RfYmVnaW5fbGltaXRfbGltaXRlZChtYXRjaGVzLCBiZWdp bl9pZHgsIHJlc3VsdF9pZHgsIGJ1ZiwgYnVmZW5kLCAwKTsKK30KKworc3RhdGljIGNvbnN0IGNo YXIgKmZpbmRfc3VidGVzdF9lbmRfbGltaXRfbGltaXRlZChzdHJ1Y3QgbWF0Y2hlcyBtYXRjaGVz LAorCQkJCQkJICBpbnQgYmVnaW5faWR4LAorCQkJCQkJICBpbnQgcmVzdWx0X2lkeCwKKwkJCQkJ CSAgY29uc3QgY2hhciAqYnVmLAorCQkJCQkJICBjb25zdCBjaGFyICpidWZlbmQsCisJCQkJCQkg IGludCBmaXJzdF9pZHgsCisJCQkJCQkgIGludCBsYXN0X2lkeCkKIHsKIAlpbnQgazsKIAogCS8q IE5vIG1hdGNoaW5nIG91dHB1dCBhdCBhbGwsIGluY2x1ZGUgZXZlcnl0aGluZyAqLwotCWlmIChi ZWdpbl9pZHggPCAwICYmIHJlc3VsdF9pZHggPCAwKQorCWlmIChiZWdpbl9pZHggPCBmaXJzdF9p ZHggJiYgcmVzdWx0X2lkeCA8IGZpcnN0X2lkeCkKIAkJcmV0dXJuIGJ1ZmVuZDsKIAotCWlmIChy ZXN1bHRfaWR4IDwgMCkgeworCWlmIChyZXN1bHRfaWR4IDwgZmlyc3RfaWR4KSB7CiAJCS8qCiAJ CSAqIEluY29tcGxldGUgcmVzdWx0LiBJbmNsdWRlIGFsbCBvdXRwdXQgdXAgdG8gdGhlCiAJCSAq IG5leHQgc3RhcnRpbmcgc3VidGVzdCwgb3IgdGhlIHJlc3VsdCBvZiBvbmUuCiAJCSAqLwotCQlm b3IgKGsgPSBiZWdpbl9pZHggKyAxOyBrIDwgbWF0Y2hlcy5zaXplOyBrKyspIHsKKwkJZm9yIChr ID0gYmVnaW5faWR4ICsgMTsgayA8IGxhc3RfaWR4OyBrKyspIHsKIAkJCWlmIChtYXRjaGVzLml0 ZW1zW2tdLndoYXQgPT0gU1RBUlRJTkdfU1VCVEVTVCB8fAogCQkJICAgIG1hdGNoZXMuaXRlbXNb a10ud2hhdCA9PSBTVUJURVNUX1JFU1VMVCkKIAkJCQlyZXR1cm4gbWF0Y2hlcy5pdGVtc1trXS53 aGVyZTsKQEAgLTQ4MywxMiArNDk1LDIxIEBAIHN0YXRpYyBjb25zdCBjaGFyICpmaW5kX3N1YnRl c3RfZW5kX2xpbWl0KHN0cnVjdCBtYXRjaGVzIG1hdGNoZXMsCiAJfQogCiAJLyogSW5jbHVkZSBh bGwgbm9uLXNwZWNpYWwgb3V0cHV0IHRvIHRoZSBuZXh0IG1hdGNoLCB3aGF0ZXZlciBpdCBpcy4g Ki8KLQlpZiAocmVzdWx0X2lkeCA8IG1hdGNoZXMuc2l6ZSAtIDEpCisJaWYgKHJlc3VsdF9pZHgg PCBsYXN0X2lkeCAtIDEpCiAJCXJldHVybiBtYXRjaGVzLml0ZW1zW3Jlc3VsdF9pZHggKyAxXS53 aGVyZTsKIAogCXJldHVybiBidWZlbmQ7CiB9CiAKK3N0YXRpYyBjb25zdCBjaGFyICpmaW5kX3N1 YnRlc3RfZW5kX2xpbWl0KHN0cnVjdCBtYXRjaGVzIG1hdGNoZXMsCisJCQkJCSAgaW50IGJlZ2lu X2lkeCwKKwkJCQkJICBpbnQgcmVzdWx0X2lkeCwKKwkJCQkJICBjb25zdCBjaGFyICpidWYsCisJ CQkJCSAgY29uc3QgY2hhciAqYnVmZW5kKQoreworCXJldHVybiBmaW5kX3N1YnRlc3RfZW5kX2xp bWl0X2xpbWl0ZWQobWF0Y2hlcywgYmVnaW5faWR4LCByZXN1bHRfaWR4LCBidWYsIGJ1ZmVuZCwg MCwgbWF0Y2hlcy5zaXplKTsKK30KKwogc3RhdGljIHZvaWQgcHJvY2Vzc19keW5hbWljX3N1YnRl c3Rfb3V0cHV0KGNvbnN0IGNoYXIgKnBpZ2xpdF9uYW1lLAogCQkJCQkgICBjb25zdCBjaGFyICpp Z3RfdmVyc2lvbiwKIAkJCQkJICAgc2l6ZV90IGlndF92ZXJzaW9uX2xlbiwKQEAgLTUzMSw4ICs1 NTIsOCBAQCBzdGF0aWMgdm9pZCBwcm9jZXNzX2R5bmFtaWNfc3VidGVzdF9vdXRwdXQoY29uc3Qg Y2hhciAqcGlnbGl0X25hbWUsCiAKIAkJZHluX3Jlc3VsdF9pZHggPSBmaW5kX3N1YnRlc3RfaWR4 X2xpbWl0ZWQobWF0Y2hlcywgZW5kLCBEWU5BTUlDX1NVQlRFU1RfUkVTVUxULCAiJXMlczogIiwg ZHluYW1pY19uYW1lLCBrLCByZXN1bHRfaWR4KTsKIAotCQlkeW5iZWcgPSBmaW5kX3N1YnRlc3Rf YmVnaW5fbGltaXQobWF0Y2hlcywgaywgZHluX3Jlc3VsdF9pZHgsIGJlZywgZW5kKTsKLQkJZHlu ZW5kID0gZmluZF9zdWJ0ZXN0X2VuZF9saW1pdChtYXRjaGVzLCBrLCBkeW5fcmVzdWx0X2lkeCwg YmVnLCBlbmQpOworCQlkeW5iZWcgPSBmaW5kX3N1YnRlc3RfYmVnaW5fbGltaXRfbGltaXRlZCht YXRjaGVzLCBrLCBkeW5fcmVzdWx0X2lkeCwgYmVnLCBlbmQsIGJlZ2luX2lkeCArIDEpOworCQlk eW5lbmQgPSBmaW5kX3N1YnRlc3RfZW5kX2xpbWl0X2xpbWl0ZWQobWF0Y2hlcywgaywgZHluX3Jl c3VsdF9pZHgsIGJlZywgZW5kLCBiZWdpbl9pZHggKyAxLCByZXN1bHRfaWR4KTsKIAogCQlnZW5l cmF0ZV9waWdsaXRfbmFtZV9mb3JfZHluYW1pYyhwaWdsaXRfbmFtZSwgZHluYW1pY19uYW1lLCBk eW5hbWljX3BpZ2xpdF9uYW1lLCBzaXplb2YoZHluYW1pY19waWdsaXRfbmFtZSkpOwogCkBAIC05 MzEsOCArOTUyLDcgQEAgc3RhdGljIGJvb2wgZmlsbF9mcm9tX2RtZXNnKGludCBmZCwKIAkJCX0K IAkJfQogCQlhcHBlbmRfbGluZSgmZG1lc2csICZkbWVzZ2xlbiwgZm9ybWF0dGVkKTsKLQkJaWYg KGN1cnJlbnRfdGVzdCAhPSBOVUxMKQotCQkJYXBwZW5kX2xpbmUoJmR5bmFtaWNfZG1lc2csICZk eW5hbWljX2RtZXNnX2xlbiwgZm9ybWF0dGVkKTsKKwkJYXBwZW5kX2xpbmUoJmR5bmFtaWNfZG1l c2csICZkeW5hbWljX2RtZXNnX2xlbiwgZm9ybWF0dGVkKTsKIAkJZnJlZShmb3JtYXR0ZWQpOwog CX0KIAlmcmVlKGxpbmUpOwotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2lndC1kZXY=