From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [XTF PATCH v2] xtf-runner: support two modes for getting output Date: Thu, 11 Aug 2016 15:14:13 +0100 Message-ID: <1470924853-17325-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bXqkW-0000Rv-GH for xen-devel@lists.xenproject.org; Thu, 11 Aug 2016 14:14:20 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Wei Liu , Ian Jackson , andrew.cooper3@citrix.com List-Id: xen-devel@lists.xenproject.org V2UgbmVlZCB0d28gbW9kZXMgZm9yIGdldHRpbmcgb3V0cHV0OgoKMS4gVXNlIGNvbnNvbGUgZGly ZWN0bHkgd2l0aCBuZXdlciAoPj00LjgpIFhlbgoyLiBVc2UgbG9nIGZpbGVzIGZvciBvbGRlciBY ZW4KClRoaXMgcGF0Y2ggaW1wbGVtZW50cyBib3RoLiBUaGUgZGVmYXVsdCBiZWhhdmlvdXIgaXMg dG8gdXNlIHRoZSBjb25zb2xlCm1vZGUuCgpTaWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1 MkBjaXRyaXguY29tPgotLS0KdjI6IGRlbGV0ZSBhdXRvIHNlbGVjdGlvbiBtb2RlLCBzcXVhc2gg YWxsIHBhdGNoZXMgaW50byBvbmUuCi0tLQogeHRmLXJ1bm5lciB8IDExMCArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgODkgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv eHRmLXJ1bm5lciBiL3h0Zi1ydW5uZXIKaW5kZXggYzA2MzY5OS4uMTE1MDYyMSAxMDA3NTUKLS0t IGEveHRmLXJ1bm5lcgorKysgYi94dGYtcnVubmVyCkBAIC00MjUsMzAgKzQyNSwxOSBAQCBkZWYg bGlzdF90ZXN0cyhvcHRzKToKICAgICBmb3Igc2VsIGluIG9wdHMuc2VsZWN0aW9uOgogICAgICAg ICBwcmludCBzZWwKIAorZGVmIHJ1bl90ZXN0X2NvbnNvbGUob3B0cywgdGVzdCk6CisgICAgIiIi IFJ1biBhIHNwZWNpZmljIHRlc3QgdmlhIHhlbmNvbnNvbGUiIiIKIAotZGVmIHJ1bl90ZXN0KHRl c3QpOgotICAgICIiIiBSdW4gYSBzcGVjaWZpYyB0ZXN0ICIiIgotCi0gICAgY21kID0gWyd4bCcs ICdjcmVhdGUnLCAnLXAnLCB0ZXN0LmNmZ19wYXRoKCldCi0gICAgcHJpbnQgIkV4ZWN1dGluZyAn JXMnIiAlICgiICIuam9pbihjbWQpLCApCi0gICAgcmMgPSBzdWJwcm9jX2NhbGwoY21kKQotICAg IGlmIHJjOgotICAgICAgICByYWlzZSBSdW5uZXJFcnJvcigiRmFpbGVkIHRvIGNyZWF0ZSBWTSIp Ci0KLSAgICBjbWQgPSBbJ3hsJywgJ2NvbnNvbGUnLCB0ZXN0LnZtX25hbWUoKV0KKyAgICBjbWQg PSBbJ3hsJywgJ2NyZWF0ZScsICctRmMnLCB0ZXN0LmNmZ19wYXRoKCldCiAgICAgcHJpbnQgIkV4 ZWN1dGluZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCApCi0gICAgY29uc29sZSA9IFBvcGVuKGNt ZCwgc3Rkb3V0ID0gUElQRSkKKyAgICBndWVzdCA9IFBvcGVuKGNtZCwgc3Rkb3V0ID0gUElQRSwg c3RkZXJyID0gUElQRSkKIAotICAgIGNtZCA9IFsneGwnLCAndW5wYXVzZScsIHRlc3Qudm1fbmFt ZSgpXQotICAgIHByaW50ICJFeGVjdXRpbmcgJyVzJyIgJSAoIiAiLmpvaW4oY21kKSwgKQotICAg IHJjID0gc3VicHJvY19jYWxsKGNtZCkKLSAgICBpZiByYzoKLSAgICAgICAgcmFpc2UgUnVubmVy RXJyb3IoIkZhaWxlZCB0byB1bnBhdXNlIFZNIikKKyAgICAjIHN0ZG91dCBpcyBjb25zb2xlIG91 dHB1dCwgc3RkZXJyIGlzIHhsIG91dHB1dAorICAgIHN0ZG91dCwgc3RkZXJyID0gZ3Vlc3QuY29t bXVuaWNhdGUoKQogCi0gICAgc3Rkb3V0LCBfID0gY29uc29sZS5jb21tdW5pY2F0ZSgpCi0KLSAg ICBpZiBjb25zb2xlLnJldHVybmNvZGU6Ci0gICAgICAgIHJhaXNlIFJ1bm5lckVycm9yKCJGYWls ZWQgdG8gb2J0YWluIFZNIGNvbnNvbGUiKQorICAgIGlmIGd1ZXN0LnJldHVybmNvZGU6CisgICAg ICAgIHByaW50IHN0ZGVycgorICAgICAgICByYWlzZSBSdW5uZXJFcnJvcigiRmFpbGVkIHRvIGNv bW11bmljYXRlIHdpdGggZ3Vlc3QiKQogCiAgICAgbGluZXMgPSBzdGRvdXQuc3BsaXRsaW5lcygp CiAKQEAgLTQ3MCw2ICs0NTksNTIgQEAgZGVmIHJ1bl90ZXN0KHRlc3QpOgogICAgIHJldHVybiAi RVJST1IiCiAKIAorZGVmIHJ1bl90ZXN0X2xvZ2ZpbGUob3B0cywgdGVzdCk6CisgICAgIiIiIFJ1 biBhIHNwZWNpZmljIHRlc3QgdmlhIGdyZXBwaW5nIGxvZyBmaWxlIiIiCisKKyAgICBmbiA9IG9w dHMubG9nZmlsZV9kaXIgKyAob3B0cy5sb2dmaWxlX3BhdHRlcm4gJSB0ZXN0KQorCisgICAgcHJp bnQgIlVzaW5nICVzIiAlIGZuCisKKyAgICB0cnk6CisgICAgICAgIGxvZ2ZpbGUgPSBvcGVuKGZu LCAicmIiKQorICAgIGV4Y2VwdCBJT0Vycm9yIGFzIGU6CisgICAgICAgICMgQ3JlYXRlIGZpbGUg aWYgaXQgZG9lc24ndCBleGlzdAorICAgICAgICBpZiBlLmVycm5vID09IDI6CisgICAgICAgICAg ICBsb2dmaWxlID0gb3BlbihmbiwgImFiIikKKyAgICAgICAgICAgIGxvZ2ZpbGUuY2xvc2UoKQor ICAgICAgICAgICAgbG9nZmlsZSA9IG9wZW4oZm4sICJyYiIpCisgICAgICAgIGVsc2U6CisgICAg ICAgICAgICByYWlzZSBlCisKKyAgICBsb2dmaWxlLnNlZWsoMCwgMikgIyBHbyB0byBlbmQgb2Yg ZmlsZQorCisgICAgY21kID0gWyd4bCcsICdjcmVhdGUnLCAnLUYnLCB0ZXN0LmNmZ19wYXRoKCld CisgICAgcHJpbnQgIkV4ZWN1dGluZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCApCisgICAgcmMg PSBzdWJwcm9jX2NhbGwoY21kKQorICAgIGlmIHJjOgorICAgICAgICByYWlzZSBSdW5uZXJFcnJv cigiRmFpbGVkIHRvIHJ1biB0ZXN0IikKKworICAgIGxpbmVzID0gbG9nZmlsZS5yZWFkbGluZXMo KQorICAgIGxvZ2ZpbGUuY2xvc2UoKQorCisgICAgaWYgbGVuKGxpbmVzKSA9PSAwOgorICAgICAg ICByYWlzZSBSdW5uZXJFcnJvcigiVGVzdCBvdXRwdXQgZW1wdHkiKQorCisgICAgcHJpbnQgIiIu am9pbihsaW5lcykKKworICAgIHRlc3RfcmVzdWx0ID0gbGluZXNbLTFdCisgICAgaWYgbm90ICJU ZXN0IHJlc3VsdDoiIGluIHRlc3RfcmVzdWx0OgorICAgICAgICByZXR1cm4gIkVSUk9SIgorCisg ICAgZm9yIHJlcyBpbiBhbGxfcmVzdWx0czoKKworICAgICAgICBpZiByZXMgaW4gdGVzdF9yZXN1 bHQ6CisgICAgICAgICAgICByZXR1cm4gcmVzCisKKyAgICByZXR1cm4gIkVSUk9SIgorCisKIGRl ZiBydW5fdGVzdHMob3B0cyk6CiAgICAgIiIiIFJ1biB0ZXN0cyAiIiIKIApAQCAtNDc3LDEyICs1 MTIsMjEgQEAgZGVmIHJ1bl90ZXN0cyhvcHRzKToKICAgICBpZiBub3QgbGVuKHRlc3RzKToKICAg ICAgICAgcmFpc2UgUnVubmVyRXJyb3IoIk5vIHRlc3RzIHRvIHJ1biIpCiAKKyAgICBpZiBvcHRz Lm1vZGUgPT0gImNvbnNvbGUiOgorICAgICAgICBydW5fdGVzdCA9IHJ1bl90ZXN0X2NvbnNvbGUK KyAgICBlbGlmIG9wdHMubW9kZSA9PSAibG9nZmlsZSI6CisgICAgICAgIHByaW50ICJVc2luZyBs b2dmaWxlIG1vZGUsIHBsZWFzZSBtYWtlIHN1cmUgdGhlIGxvZyBcCitmaWxlcyBhcmUgbm90IHJv dGF0ZWQhIgorICAgICAgICBydW5fdGVzdCA9IHJ1bl90ZXN0X2xvZ2ZpbGUKKyAgICBlbHNlOgor ICAgICAgICByYWlzZSBSdW5uZXJFcnJvcigiVW5yZWNvZ25pc2VkIG1vZGUiKQorCiAgICAgcmMg PSBhbGxfcmVzdWx0cy5pbmRleCgnU1VDQ0VTUycpCiAgICAgcmVzdWx0cyA9IFtdCiAKICAgICBm b3IgdGVzdCBpbiB0ZXN0czoKIAotICAgICAgICByZXMgPSBydW5fdGVzdCh0ZXN0KQorICAgICAg ICByZXMgPSBydW5fdGVzdChvcHRzLCB0ZXN0KQogICAgICAgICByZXNfaWR4ID0gYWxsX3Jlc3Vs dHMuaW5kZXgocmVzKQogICAgICAgICBpZiByZXNfaWR4ID4gcmM6CiAgICAgICAgICAgICByYyA9 IHJlc19pZHgKQEAgLTUxOSw2ICs1NjMsMTcgQEAgZGVmIG1haW4oKToKICAgICAgICAgICAgICAg ICAgICIgIGFsbCB0ZXN0cyBpbiB0aGUgc2VsZWN0aW9uLCBwcmludGluZyBhIHN1bW1hcnkgb2Yg dGhlaXJcbiIKICAgICAgICAgICAgICAgICAgICIgIHJlc3VsdHMgYXQgdGhlIGVuZC5cbiIKICAg ICAgICAgICAgICAgICAgICJcbiIKKyAgICAgICAgICAgICAgICAgICIgIFRvIGRldGVybWluZSBo b3cgcnVubmVyIHNob3VsZCBnZXQgb3V0cHV0IGZyb20gWGVuLCB1c2VcbiIKKyAgICAgICAgICAg ICAgICAgICIgIC0tbW9kZSBvcHRpb24uIFRoZSBkZWZhdWx0IHZhbHVlIGlzIFwiY29uc29sZVwi LCB3aGljaFxuIgorICAgICAgICAgICAgICAgICAgIiAgbWVhbnMgdXNpbmcgeGVuY29uc29sZSBw cm9ncmFtIHRvIGV4dHJhY3Qgb3V0cHV0LlxuIgorICAgICAgICAgICAgICAgICAgIiAgVGhlIG90 aGVyIHN1cHBvcnRlZCB2YWx1ZSBpcyBcImxvZ2ZpbGVcIiwgd2hpY2hcbiIKKyAgICAgICAgICAg ICAgICAgICIgIG1lYW5zIHRvIGdldCBvdXRwdXQgZnJvbSBsb2cgZmlsZS5cbiIKKyAgICAgICAg ICAgICAgICAgICJcbiIKKyAgICAgICAgICAgICAgICAgICIgIFRoZSBcImxvZ2ZpbGVcIiBtb2Rl IHJlcXVpcmVzIHVzZXJzIHRvIGNvbmZpZ3VyZVxuIgorICAgICAgICAgICAgICAgICAgIiAgeGVu Y29uc29sZWQgdG8gbG9nIGd1ZXN0IGNvbnNvbGUgb3V0cHV0LiBUaGlzIG1vZGVcbiIKKyAgICAg ICAgICAgICAgICAgICIgIGlzIHVzZWZ1bCBmb3IgWGVuIHZlcnNpb24gPCA0LjguIEFsc28gc2Vl IC0tbG9nZmlsZS1kaXJcbiIKKyAgICAgICAgICAgICAgICAgICIgIGFuZCAtLWxvZ2ZpbGUtcGF0 dGVybiBvcHRpb25zLlxuIgorICAgICAgICAgICAgICAgICAgIlxuIgogICAgICAgICAgICAgICAg ICAgIlNlbGVjdGlvbnM6XG4iCiAgICAgICAgICAgICAgICAgICAiICBBIHNlbGVjdGlvbiBpcyB6 ZXJvIG9yIG1vcmUgb2YgYW55IG9mIHRoZSBmb2xsb3dpbmdcbiIKICAgICAgICAgICAgICAgICAg ICIgIHBhcmFtZXRlcnM6IENhdGVnb3JpZXMsIEVudmlyb25tZW50cyBhbmQgVGVzdHMuXG4iCkBA IC01OTYsNiArNjUxLDE5IEBAIGRlZiBtYWluKCk6CiAgICAgICAgICAgICAgICAgICAgICAgZGVz dCA9ICJob3N0IiwgaGVscCA9ICJSZXN0cmljdCBzZWxlY3Rpb24gdG8gYXBwbGljYWJsZSIKICAg ICAgICAgICAgICAgICAgICAgICAiIHRlc3RzIGZvciB0aGUgY3VycmVudCBob3N0IiwKICAgICAg ICAgICAgICAgICAgICAgICApCisgICAgcGFyc2VyLmFkZF9vcHRpb24oIi1tIiwgIi0tbW9kZSIs IGFjdGlvbiA9ICJzdG9yZSIsCisgICAgICAgICAgICAgICAgICAgICAgZGVzdCA9ICJtb2RlIiwg ZGVmYXVsdCA9ICJjb25zb2xlIiwgdHlwZSA9ICJzdHJpbmciLAorICAgICAgICAgICAgICAgICAg ICAgIGhlbHAgPSAiSW5zdHJ1Y3QgaG93IHJ1bm5lciBnZXRzIGl0cyBvdXRwdXQgKHNlZSBiZWxv dykiKQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCItLWxvZ2ZpbGUtZGlyIiwgYWN0aW9uID0gInN0 b3JlIiwKKyAgICAgICAgICAgICAgICAgICAgICBkZXN0ID0gImxvZ2ZpbGVfZGlyIiwgZGVmYXVs dCA9ICIvdmFyL2xvZy94ZW4vY29uc29sZS8iLAorICAgICAgICAgICAgICAgICAgICAgIHR5cGUg PSAic3RyaW5nIiwKKyAgICAgICAgICAgICAgICAgICAgICBoZWxwID0gJ1NwZWNpZnkgdGhlIGRp cmVjdG9yeSB0byBsb29rIGZvciBjb25zb2xlIGxvZ3MsIFwKK2RlZmF1bHRzIHRvICIvdmFyL2xv Zy94ZW4vY29uc29sZS8iJykKKyAgICBwYXJzZXIuYWRkX29wdGlvbigiLS1sb2dmaWxlLXBhdHRl cm4iLCBhY3Rpb24gPSAic3RvcmUiLAorICAgICAgICAgICAgICAgICAgICAgIGRlc3QgPSAibG9n ZmlsZV9wYXR0ZXJuIiwgZGVmYXVsdCA9ICJndWVzdC0lcy5sb2ciLAorICAgICAgICAgICAgICAg ICAgICAgIHR5cGUgPSAic3RyaW5nIiwKKyAgICAgICAgICAgICAgICAgICAgICBoZWxwID0gJ1Nw ZWNpZnkgdGhlIGxvZyBmaWxlIG5hbWUgcGF0dGVybiwgXAorZGVmYXVsdHMgdG8gImd1ZXN0LSVz LmxvZyInKQogCiAgICAgb3B0cywgYXJncyA9IHBhcnNlci5wYXJzZV9hcmdzKCkKICAgICBvcHRz LmFyZ3MgPSBhcmdzCi0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhl bi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=