From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id B9760892A8 for ; Mon, 2 Dec 2019 13:01:15 +0000 (UTC) From: Petri Latvala Date: Mon, 2 Dec 2019 15:00:59 +0200 Message-Id: <20191202130109.929-2-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 01/11] runner/resultgen: Extract igt-version field handling 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 LQogcnVubmVyL3Jlc3VsdGdlbi5jIHwgMjcgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvcnVubmVyL3Jlc3VsdGdlbi5jIGIvcnVubmVyL3Jlc3VsdGdlbi5jCmluZGV4IGFhNDM4 MDAwLi4zMWJjMGJiMSAxMDA2NDQKLS0tIGEvcnVubmVyL3Jlc3VsdGdlbi5jCisrKyBiL3J1bm5l ci9yZXN1bHRnZW4uYwpAQCAtMzY1LDYgKzM2NSwxNyBAQCBzdGF0aWMgdm9pZCBmcmVlX21hdGNo ZXMoc3RydWN0IG1hdGNoZXMgKm1hdGNoZXMpCiAJZnJlZShtYXRjaGVzLT5pdGVtcyk7CiB9CiAK K3N0YXRpYyB2b2lkIGFkZF9pZ3RfdmVyc2lvbihzdHJ1Y3QganNvbl9vYmplY3QgKnRlc3RvYmos CisJCQkgICAgY29uc3QgY2hhciAqaWd0X3ZlcnNpb24sCisJCQkgICAgc2l6ZV90IGlndF92ZXJz aW9uX2xlbikKK3sKKwlpZiAoaWd0X3ZlcnNpb24pCisJCWpzb25fb2JqZWN0X29iamVjdF9hZGQo dGVzdG9iaiwgImlndC12ZXJzaW9uIiwKKwkJCQkgICAgICAganNvbl9vYmplY3RfbmV3X3N0cmlu Z19sZW4oaWd0X3ZlcnNpb24sCisJCQkJCQkJCSAgaWd0X3ZlcnNpb25fbGVuKSk7CisKK30KKwog c3RhdGljIGJvb2wgZmlsbF9mcm9tX291dHB1dChpbnQgZmQsIGNvbnN0IGNoYXIgKmJpbmFyeSwg Y29uc3QgY2hhciAqa2V5LAogCQkJICAgICBzdHJ1Y3Qgc3VidGVzdF9saXN0ICpzdWJ0ZXN0cywK IAkJCSAgICAgc3RydWN0IGpzb25fb2JqZWN0ICp0ZXN0cykKQEAgLTQyMCwxMCArNDMxLDcgQEAg c3RhdGljIGJvb2wgZmlsbF9mcm9tX291dHB1dChpbnQgZmQsIGNvbnN0IGNoYXIgKmJpbmFyeSwg Y29uc3QgY2hhciAqa2V5LAogCiAJCWpzb25fb2JqZWN0X29iamVjdF9hZGQoY3VycmVudF90ZXN0 LCBrZXksCiAJCQkJICAgICAgIGpzb25fb2JqZWN0X25ld19zdHJpbmdfbGVuKGJ1Ziwgc3RhdGJ1 Zi5zdF9zaXplKSk7Ci0JCWlmIChpZ3RfdmVyc2lvbikKLQkJCWpzb25fb2JqZWN0X29iamVjdF9h ZGQoY3VycmVudF90ZXN0LCAiaWd0LXZlcnNpb24iLAotCQkJCQkgICAgICAganNvbl9vYmplY3Rf bmV3X3N0cmluZ19sZW4oaWd0X3ZlcnNpb24sCi0JCQkJCQkJCQkgIGlndF92ZXJzaW9uX2xlbikp OworCQlhZGRfaWd0X3ZlcnNpb24oY3VycmVudF90ZXN0LCBpZ3RfdmVyc2lvbiwgaWd0X3ZlcnNp b25fbGVuKTsKIAogCQlyZXR1cm4gdHJ1ZTsKIAl9CkBAIC01MjIsMTEgKzUzMCw3IEBAIHN0YXRp YyBib29sIGZpbGxfZnJvbV9vdXRwdXQoaW50IGZkLCBjb25zdCBjaGFyICpiaW5hcnksIGNvbnN0 IGNoYXIgKmtleSwKIAkJanNvbl9vYmplY3Rfb2JqZWN0X2FkZChjdXJyZW50X3Rlc3QsIGtleSwK IAkJCQkgICAgICAganNvbl9vYmplY3RfbmV3X3N0cmluZ19sZW4oYmVnLCBlbmQgLSBiZWcpKTsK IAotCQlpZiAoaWd0X3ZlcnNpb24pIHsKLQkJCWpzb25fb2JqZWN0X29iamVjdF9hZGQoY3VycmVu dF90ZXN0LCAiaWd0LXZlcnNpb24iLAotCQkJCQkgICAgICAganNvbl9vYmplY3RfbmV3X3N0cmlu Z19sZW4oaWd0X3ZlcnNpb24sCi0JCQkJCQkJCQkgIGlndF92ZXJzaW9uX2xlbikpOwotCQl9CisJ CWFkZF9pZ3RfdmVyc2lvbihjdXJyZW50X3Rlc3QsIGlndF92ZXJzaW9uLCBpZ3RfdmVyc2lvbl9s ZW4pOwogCiAJCWlmICghanNvbl9vYmplY3Rfb2JqZWN0X2dldF9leChjdXJyZW50X3Rlc3QsICJy ZXN1bHQiLCBOVUxMKSkgewogCQkJcGFyc2Vfc3VidGVzdF9yZXN1bHQoc3VidGVzdHMtPnN1YnNb aV0ubmFtZSwKQEAgLTYwOCwxMCArNjEyLDcgQEAgc3RhdGljIGJvb2wgZmlsbF9mcm9tX291dHB1 dChpbnQgZmQsIGNvbnN0IGNoYXIgKmJpbmFyeSwgY29uc3QgY2hhciAqa2V5LAogCiAJCQkJanNv bl9vYmplY3Rfb2JqZWN0X2FkZChjdXJyZW50X2R5bmFtaWNfdGVzdCwga2V5LAogCQkJCQkJICAg ICAgIGpzb25fb2JqZWN0X25ld19zdHJpbmdfbGVuKGR5bmJlZywgZHluZW5kIC0gZHluYmVnKSk7 Ci0JCQkJaWYgKGlndF92ZXJzaW9uKQotCQkJCQlqc29uX29iamVjdF9vYmplY3RfYWRkKGN1cnJl bnRfZHluYW1pY190ZXN0LCAiaWd0LXZlcnNpb24iLAotCQkJCQkJCSAgICAgICBqc29uX29iamVj dF9uZXdfc3RyaW5nX2xlbihpZ3RfdmVyc2lvbiwKLQkJCQkJCQkJCQkJICBpZ3RfdmVyc2lvbl9s ZW4pKTsKKwkJCQlhZGRfaWd0X3ZlcnNpb24oY3VycmVudF9keW5hbWljX3Rlc3QsIGlndF92ZXJz aW9uLCBpZ3RfdmVyc2lvbl9sZW4pOwogCiAJCQkJaWYgKCFqc29uX29iamVjdF9vYmplY3RfZ2V0 X2V4KGN1cnJlbnRfZHluYW1pY190ZXN0LCAicmVzdWx0IiwgTlVMTCkpIHsKIAkJCQkJY29uc3Qg Y2hhciAqZHlucmVzdWx0dGV4dDsKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pZ3QtZGV2