RE: Initial patch for toolset modification proposal
"Harring, BrianX D" <[email protected]> Wed, 11 Jan 2006 14:22:41 -0800
| Newsgroups | gmane.linux.lsb.test-suite |
|---|---|
| Message-ID | <66539F0E7F15B44C9C0FC50D0FF024F704E093FF@orsmsx407> |
This is a multi-part message in MIME format. ------_=_NextPart_001_01C616FD.899BA905 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This time around, managed to attach the patches. Pardon the duplicate spam for those who've received this already. ~brian > -----Original Message----- > From: [email protected] [mailto:lsb-test- > [email protected]] On Behalf Of Harring, BrianX D > Sent: Tuesday, January 10, 2006 7:42 PM > To: Wichmann, Mats D; [email protected] > Cc: [email protected] > Subject: [Lsb-test] RE: Initial patch for toolset modification proposal >=20 > Round two, hopefully this hits the ml this time. >=20 > Attached are two patches- one for the tests modules (modifying appchk > and libchk), the other for build-env (modifying lsbcc). >=20 > Adds the following functionality- > If the env var LSB_PRODUCT is available, sets the default product to the > val- valid settings are [desktop|core], else defaults to core. >=20 > Command line addition is > -T [core|desktop], and --lsb-product [core|desktop] >=20 > If defined, again, must be valid- overrides any env specification. All > is an unstated product option- -A functionality is rolled in via the all > product target (thus -A was removed). >=20 > A patch for cmdchk will be following tomorrow, just working out a tweak > to the Commands table to hold product info in the meantime. >=20 > Comments/feedback desired (would like to push it into cvs as soon as > it's hit the ml, and folks have had a chance to respond). >=20 > Thanks, > ~brian > _______________________________________________ > lsb-test mailing list > [email protected] > http://mail.freestandards.org/mailman/listinfo/lsb-test ------_=_NextPart_001_01C616FD.899BA905 Content-Type: application/octet-stream; name="lsbcc.patch" Content-Transfer-Encoding: base64 Content-Description: lsbcc.patch Content-Disposition: attachment; filename="lsbcc.patch" SW5kZXg6IGxzYmNjLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvbHNiL2J1aWxkX2Vu di9sc2JkZXYtY2MvbHNiY2MuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS44NQpkaWZmIC11IC1y MS44NSBsc2JjYy5jCi0tLSBsc2JjYy5jCTE4IE5vdiAyMDA1IDE1OjExOjM4IC0wMDAwCTEuODUK KysrIGxzYmNjLmMJMTEgSmFuIDIwMDYgMDM6MzI6MzYgLTAwMDAKQEAgLTI0Miw3ICsyNDIsNyBA QAogICogYSBmZXcgcm91dGluZXMgaGVyZSB0aGF0IGFyZSB1c2VkIHRvIGRvIHRoZSBzcGVjaWFs IHByb2Nlc3NpbmcuCiAgKi8KIAotY2hhciAqZGVmYXVsdF9sc2JsaWJzW10gPSB7CitjaGFyICps c2JfY29yZWxpYnNbXSA9IHsKIAkiYyIsCQkvKiBjb3JlIG1vZHVsZSAqLwogCSJjcnlwdCIsCiAJ ImRsIiwKQEAgLTI1NCw3ICsyNTQsNiBAQAogCSJydCIsCiAJInV0aWwiLAogCSJ6IiwKLQkic3Rk YysrIiwJLyogYysrIG1vZHVsZSAqLwogCSJHTCIsCQkvKiBncmFwaGljcyBtb2R1bGUgKi8KIAki SUNFIiwKIAkiU00iLApAQCAtMjYyLDcgKzI2MSwzMiBAQAogCSJYZXh0IiwKIAkiWGkiLAogCSJY dCIsCi0JMAorCU5VTEwKK307CisKK2NoYXIgKmxzYl9jcGx1c2xpYnNbXSA9IHsKKwkic3RkYysr IiwKKwlOVUxMCit9OworCitjaGFyICpsc2JfZGVza3RvcFtdID0geworCSJnbGliLTIuMCIsCisJ Imd0aHJlYWQtMi4wIiwKKwkiZ29iamVjdC0yLjAiLAorCSJnbW9kdWxlLTIuMCIsCisJImF0ay0x LjAiLAorCSJwYW5nby0xLjAiLAorCSJwYW5nb3hmdC0xLjAiLAorCSJwYW5nb2Z0Mi0xLjAiLAor CSJnZGsteDExLTIuMCIsCisJImdka19waXhidXhfeGxpYi0yLjAiLAorCSJnZGtfcGl4YnVmLTIu MCIsCisJImd0ay14MTEtMi4wIiwKKwkieG1sMiIsCisJImpwZWciLAorCSJwbmcxMiIsCisJImZv bnRjb25maWciLAorCU5VTEwKIH07CiAKIHZvaWQKQEAgLTM2MSw2ICszODUsNyBAQAogCXsicnBh dGgiLHJlcXVpcmVkX2FyZ3VtZW50LDAsMH0sCiAJeyJycGF0aC1saW5rIixyZXF1aXJlZF9hcmd1 bWVudCwwLDB9LAogCXsic2hhcmVkIixub19hcmd1bWVudCwwLDB9LAorCXsibHNiLXByb2R1Y3Qi LCByZXF1aXJlZF9hcmd1bWVudCwgMCwgMX0sCiAJe05VTEwsMCwwLDB9CiAJfTsKIApAQCAtNDA4 LDEyICs0MzMsMTQgQEAKIAogaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIHsKLWlu dAljLGk7Ci1pbnQJb3B0aW9uX2luZGV4OwotaW50IAlhdXRvX3B0aHJlYWQ7CitpbnQJCWMsaSwg aWdub3JlZF9hcmdzPTA7CitpbnQJCW9wdGlvbl9pbmRleDsKK2ludAkJZGVza3RvcF9wcm9kdWN0 ID0gMDsKK2ludAkJYXV0b19wdGhyZWFkOwogY2hhcglwcm9naW50YnVmWzI1Nl07CiBjaGFyCXRt cGJ1ZlsyNTZdOwogY2hhcgkqcHRyOworY2hhcgkqKnRtcF9hcmd2OwogCiAvKgogICogU2V0IHVw IHRoZSBwYXRocyB3ZSB3aWxsIG5lZWQKQEAgLTQ3NywxMyArNTA0LDQwIEBACiAJCWZwcmludGYo c3RkZXJyLCJjKysgaW5jbHVkZSBwcmVmaXggc2V0IHRvICVzXG4iLCBjeHhpbmNwYXRoICk7CiAJ fQogCisKK2lmKCBsc2JjY19kZWJ1ZyZERUJVR19BUkdVTUVOVFMgKSB7CisJZm9yKGk9MDtpPGFy Z2M7aSsrKQorCQlmcHJpbnRmKHN0ZGVyciwiJTMuM2Q6ICVzXG4iLCBpLCBhcmd2W2ldICk7Cit9 CisJCisvKiBEZXRlcm1pbmUgaWYgd2UgYXJlIGJlaW5nIGNhbGxlZCBmb3IgQyBvciBDKysgKi8K K2lmKCBzdHJjbXAoYmFzZW5hbWUoYXJndlswXSksICJsc2JjKysiKSA9PSAwICkgeworCS8qIFdl IGFyZSBjb21waWxpbmcgQysrIC0gc2V0IGEgZmxhZyB0byBhZmZlY3Qgc29tZSB0aGluZ3MgbGF0 ZXIgb24gKi8KKwkvKgorCWZwcmludGYoc3RkZXJyLCJVc2luZyBDKysgbW9kZVxuIik7CisJKi8K Kwlsc2JjY21vZGU9TFNCQ1BMVVM7Cit9CisKKwogLyoKICAqIEJ1aWxkIHRoZSBhcmd2Z3JvdXAg Zm9yIHRoZSAia25vd24iIGxpYnJhcnkgbmFtZXMgaGVyZQogICogVGhlbiBhZGQgdG8gaXQgaWYg dGhlIGVudmlyb25tZW50IHZhcmlhYmxlIGlzIHNldAogICovCiBsc2JsaWJzPWFyZ3Zpbml0KCk7 Ci1mb3IoaT0wO2RlZmF1bHRfbHNibGlic1tpXTtpKyspCi0JYXJndmFkZHN0cmluZyhsc2JsaWJz LHN0cmR1cChkZWZhdWx0X2xzYmxpYnNbaV0pKTsKK2ZvcihpPTA7bHNiX2NvcmVsaWJzW2ldOyBp KyspCisJYXJndmFkZHN0cmluZyhsc2JsaWJzLCBzdHJkdXAobHNiX2NvcmVsaWJzW2ldKSk7CisK K2lmKExTQkNQTFVTID09IGxzYmNjbW9kZSkgeworCWZvcihpPTA7bHNiX2NwbHVzbGlic1tpXTsg aSsrKQorCQlhcmd2YWRkc3RyaW5nKGxzYmxpYnMsIHN0cmR1cChsc2JfY3BsdXNsaWJzW2ldKSk7 Cit9CisKK2lmKChwdHIgPSBnZXRlbnYoIkxTQl9QUk9EVUNUIikpICE9IE5VTEwpIHsKKwlpZihz dHJjYXNlY21wKHB0ciwgImFsbCIpIHx8IHN0cmNhc2VjbXAocHRyLCAiZGVza3RvcCIpKQorCQlk ZXNrdG9wX3Byb2R1Y3QgPSAxOworfSBlbHNlCisJZGVza3RvcF9wcm9kdWN0ID0gMDsKIAogaWYo IChwdHI9Z2V0ZW52KCJMU0JDQ19TSEFSRURMSUJTIikpICE9IE5VTEwgKSB7CiAJY2hhciAqbGli YXJnLCAqbGliOwpAQCAtNDk3LDIyICs1NTEsNiBAQAogCQl9CiAJfQogCi1pZiggbHNiY2NfZGVi dWcmREVCVUdfQVJHVU1FTlRTICkKLQlmb3IoaT0wO2k8YXJnYztpKyspCi0JCWZwcmludGYoc3Rk ZXJyLCIlMy4zZDogJXNcbiIsIGksIGFyZ3ZbaV0gKTsKLQkKLS8qIERldGVybWluZSBpZiB3ZSBh cmUgYmVpbmcgY2FsbGVkIGZvciBDIG9yIEMrKyAqLwotaWYoc3RyY21wKGJhc2VuYW1lKGFyZ3Zb MF0pLCJsc2JjYyIpID09IDAgKSB7Ci0JLyogV2UgYXJlIGNvbXBpbGluZyBDIC0gbm90aGluZyBz cGVjaWFsIHRvIGRvICovCi0JOwotfSBlbHNlIGlmKCBzdHJjbXAoYmFzZW5hbWUoYXJndlswXSks ICJsc2JjKysiKSA9PSAwICkgewotCS8qIFdlIGFyZSBjb21waWxpbmcgQysrIC0gc2V0IGEgZmxh ZyB0byBhZmZlY3Qgc29tZSB0aGluZ3MgbGF0ZXIgb24gKi8KLQkvKgotCWZwcmludGYoc3RkZXJy LCJVc2luZyBDKysgbW9kZVxuIik7Ci0JKi8KLQlsc2JjY21vZGU9TFNCQ1BMVVM7Ci19Ci0KIC8q CiAgKiBEZXRlcm1pbmUgd2hlcmUgdGhlIEdDQyBzcGVjaWZpYyBmaWxlIGFyZSBsb2NhdGVkLgog ICovCkBAIC01ODMsNiArNjIxLDQ3IEBACiBvcHRlcnIgPSAwOwogYXV0b19wdGhyZWFkID0gMTsK IAorLyogc28gdGhpcyBpcyBhIGJpdCBhIHVnbHksIGJ1dCB3b3Jrcy4gIGVzc2VudGlhbGx5LCB3 ZSBkbyAqdHdvKiBwYXNzZXMgb2YgYXJncywgZmlyc3QgbG9va2luZyBmb3IgbHNiLXByb2R1Y3Qs CisgICBzZWNvbmQgZG9pbmcgYWN0dWFsIHByb2Nlc3NpbmcuICBSZWFzb25pbmcgYmVpbmcsIHRo YXQgLS1sc2ItcHJvZHVjdD1kZXNrdG9wIGNvdWxkIGJlIHRhaWwgZW5kIG9mIGFyZ3MtIGJ5IHRo ZQorICAgdGltZSB3ZSBzZWUgaXQsIHdlJ3ZlIGFscmVhZHkgY29udmVydGVkIC1sc29tZV9saWIs IGFuZCB0aGF0IGNvbnZlcnNpb24gbWF5IG9yIG1heSBub3QgYmUgYWNjdXJhdGUgZm9yIHRoZSAK KyAgIGZpbmFsIGxzYiBwcm9kdWN0IHNwZWNpZmllZC4gIFNvIHdlIGRvIHR3byBwYXNzZXMuCisq LworCit0bXBfYXJndiA9IG1hbGxvYyhzaXplb2YoY2hhciAqKSphcmdjKTsKK2ZvcihpPTA7IGkg PCBhcmdjOyBpKyspCisJdG1wX2FyZ3ZbaV0gPSBhcmd2W2ldOworCit3aGlsZSgoYz1nZXRvcHRf bG9uZ19vbmx5KGFyZ2MsIHRtcF9hcmd2LCBvcHRzdHIsIGxvbmdfb3B0aW9ucywgJm9wdGlvbl9p bmRleCkpICE9IC0xKSB7IAorCWlmKDEgPT0gYykgeworCQkvKiBsc2JfcHJvZHVjdCAqLworCQlp ZihzdHJjYXNlY21wKG9wdGFyZywgImRlc2t0b3AiKSA9PSAwIHx8IHN0cmNhc2VjbXAob3B0YXJn LCAiYWxsIikgPT0gMCkKKwkJCWRlc2t0b3BfcHJvZHVjdCA9IDE7CisJCWVsc2UgaWYoc3RyY2Fz ZWNtcChvcHRhcmcsICJjb3JlIikgPT0gMCkKKwkJCWRlc2t0b3BfcHJvZHVjdCA9IDA7CisJCWVs c2UgeworCQkJZnByaW50ZihzdGRlcnIsICItLWxzYi1wcm9kdWN0IG11c3QgYmUgb25lIG9mIHRo ZSBmb2xsb3dpbmctIFtjb3JlfGRlc2t0b3BdXG4iKTsKKwkJCWV4aXQoMSk7CisJCX0KKwkJaWdu b3JlZF9hcmdzKz0yOworCQlicmVhazsKKwl9IGVsc2UgaWYoJz8nID09IGMpIHsKKwkJLyogdW5r bm93biBvcHQsIG9yIGtub3duIG9wdCBidXQgbWlzc2luZyBhcmcgKi8KKworCQlpZigwID09IHN0 cmNtcChhcmd2W29wdGluZCAtIDFdLCAiLS1sc2ItcHJvZHVjdCIpKSB7CisJCQkvKiBtaXNzaW5n IGFyZyAqLworCQkJZnByaW50ZihzdGRlcnIsICItLWxzYi1wcm9kdWN0IHJlcXVpcmVzIGFuIGFy Zy0gW2NvcmV8ZGVza3RvcF1cbiIpOworCQkJZXhpdCgxKTsKKwkJfQorCX0gLyogZWxzZSB3ZSBk b24ndCBjYXJlLiAqLworfQorCitmcmVlKHRtcF9hcmd2KTsKKworaWYoZGVza3RvcF9wcm9kdWN0 KSB7CisJZm9yKGk9MDtsc2JfZGVza3RvcFtpXTsgaSsrKQorCQlhcmd2YWRkc3RyaW5nKGxzYmxp YnMsIHN0cmR1cChsc2JfZGVza3RvcFtpXSkpOworfQorCiB3aGlsZSgoYz1nZXRvcHRfbG9uZ19v bmx5KGFyZ2MsYXJndixvcHRzdHIsbG9uZ19vcHRpb25zLCAmb3B0aW9uX2luZGV4KSk+PTAgKSB7 CiAJc3dpdGNoKGMpIHsKIAljYXNlIDA6CkBAIC02MDksNiArNjg4LDkgQEAKIAkJCWFyZ3ZhZGRz dHJpbmcoc3lzbGlicywiLWxwdGhyZWFkX25vbnNoYXJlZCIpOwogCQkJfQogCQlicmVhazsKKwlj YXNlIDE6CisJCS8qIGxzYiBwcm9kdWN0LiAgaWdub3JlIGl0IGZvciB0aGlzIHBoYXNlICovCisJ CWJyZWFrOwogCWNhc2UgJ0UnOgogCWNhc2UgJ1MnOgogCWNhc2UgJ2MnOgpAQCAtNjk4LDcgKzc4 MCwxMCBAQAogCQkJCQkJCWFyZ3Zbb3B0aW5kLTFdICk7CiAJCWJyZWFrOwogCWRlZmF1bHQ6Ci0J CS8qIFdlIHNob3VsZG4ndCBnZXQgaGVyZSAqLworCQkvKiBXZSBzaG91bGRuJ3QgZ2V0IGhlcmUg CisJCVNob3VsZCBvbmx5IGJlIHJlYWNoYWJsZSBpZiBnZXRvcHQgaXMgcmV0dXJuaW5nICc6JyBp bnN0ZWFkIG9mICc/Jywgd2hpY2gKKwkJaXMgb25seSBwb3NzaWJsZSB3aGVuIG9wdHN0clswXSA9 PSAnOicuCisJCSAqLwogCQlwcmludGYoInVuaGFuZGxlZCBvcHRpb24gJWMiLCBjICk7CiAJCWlm KCBvcHRhcmcgKQogCQkJcHJpbnRmICgiIHdpdGggYXJnICVzIiwgb3B0YXJnKTsKQEAgLTczNiw3 ICs4MjEsNyBAQAogICogSWYgbm90IHByaW50IGFuIGVycm9yIHNpbWlsYXIgdG8gcnVubmluZyAi Z2NjIgogICogd2l0aG91dCBhbnkgcGFyYW1ldGVycy9vcHRpb25zCiAgKi8KLWlmKGFyZ2MgPD0g MSkgeworaWYoYXJnYyAtIGlnbm9yZWRfYXJncyA8PSAxKSB7CiAgICAgZnByaW50ZihzdGRlcnIs ICIlczogbm8gaW5wdXQgZmlsZXNcbiIsIGJhc2VuYW1lKGFyZ3ZbMF0pKTsKICAgICBleGl0KEVY SVRfRkFJTFVSRSk7CiB9Cg== ------_=_NextPart_001_01C616FD.899BA905 Content-Type: application/octet-stream; name="tests.patch" Content-Transfer-Encoding: base64 Content-Description: tests.patch Content-Disposition: attachment; filename="tests.patch" SW5kZXg6IGFwcGNoay9hcHBjaGsuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9sc2Iv dGVzdHMvbWlzYy9hcHBjaGsvYXBwY2hrLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjkKZGlm ZiAtdSAtcjEuMjkgYXBwY2hrLmMKLS0tIGFwcGNoay9hcHBjaGsuYwk1IEp1bCAyMDA1IDEyOjQ3 OjM0IC0wMDAwCTEuMjkKKysrIGFwcGNoay9hcHBjaGsuYwkxMSBKYW4gMjAwNiAwMzozMzozMCAt MDAwMApAQCAtMzEsMTQgKzMxLDE2IEBACiB2b2lkCiB1c2FnZShjaGFyICpwcm9nbmFtZSkKIHsK LSAgcHJpbnRmKCJ1c2FnZTogJXMgW29wdGlvbnNdIGFwcG5hbWUgLi4uXG4lcyVzJXMlcyVzJXMl cyIsIHByb2duYW1lLAotIiAgLWgsIC0taGVscCAgICAgICAgICAgICAgICAgICAgIHNob3cgdGhp cyBoZWxwIG1lc3NhZ2UgYW5kIGV4aXRcbiIsCi0iICAtdiwgLS12ZXJzaW9uICAgICAgICAgICAg ICAgICAgc2hvdyB2ZXJzaW9uIGFuZCBMU0IgdmVyc2lvblxuIiwKLSIgIC1uLCAtLW5vam91cm5h bCAgICAgICAgICAgICAgICBkbyBub3Qgd3JpdGUgYSBqb3VybmFsIGZpbGVcbiIsCi0iICAtQSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hlY2sgdGhlIHN5bWJvbHMgaW4gYWxsIGFhaWxh YmxlIG1vZHVsZXNcbiIsCi0iICAtTSBNT0RVTEUsIC0tbW9kdWxlPU1PRFVMRSAgICAgYWRkIE1P RFVMRSB0byBsaXN0IG9mIGNoZWNrZWQgbW9kdWxlc1xuIiwKLSIgIC1MIExJQiAgICAgICAgICAg ICAgICAgICAgICAgICBhZGQgTElCIHRvIGxpc3Qgb2YgY2hlY2tlZCBsaWJyYXJpZXNcbiIsCi0i ICAtaiBKT1VSTkFMLCAtLWpvdXJuYWw9Sk9VUk5BTCAgdXNlIEpPVVJOQUwgYXMgZmlsZS9wYXRo IGZvciBqb3VybmFsIGZpbGVcbiIpOworICBwcmludGYoInVzYWdlOiAlcyBbb3B0aW9uc10gYXBw bmFtZSAuLi5cbiIKKyIgIC1oLCAtLWhlbHAgICAgICAgICAgICAgICAgICAgICBzaG93IHRoaXMg aGVscCBtZXNzYWdlIGFuZCBleGl0XG4iCisiICAtdiwgLS12ZXJzaW9uICAgICAgICAgICAgICAg ICAgc2hvdyB2ZXJzaW9uIGFuZCBMU0IgdmVyc2lvblxuIgorIiAgLW4sIC0tbm9qb3VybmFsICAg ICAgICAgICAgICAgIGRvIG5vdCB3cml0ZSBhIGpvdXJuYWwgZmlsZVxuIgorIiAgLVQsIC0tbHNi LXByb2R1Y3Q9W2NvcmV8ZGVza3RvcF1cbiIKKyIgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB0YXJnZXQgcHJvZHVjdCB0byBsb2FkIG1vZHVsZXMgZm9yXG4iCisiICAtTSBNT0RVTEUs IC0tbW9kdWxlPU1PRFVMRSAgICAgYWRkIE1PRFVMRSB0byBsaXN0IG9mIGNoZWNrZWQgbW9kdWxl c1xuIgorIiAgLUwgTElCICAgICAgICAgICAgICAgICAgICAgICAgIGFkZCBMSUIgdG8gbGlzdCBv ZiBjaGVja2VkIGxpYnJhcmllc1xuIgorIiAgLWogSk9VUk5BTCwgLS1qb3VybmFsPUpPVVJOQUwg IHVzZSBKT1VSTkFMIGFzIGZpbGUvcGF0aCBmb3Igam91cm5hbCBmaWxlXG4iLAorcHJvZ25hbWUp OwogfQogCiBpbnQKQEAgLTU1LDkgKzU3LDIzIEBACiAgICAgY2hhciB0bXBfc3RyaW5nW1RNUF9T VFJJTkdfU0laRSArIDFdOwogICAgIGNoYXIgam91cm5hbF9maWxlbmFtZVtUTVBfU1RSSU5HX1NJ WkUgKyAxXTsKICAgICBpbnQgb3ZlcnJpZGVKb3VybmFsRmlsZW5hbWUgPSAwOwotICAgIGludCBt b2R1bGVzID0gTFNCX0NvcmU7CQkvKiBkZWZhdWx0IG1vZHVsZSBsaXN0IHRvIGNoZWNrICovCisg ICAgaW50IG1vZHVsZXMgPSAwOwogICAgIGludCBvcHRpb25faW5kZXggPSAwOwogCisKKyAgICBj aGFyICpzID0gZ2V0ZW52KCJMU0JfUFJPRFVDVCIpOworICAgIGlmKHMpIHsKKyAgICAgICAgaWYo c3RyY2FzZWNtcChzLCAiY29yZSIpID09IDApCisgICAgICAgICAgICBtb2R1bGVzID0gTFNCX0Nv cmUgfCBMU0JfR3JhcGhpY3MgfCBMU0JfQ3BwOworICAgICAgICBlbHNlIGlmKHN0cmNhc2VjbXAo cywgImRlc2t0b3AiKSA9PSAwIHx8IHN0cmNhc2VjbXAocywgImFsbCIpID09IDApCisgICAgICAg ICAgICBtb2R1bGVzID0gTFNCX0FsbF9Nb2R1bGVzOworICAgICAgICBlbHNlIHsKKyAgICAgICAg ICAgIHByaW50Zigid2FybmluZzogZW52IHZhciBMU0JfUFJPRFVDVCBzcGVjaWZpZXMgYW4gaW52 YWxpZCBwcm9kdWN0LCBpZ25vcmluZyBpdC5cbiIpOworICAgICAgICAgICAgbW9kdWxlcyA9IExT Ql9Db3JlIHwgTFNCX0dyYXBoaWNzIHwgTFNCX0NwcDsKKyAgICAgICAgfQorICAgIH0gZWxzZQor ICAgICAgICBtb2R1bGVzID0gTFNCX0NvcmUgfCBMU0JfR3JhcGhpY3MgfCBMU0JfQ3BwOworCiAg ICAgZXh0cmFfbGlicmFyaWVzID0gc3RyZHVwKCJFWFRSQV9MSUJSQVJJRVM9Iik7CiAKICAgICBm b3IgKGkgPSAwOyBpIDwgYXJnYzsgaSsrKSB7CkBAIC03MywxMCArODksMTEgQEAKIAkgICAgeyJu b2pvdXJuYWwiLG5vX2FyZ3VtZW50LCAgICAgICAgTlVMTCwgJ24nfSwKIAkgICAgeyJtb2R1bGUi LCAgIHJlcXVpcmVkX2FyZ3VtZW50LCAgTlVMTCwgJ00nfSwKIAkgICAgeyJqb3VybmFsIiwgIHJl cXVpcmVkX2FyZ3VtZW50LCAgTlVMTCwgJ2onfSwKKwkgICAgeyJsc2ItcHJvZHVjdCIsIHJlcXVp cmVkX2FyZ3VtZW50LCAgTlVMTCwgJ1QnfSwKIAkgICAgezAsIDAsIDAsIDB9CiAgICAgICB9Owog Ci0gICAgICBjID0gZ2V0b3B0X2xvbmcgKGFyZ2MsIGFyZ3YsICJodm5BTTpMOmo6IiwgbG9uZ19v cHRpb25zLCAmb3B0aW9uX2luZGV4KTsKKyAgICAgIGMgPSBnZXRvcHRfbG9uZyAoYXJnYywgYXJn diwgImh2bk06TDpqOlQ6IiwgbG9uZ19vcHRpb25zLCAmb3B0aW9uX2luZGV4KTsKICAgICAgIGlm IChjID09IC0xKQogCSAgYnJlYWs7CiAgICAgICBzd2l0Y2ggKGMpIHsKQEAgLTkxLDkgKzEwOCwx NiBAQAogCSAgICAgIHNucHJpbnRmKGpvdXJuYWxfZmlsZW5hbWUsIFRNUF9TVFJJTkdfU0laRSwg Ii9kZXYvbnVsbCIpOwogCSAgICAgIG92ZXJyaWRlSm91cm5hbEZpbGVuYW1lID0gMTsKIAkgICAg ICBicmVhazsKLQkgIGNhc2UgJ0EnOgotCSAgICAgIG1vZHVsZXMgPSBMU0JfQWxsX01vZHVsZXM7 Ci0JICAgICAgcHJpbnRmKCJDaGVja2luZyBzeW1ib2xzIGluIGFsbCBtb2R1bGVzXG4iKTsKKwkg ICBjYXNlICdUJzoKKwkgICAgICBpZihzdHJjYXNlY21wKG9wdGFyZywgImNvcmUiKSA9PSAwKQor CQltb2R1bGVzID0gTFNCX0NvcmUgfCBMU0JfR3JhcGhpY3MgfCBMU0JfQ3BwOworCSAgICAgIGVs c2UgaWYoc3RyY2FzZWNtcChvcHRhcmcsICJkZXNrdG9wIikgPT0gMCB8fCBzdHJjYXNlY21wKG9w dGFyZywgImFsbCIpID09IDApCisJCW1vZHVsZXMgPSBMU0JfQWxsX01vZHVsZXM7CisJICAgICAg ZWxzZSB7CisJCXByaW50ZigicHJvZHVjdCAnJXMnIGlzIG5vdCB2YWxpZCFcbiIsIG9wdGFyZyk7 CisJCXVzYWdlKGFyZ3ZbMF0pOworCQlleGl0KDEpOworCSAgICAgIH0KIAkgICAgICBicmVhazsK IAkgIGNhc2UgJ00nOgogCSAgICAgIG1vZHVsZXMgfD0gZ2V0bW9kdWxldmFsKG9wdGFyZyk7Cklu ZGV4OiBsaWJjaGsvbGliY2hrLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvbHNiL3Rl c3RzL21pc2MvbGliY2hrL2xpYmNoay5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjY2CmRpZmYg LXUgLXIxLjY2IGxpYmNoay5jCi0tLSBsaWJjaGsvbGliY2hrLmMJNSBKdWwgMjAwNSAxMjo0Nzoz NSAtMDAwMAkxLjY2CisrKyBsaWJjaGsvbGliY2hrLmMJMTEgSmFuIDIwMDYgMDM6MzM6MzAgLTAw MDAKQEAgLTc3MSwxMiArNzcxLDE1IEBACiB2b2lkCiB1c2FnZShjaGFyICpwcm9nbmFtZSkKIHsK LSAgcHJpbnRmKCJ1c2FnZTogJXMgW29wdGlvbnNdIGxpYnJhcnlfbWFwXG4lcyVzJXMlcyVzIiwg cHJvZ25hbWUsCi0iICAtaCwgLS1oZWxwICAgICAgICAgICAgICAgICAgICAgc2hvdyB0aGlzIGhl bHAgbWVzc2FnZSBhbmQgZXhpdFxuIiwKLSIgIC12LCAtLXZlcnNpb24gICAgICAgICAgICAgICAg ICBzaG93IHZlcnNpb24gYW5kIExTQiB2ZXJzaW9uXG4iLAotIiAgLW4sIC0tbm9qb3VybmFsICAg ICAgICAgICAgICAgIGRvIG5vdCB3cml0ZSBhIGpvdXJuYWwgZmlsZVxuIiwKLSIgIC1NIE1PRFVM RSwgLS1tb2R1bGU9TU9EVUxFICAgICBjaGVjayBvbmx5IHRoZSBsaWJyYXJpZXMgZm91bmQgaW4g TU9EVUxFXG4iLAotIiAgLWogSk9VUk5BTCwgLS1qb3VybmFsPUpPVVJOQUwgIHVzZSBKT1VSTkFM IGFzIGZpbGUvcGF0aCBmb3Igam91cm5hbCBmaWxlXG4iKTsKKyAgcHJpbnRmKCJ1c2FnZTogJXMg W29wdGlvbnNdIGxpYnJhcnlfbWFwXG4iCisiICAtaCwgLS1oZWxwICAgICAgICAgICAgICAgICAg ICAgc2hvdyB0aGlzIGhlbHAgbWVzc2FnZSBhbmQgZXhpdFxuIgorIiAgLXYsIC0tdmVyc2lvbiAg ICAgICAgICAgICAgICAgIHNob3cgdmVyc2lvbiBhbmQgTFNCIHZlcnNpb25cbiIKKyIgIC1uLCAt LW5vam91cm5hbCAgICAgICAgICAgICAgICBkbyBub3Qgd3JpdGUgYSBqb3VybmFsIGZpbGVcbiIK KyIgIC1ULCAtLWxzYi1wcm9kdWN0PVtjb3JlfGRlc2t0b3BdXG4iCisiICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGFyZ2V0IHByb2R1Y3QgdG8gbG9hZCBtb2R1bGVzIGZvclxuIgor IiAgLU0gTU9EVUxFLCAtLW1vZHVsZT1NT0RVTEUgICAgIGNoZWNrIG9ubHkgdGhlIGxpYnJhcmll cyBmb3VuZCBpbiBNT0RVTEVcbiIKKyIgIC1qIEpPVVJOQUwsIC0tam91cm5hbD1KT1VSTkFMICB1 c2UgSk9VUk5BTCBhcyBmaWxlL3BhdGggZm9yIGpvdXJuYWwgZmlsZVxuIiwKK3Byb2duYW1lKTsK IH0KIAogaW50CkBAIC03ODcsNiArNzkwLDE5IEBACiAgIGNoYXIgam91cm5hbF9maWxlbmFtZVtU TVBfU1RSSU5HX1NJWkUrMV07CiAgIGludCBvcHRpb25faW5kZXggPSAwOwogICAKKyAgY2hhciAq cyA9IGdldGVudigiTFNCX1BST0RVQ1QiKTsKKyAgaWYocykgeworICAgIGlmKHN0cmNhc2VjbXAo cywgImNvcmUiKSA9PSAwKQorICAgICAgbW9kdWxlID0gTFNCX0NvcmUgfCBMU0JfR3JhcGhpY3Mg fCBMU0JfQ3BwOworICAgIGVsc2UgaWYoc3RyY2FzZWNtcChzLCAiZGVza3RvcCIpID09IDAgfHwg c3RyY2FzZWNtcChzLCAiYWxsIikgPT0gMCkKKyAgICAgIG1vZHVsZSA9IExTQl9BbGxfTW9kdWxl czsKKyAgICBlbHNlIHsKKyAgICAgIHByaW50Zigid2FybmluZzogZW52IHZhciBMU0JfUFJPRFVD VCBzcGVjaWZpZXMgYW4gaW52YWxpZCBwcm9kdWN0LCBpZ25vcmluZyBpdC5cbiIpOworICAgICAg bW9kdWxlID0gTFNCX0NvcmUgfCBMU0JfR3JhcGhpY3MgfCBMU0JfQ3BwOzsKKyAgICB9CisgIH0g ZWxzZQorICAgIG1vZHVsZSA9IExTQl9Db3JlIHwgTFNCX0dyYXBoaWNzIHwgTFNCX0NwcDsKKwog ICBpZiAoKHB0ciA9IGdldGVudigiTElCQ0hLX0RFQlVHIikpICE9IE5VTEwpIHsKICAgICBsaWJj aGtfZGVidWcgPSBzdHJ0b2QocHRyLE5VTEwpOwogICB9CkBAIC03OTksMTEgKzgxNSwxMiBAQAog ICAgICAgeyJ2ZXJzaW9uIiwgIG5vX2FyZ3VtZW50LCAgICAgICAgTlVMTCwgJ3YnfSwKICAgICAg IHsibm9qb3VybmFsIixub19hcmd1bWVudCwgICAgICAgIE5VTEwsICduJ30sCiAgICAgICB7Im1v ZHVsZSIsICAgcmVxdWlyZWRfYXJndW1lbnQsICBOVUxMLCAnTSd9LAorICAgICAgeyJsc2ItcHJv ZHVjdCIsICAgcmVxdWlyZWRfYXJndW1lbnQsICBOVUxMLCAnVCd9LAogICAgICAgeyJqb3VybmFs IiwgIHJlcXVpcmVkX2FyZ3VtZW50LCAgTlVMTCwgJ2onfSwKICAgICAgIHswLCAwLCAwLCAwfQog ICAgIH07CiAKLSAgICBjID0gZ2V0b3B0X2xvbmcgKGFyZ2MsIGFyZ3YsICJodm5NOmo6IiwgbG9u Z19vcHRpb25zLCAmb3B0aW9uX2luZGV4KTsKKyAgICBjID0gZ2V0b3B0X2xvbmcgKGFyZ2MsIGFy Z3YsICJodm5NOmo6VDoiLCBsb25nX29wdGlvbnMsICZvcHRpb25faW5kZXgpOwogICAgIGlmIChj ID09IC0xKQogICAgICAgYnJlYWs7CiAgICAgc3dpdGNoIChjKSB7CkBAIC04MTcsNiArODM0LDE3 IEBACiAgICAgICBjYXNlICduJzoKIAlzbnByaW50Zihqb3VybmFsX2ZpbGVuYW1lLCBUTVBfU1RS SU5HX1NJWkUsICIvZGV2L251bGwiKTsKIAlicmVhazsKKyAgICAgIGNhc2UgJ1QnOgorCWlmKHN0 cmNhc2VjbXAob3B0YXJnLCAiY29yZSIpID09IDApCisJICBtb2R1bGUgfD0gTFNCX0NvcmUgfCBM U0JfR3JhcGhpY3MgfCBMU0JfQ3BwOworCWVsc2UgaWYoc3RyY2FzZWNtcChvcHRhcmcsICJkZXNr dG9wIikgPT0gMCB8fCBzdHJjYXNlY21wKG9wdGFyZywgImFsbCIpID09IDApCisJICBtb2R1bGUg fD0gTFNCX0FsbF9Nb2R1bGVzOworCWVsc2UgeworCSAgcHJpbnRmKCJwcm9kdWN0ICclcycgaXMg bm90IHZhbGlkIVxuIiwgb3B0YXJnKTsKKwkgIHVzYWdlKGFyZ3ZbMF0pOworCSAgZXhpdCgxKTsK Kwl9CisJYnJlYWs7CiAgICAgICBjYXNlICdNJzoKIAltb2R1bGUgfD0gZ2V0bW9kdWxldmFsKG9w dGFyZyk7CiAJcHJpbnRmKCJPbmx5IGNoZWNraW5nIGxpYnJhcmllcyBpbiBtb2R1bGUgJXNcbiIs IG9wdGFyZyk7CkBAIC04MzgsOCArODY2LDYgQEAKICAgaW5pdF9saWJyYXJ5X3RhYmxlKGFyZ3Zb b3B0aW5kXSk7CiAjZW5kaWYKIAotICBpZiAobW9kdWxlID09IDApCi0gICAgbW9kdWxlID0gTFNC X0FsbF9Nb2R1bGVzOwogCiAgIGlmICh0ZXRqX3N0YXJ0X2pvdXJuYWwoam91cm5hbF9maWxlbmFt ZSwgJmpvdXJuYWwsICJsaWJjaGsiKSAhPSAwKSB7CiAgICAgc25wcmludGYodG1wX3N0cmluZywg VE1QX1NUUklOR19TSVpFLCAiQ291bGQgbm90IG9wZW4gam91cm5hbCBmaWxlICVzIiwK ------_=_NextPart_001_01C616FD.899BA905 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ lsb-test mailing list [email protected] http://mail.freestandards.org/mailman/listinfo/lsb-test ------_=_NextPart_001_01C616FD.899BA905--