From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [XTF PATCH 3/3] xtf-runner: support two modes for getting output Date: Wed, 10 Aug 2016 16:07:30 +0100 Message-ID: <1470841650-30850-4-git-send-email-wei.liu2@citrix.com> References: <1470841650-30850-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bXV6l-0006kO-Ox for xen-devel@lists.xenproject.org; Wed, 10 Aug 2016 15:07:51 +0000 In-Reply-To: <1470841650-30850-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Wei Liu List-Id: xen-devel@lists.xenproject.org V2UgbmVlZCB0d28gbW9kZXMgZm9yIGdldHRpbmcgb3V0cHV0OgoKMS4gVXNlIGNvbnNvbGUgZGly ZWN0bHkgd2l0aCBuZXdlciAoPj00LjgpIFhlbgoyLiBVc2UgbG9nIGZpbGVzIGZvciBvbGRlciBY ZW4KClRoaXMgcGF0Y2ggaW1wbGVtZW50cyBib3RoLiBUaGUgZGVmYXVsdCBiZWhhdmlvdXIgaXMg dG8gY2hvb3NlIG1vZGUKYXV0b21hdGljYWxseSBiYXNlZCBvbiBYZW4gdmVyc2lvbi4gVXNlciBj YW4gYWxzbyBleHBsaWNpdGx5IHNwZWNpZnkKd2hpY2ggbW9kZSB0byB1c2UuCgpTaWduZWQtb2Zm LWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KIHh0Zi1ydW5uZXIgfCAxMDQg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDgzIGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3h0Zi1ydW5uZXIgYi94dGYtcnVubmVyCmluZGV4IDczYTRlMGQuLjJkNGQ2 ZGIgMTAwNzU1Ci0tLSBhL3h0Zi1ydW5uZXIKKysrIGIveHRmLXJ1bm5lcgpAQCAtMTEsNiArMTEs OCBAQAogCiBmcm9tIG9wdHBhcnNlIGltcG9ydCBPcHRpb25QYXJzZXIKIGZyb20gc3VicHJvY2Vz cyBpbXBvcnQgUG9wZW4sIFBJUEUsIGNhbGwgYXMgc3VicHJvY19jYWxsLCBjaGVja19vdXRwdXQK K2Zyb20gZGlzdHV0aWxzLnZlcnNpb24gaW1wb3J0IExvb3NlVmVyc2lvbgoraW1wb3J0IHRpbWUK IAogdHJ5OgogICAgIGltcG9ydCBqc29uCkBAIC00MzgsMzAgKzQ0MCwxOSBAQCBkZWYgbGlzdF90 ZXN0cyhvcHRzKToKICAgICBmb3Igc2VsIGluIG9wdHMuc2VsZWN0aW9uOgogICAgICAgICBwcmlu dCBzZWwKIAorZGVmIHJ1bl90ZXN0X2NvbnNvbGUob3B0cywgdGVzdCk6CisgICAgIiIiIFJ1biBh IHNwZWNpZmljIHRlc3QgdmlhIHhlbmNvbnNvbGUiIiIKIAotZGVmIHJ1bl90ZXN0KHRlc3QpOgot ICAgICIiIiBSdW4gYSBzcGVjaWZpYyB0ZXN0ICIiIgotCi0gICAgY21kID0gWyd4bCcsICdjcmVh dGUnLCAnLXAnLCB0ZXN0LmNmZ19wYXRoKCldCi0gICAgcHJpbnQgIkV4ZWN1dGluZyAnJXMnIiAl ICgiICIuam9pbihjbWQpLCApCi0gICAgcmMgPSBzdWJwcm9jX2NhbGwoY21kKQotICAgIGlmIHJj OgotICAgICAgICByYWlzZSBSdW5uZXJFcnJvcigiRmFpbGVkIHRvIGNyZWF0ZSBWTSIpCi0KLSAg ICBjbWQgPSBbJ3hsJywgJ2NvbnNvbGUnLCB0ZXN0LnZtX25hbWUoKV0KKyAgICBjbWQgPSBbJ3hs JywgJ2NyZWF0ZScsICctRmMnLCB0ZXN0LmNmZ19wYXRoKCldCiAgICAgcHJpbnQgIkV4ZWN1dGlu ZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCApCi0gICAgY29uc29sZSA9IFBvcGVuKGNtZCwgc3Rk b3V0ID0gUElQRSkKKyAgICBndWVzdCA9IFBvcGVuKGNtZCwgc3Rkb3V0ID0gUElQRSwgc3RkZXJy ID0gUElQRSkKIAotICAgIGNtZCA9IFsneGwnLCAndW5wYXVzZScsIHRlc3Qudm1fbmFtZSgpXQot ICAgIHByaW50ICJFeGVjdXRpbmcgJyVzJyIgJSAoIiAiLmpvaW4oY21kKSwgKQotICAgIHJjID0g c3VicHJvY19jYWxsKGNtZCkKLSAgICBpZiByYzoKLSAgICAgICAgcmFpc2UgUnVubmVyRXJyb3Io IkZhaWxlZCB0byB1bnBhdXNlIFZNIikKKyAgICAjIHN0ZG91dCBpcyBjb25zb2xlIG91dHB1dCwg c3RkZXJyIGlzIHhsIG91dHB1dAorICAgIHN0ZG91dCwgc3RkZXJyID0gZ3Vlc3QuY29tbXVuaWNh dGUoKQogCi0gICAgc3Rkb3V0LCBfID0gY29uc29sZS5jb21tdW5pY2F0ZSgpCi0KLSAgICBpZiBj b25zb2xlLnJldHVybmNvZGU6Ci0gICAgICAgIHJhaXNlIFJ1bm5lckVycm9yKCJGYWlsZWQgdG8g b2J0YWluIFZNIGNvbnNvbGUiKQorICAgIGlmIGd1ZXN0LnJldHVybmNvZGU6CisgICAgICAgIHBy aW50IHN0ZGVycgorICAgICAgICByYWlzZSBSdW5uZXJFcnJvcigiRmFpbGVkIHRvIGNvbW11bmlj YXRlIHdpdGggZ3Vlc3QiKQogCiAgICAgbGluZXMgPSBzdGRvdXQuc3BsaXRsaW5lcygpCiAKQEAg LTQ4Myw2ICs0NzQsNjQgQEAgZGVmIHJ1bl90ZXN0KHRlc3QpOgogICAgIHJldHVybiAiRVJST1Ii CiAKIAorZGVmIHJ1bl90ZXN0X2xvZ2ZpbGUob3B0cywgdGVzdCk6CisgICAgIiIiIFJ1biBhIHNw ZWNpZmljIHRlc3QgdmlhIGdyZXBwaW5nIGxvZyBmaWxlIiIiCisKKyAgICBmbiA9IG9wdHMubG9n ZmlsZV9kaXIgKyAob3B0cy5sb2dmaWxlX3BhdHRlcm4gJSB0ZXN0KQorICAgIGxvY2FsX3RpbWUg PSB0aW1lLnN0cmZ0aW1lKCclWS0lbS0lZCAlSDolTTolUycsIHRpbWUubG9jYWx0aW1lKCkpCisK KyAgICAjIFVzZSB0aW1lIHRvIGdlbmVyYXRlIHVuaXF1ZSBzdGFtcHMKKyAgICBzdGFydF9zdGFt cCA9ICI9PT09PSBYVEYgVEVTVCBTVEFSVCAlcyA9PT09PSIgJSBsb2NhbF90aW1lCisgICAgZW5k X3N0YW1wID0gIj09PT09IFhURiBURVNUIEVORCAlcyA9PT09PSIgJSBsb2NhbF90aW1lCisKKyAg ICBwcmludCAiVXNpbmcgJXMiICUgZm4KKworICAgIGYgPSBvcGVuKGZuLCAiYWIiKQorICAgIGYu d3JpdGUoc3RhcnRfc3RhbXAgKyAiXG4iKQorICAgIGYuY2xvc2UoKQorCisgICAgY21kID0gWyd4 bCcsICdjcmVhdGUnLCAnLUYnLCB0ZXN0LmNmZ19wYXRoKCldCisgICAgcHJpbnQgIkV4ZWN1dGlu ZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCApCisgICAgcmMgPSBzdWJwcm9jX2NhbGwoY21kKQor ICAgIGlmIHJjOgorICAgICAgICByYWlzZSBSdW5uZXJFcnJvcigiRmFpbGVkIHRvIHJ1biB0ZXN0 IikKKworICAgIGYgPSBvcGVuKGZuLCAiYWIiKQorICAgIGYud3JpdGUoZW5kX3N0YW1wICsgIlxu IikKKyAgICBmLmNsb3NlKCkKKworICAgIGYgPSBvcGVuKGZuLCAicmIiKQorICAgIG91dHB1dCA9 IGYucmVhZGxpbmVzKCkKKyAgICBmLmNsb3NlKCkKKyAgICBsaW5lcyA9IFtdCisgICAgZm91bmQg PSBGYWxzZQorICAgIGZvciBsaW5lIGluIG91dHB1dDoKKyAgICAgICAgaWYgZW5kX3N0YW1wIGlu IGxpbmU6CisgICAgICAgICAgICBicmVhaworICAgICAgICBpZiBzdGFydF9zdGFtcCBpbiBsaW5l OgorICAgICAgICAgICAgZm91bmQgPSBUcnVlCisgICAgICAgICAgICBjb250aW51ZQorICAgICAg ICBpZiBub3QgZm91bmQ6CisgICAgICAgICAgICBjb250aW51ZQorICAgICAgICBsaW5lcy5hcHBl bmQobGluZSkKKworICAgIHByaW50ICIiLmpvaW4obGluZXMpCisKKyAgICBpZiBsZW4obGluZXMp ID09IDA6CisgICAgICAgIHJhaXNlIFJ1bm5lckVycm9yKCJMb2cgZmlsZSBvdXRwdXQgZW1wdHki KQorCisgICAgdGVzdF9yZXN1bHQgPSBsaW5lc1stMV0KKyAgICBpZiBub3QgIlRlc3QgcmVzdWx0 OiIgaW4gdGVzdF9yZXN1bHQ6CisgICAgICAgIHJldHVybiAiRVJST1IiCisKKyAgICBmb3IgcmVz IGluIGFsbF9yZXN1bHRzOgorCisgICAgICAgIGlmIHJlcyBpbiB0ZXN0X3Jlc3VsdDoKKyAgICAg ICAgICAgIHJldHVybiByZXMKKworICAgIHJldHVybiAiRVJST1IiCisKKwogZGVmIHJ1bl90ZXN0 cyhvcHRzKToKICAgICAiIiIgUnVuIHRlc3RzICIiIgogCkBAIC00OTAsMTIgKzUzOSwyNSBAQCBk ZWYgcnVuX3Rlc3RzKG9wdHMpOgogICAgIGlmIG5vdCBsZW4odGVzdHMpOgogICAgICAgICByYWlz ZSBSdW5uZXJFcnJvcigiTm8gdGVzdHMgdG8gcnVuIikKIAorICAgIGlmIG9wdHMubW9kZSA9PSAi YXV0byI6CisgICAgICAgIHhlbl92ZXJzaW9uID0gTG9vc2VWZXJzaW9uKGdldF94ZW5fdmVyc2lv bigpKQorICAgICAgICBpZiB4ZW5fdmVyc2lvbiA8IExvb3NlVmVyc2lvbigiNC44Iik6CisgICAg ICAgICAgICBydW5fdGVzdCA9IHJ1bl90ZXN0X2xvZ2ZpbGUKKyAgICAgICAgZWxzZToKKyAgICAg ICAgICAgIHJ1bl90ZXN0ID0gcnVuX3Rlc3RfY29uc29sZQorICAgIGVsaWYgb3B0cy5tb2RlID09 ICJjb25zb2xlIjoKKyAgICAgICAgcnVuX3Rlc3QgPSBydW5fdGVzdF9jb25zb2xlCisgICAgZWxp ZiBvcHRzLm1vZGUgPT0gImxvZ2ZpbGUiOgorICAgICAgICBydW5fdGVzdCA9IHJ1bl90ZXN0X2xv Z2ZpbGUKKyAgICBlbHNlOgorICAgICAgICByYWlzZSBSdW5uZXJFcnJvcigiVW5yZWNvZ25pc2Vk IG1vZGUiKQorCiAgICAgcmMgPSBhbGxfcmVzdWx0cy5pbmRleCgnU1VDQ0VTUycpCiAgICAgcmVz dWx0cyA9IFtdCiAKICAgICBmb3IgdGVzdCBpbiB0ZXN0czoKIAotICAgICAgICByZXMgPSBydW5f dGVzdCh0ZXN0KQorICAgICAgICByZXMgPSBydW5fdGVzdChvcHRzLCB0ZXN0KQogICAgICAgICBy ZXNfaWR4ID0gYWxsX3Jlc3VsdHMuaW5kZXgocmVzKQogICAgICAgICBpZiByZXNfaWR4ID4gcmM6 CiAgICAgICAgICAgICByYyA9IHJlc19pZHgKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==