From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 2ED573858D3C for ; Fri, 25 Mar 2022 12:08:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2ED573858D3C Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DE8BC1F38D; Fri, 25 Mar 2022 12:08:52 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B25B0132E9; Fri, 25 Mar 2022 12:08:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id E7DaKdSwPWKxUAAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:08:52 +0000 Content-Type: multipart/mixed; boundary="------------3OIAQv6R5S7o0COjx1owwrUE" Message-ID: Date: Fri, 25 Mar 2022 13:08:52 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH][libgomp, testsuite] Scale down some OpenACC test-cases Content-Language: en-US To: Tobias Burnus , Jakub Jelinek Cc: gcc-patches@gcc.gnu.org, Thomas Schwinge References: <20220325091848.GA22359@delia.home> <40a25c58-630f-d36c-06e5-6ea0769d53ec@codesourcery.com> From: Tom de Vries In-Reply-To: <40a25c58-630f-d36c-06e5-6ea0769d53ec@codesourcery.com> X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2022 12:08:58 -0000 This is a multi-part message in MIME format. --------------3OIAQv6R5S7o0COjx1owwrUE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/25/22 11:04, Tobias Burnus wrote: > On 25.03.22 10:27, Jakub Jelinek via Gcc-patches wrote: >> On Fri, Mar 25, 2022 at 10:18:49AM +0100, Tom de Vries wrote: >>> [...] >>> Fix this by scaling down the failing test-cases. >>> Tested on x86_64-linux with nvptx accelerator. >>> [...] >> Will defer to Thomas, as it is a purely OpenACC change. >> >> One way to do it is >> /* { dg-additional-options "-DEXPENSIVE" { target run_expensive_tests >> } } */ >> and using >> #ifdef EXPENSIVE >> [...] >> >> For the Fortran test it would mean .F90 extension though... > > Alternative, use the "-cpp" flag in 'dg-additional-options', which also > enables the C-pre-processor pre-processing in gfortran. > Ack, updated patch accordingly. Thanks, - Tom --------------3OIAQv6R5S7o0COjx1owwrUE Content-Type: text/x-patch; charset=UTF-8; name="0007-libgomp-testsuite-Scale-down-some-OpenACC-test-cases.patch" Content-Disposition: attachment; filename*0="0007-libgomp-testsuite-Scale-down-some-OpenACC-test-cases.pa"; filename*1="tch" Content-Transfer-Encoding: base64 W2xpYmdvbXAsIHRlc3RzdWl0ZV0gU2NhbGUgZG93biBzb21lIE9wZW5BQ0MgdGVzdC1jYXNl cwoKV2hlbiBhIGRpc3BsYXkgbWFuYWdlciBpcyBydW5uaW5nIG9uIGFuIG52aWRpYSBjYXJk LCBhbGwgQ1VEQSBrZXJuZWwgbGF1bmNoZXMKZ2V0IGEgNSBzZWNvbmRzIHdhdGNoZG9nIHRp bWVyLgoKQ29uc2VxdWVudGx5LCB3aGVuIHJ1bm5pbmcgdGhlIGxpYmdvbXAgdGVzdHN1aXRl IHdpdGggbnZwdHggYWNjZWxlcmF0b3IgYW5kCkdPTVBfTlZQVFhfSklUPS1PMCB3ZSBydW4g aW50byBhIGZldyBGQUlMcyBsaWtlIHRoaXM6Ci4uLgpsaWJnb21wOiBjdVN0cmVhbVN5bmNo cm9uaXplIGVycm9yOiB0aGUgbGF1bmNoIHRpbWVkIG91dCBhbmQgd2FzIHRlcm1pbmF0ZWQK RkFJTDogbGliZ29tcC5vYWNjLWMvLi4vbGliZ29tcC5vYWNjLWMtYysrLWNvbW1vbi9wYXJh bGxlbC1kaW1zLmMgXAogIC1EQUNDX0RFVklDRV9UWVBFX252aWRpYT0xIC1EQUNDX01FTV9T SEFSRUQ9MCAtZm9mZmxvYWQ9bnZwdHgtbm9uZSAtTzAgXAogIGV4ZWN1dGlvbiB0ZXN0Ci4u LgoKRml4IHRoaXMgYnkgc2NhbGluZyBkb3duIHRoZSBmYWlsaW5nIHRlc3QtY2FzZXMgYnkg ZGVmYXVsdCwgYW5kIHJldmVydGluZyB0bwp0aGUgb3JpZ2luYWwgYmVoYXZpb3VyIGZvciBH Q0NfVEVTVF9SVU5fRVhQRU5TSVZFPTEuCgpUZXN0ZWQgb24geDg2XzY0LWxpbnV4IHdpdGgg bnZwdHggYWNjZWxlcmF0b3IuCgpsaWJnb21wL0NoYW5nZUxvZzoKCjIwMjItMDMtMjUgIFRv bSBkZSBWcmllcyAgPHRkZXZyaWVzQHN1c2UuZGU+CgoJUFIgbGliZ29tcC8xMDUwNDIKCSog dGVzdHN1aXRlL2xpYmdvbXAub2FjYy1jLWMrKy1jb21tb24vcGFyYWxsZWwtZGltcy5jOiBS ZWR1Y2UKCWV4ZWN1dGlvbiB0aW1lLgoJKiB0ZXN0c3VpdGUvbGliZ29tcC5vYWNjLWMtYysr LWNvbW1vbi92cmVkMmQtMTI4LmM6IFNhbWUuCgkqIHRlc3RzdWl0ZS9saWJnb21wLm9hY2Mt Zm9ydHJhbi9wYXJhbGxlbC1kaW1zLmY5MDogU2FtZS4KCi0tLQogLi4uL2xpYmdvbXAub2Fj Yy1jLWMrKy1jb21tb24vcGFyYWxsZWwtZGltcy5jICAgICAgfCA0NSArKysrKysrKysrKysr LS0tLS0tLS0tCiAuLi4vbGliZ29tcC5vYWNjLWMtYysrLWNvbW1vbi92cmVkMmQtMTI4LmMg ICAgICAgICB8ICA2ICsrKwogLi4uL2xpYmdvbXAub2FjYy1mb3J0cmFuL3BhcmFsbGVsLWRp bXMuZjkwICAgICAgICAgfCAxOCArKysrKysrLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDYgaW5z ZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliZ29tcC90ZXN0 c3VpdGUvbGliZ29tcC5vYWNjLWMtYysrLWNvbW1vbi9wYXJhbGxlbC1kaW1zLmMgYi9saWJn b21wL3Rlc3RzdWl0ZS9saWJnb21wLm9hY2MtYy1jKystY29tbW9uL3BhcmFsbGVsLWRpbXMu YwppbmRleCBiMWNmZTM3ZGY4YS4uNjc5OGUyM2VmNzAgMTAwNjQ0Ci0tLSBhL2xpYmdvbXAv dGVzdHN1aXRlL2xpYmdvbXAub2FjYy1jLWMrKy1jb21tb24vcGFyYWxsZWwtZGltcy5jCisr KyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAub2FjYy1jLWMrKy1jb21tb24vcGFyYWxs ZWwtZGltcy5jCkBAIC0xLDYgKzEsOCBAQAogLyogT3BlbkFDQyBwYXJhbGxlbGlzbSBkaW1l bnNpb25zIGNsYXVzZXM6IG51bV9nYW5ncywgbnVtX3dvcmtlcnMsCiAgICB2ZWN0b3JfbGVu Z3RoLiAgKi8KIAorLyogeyBkZy1hZGRpdGlvbmFsLW9wdGlvbnMgIi1ERVhQRU5TSVZFIiB7 IHRhcmdldCBydW5fZXhwZW5zaXZlX3Rlc3RzIH0gfSAqLworCiAvKiB7IGRnLWFkZGl0aW9u YWwtb3B0aW9ucyAiLS1wYXJhbT1vcGVuYWNjLWtlcm5lbHM9ZGVjb21wb3NlIiB9ICovCiAK IC8qIHsgZGctYWRkaXRpb25hbC1vcHRpb25zICItZm9wdC1pbmZvLWFsbC1vbXAiIH0KQEAg LTQ5LDYgKzUxLDExIEBAIHN0YXRpYyBpbnQgYWNjX3ZlY3RvciAoKQogICByZXR1cm4gX19i dWlsdGluX2dvYWNjX3BhcmxldmVsX2lkIChHT01QX0RJTV9WRUNUT1IpOwogfQogCisjaWZk ZWYgRVhQRU5TSVZFCisjZGVmaW5lIE4gMTAwCisjZWxzZQorI2RlZmluZSBOIDUwCisjZW5k aWYKIAogaW50IG1haW4gKCkKIHsKQEAgLTc2LDcgKzgzLDcgQEAgaW50IG1haW4gKCkKICAg ICB7CiAgICAgICAvKiBXZSdyZSBhY3R1YWxseSBleGVjdXRpbmcgd2l0aCBudW1fZ2FuZ3Mg KDEpLiAgKi8KICAgICAgIGdhbmdzX2FjdHVhbCA9IDE7Ci0gICAgICBmb3IgKGludCBpID0g MTAwICogZ2FuZ3NfYWN0dWFsOyBpID4gLTEwMCAqIGdhbmdzX2FjdHVhbDsgLS1pKQorICAg ICAgZm9yIChpbnQgaSA9IE4gKiBnYW5nc19hY3R1YWw7IGkgPiAtTiAqIGdhbmdzX2FjdHVh bDsgLS1pKQogCXsKIAkgIGdhbmdzX21pbiA9IGdhbmdzX21heCA9IGFjY19nYW5nICgpOwog CSAgd29ya2Vyc19taW4gPSB3b3JrZXJzX21heCA9IGFjY193b3JrZXIgKCk7CkBAIC0xMTUs NyArMTIyLDcgQEAgaW50IG1haW4gKCkKICAgcmVkdWN0aW9uIChtaW46IGdhbmdzX21pbiwg d29ya2Vyc19taW4sIHZlY3RvcnNfbWluKSByZWR1Y3Rpb24gKG1heDogZ2FuZ3NfbWF4LCB3 b3JrZXJzX21heCwgdmVjdG9yc19tYXgpCiAgICAgICAvKiB7IGRnLW5vdGUge3ZhcmlhYmxl ICdpJyBpbiAncHJpdmF0ZScgY2xhdXNlIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRqdXN0aW5n IE9wZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7fSB7IHRh cmdldCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsgZGctb3B0 aW1pemVkIHthc3NpZ25lZCBPcGVuQUNDIGdhbmcgbG9vcCBwYXJhbGxlbGlzbX0ge30geyB0 YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3BfaSB9ICovCi0gICAgICBmb3IgKGludCBp ID0gMTAwICogZ2FuZ3NfYWN0dWFsOyBpID4gLTEwMCAqIGdhbmdzX2FjdHVhbDsgLS1pKQor ICAgICAgZm9yIChpbnQgaSA9IE4gKiBnYW5nc19hY3R1YWw7IGkgPiAtTiAqIGdhbmdzX2Fj dHVhbDsgLS1pKQogCXsKIAkgIGdhbmdzX21pbiA9IGdhbmdzX21heCA9IGFjY19nYW5nICgp OwogCSAgd29ya2Vyc19taW4gPSB3b3JrZXJzX21heCA9IGFjY193b3JrZXIgKCk7CkBAIC0x NTQsNyArMTYxLDcgQEAgaW50IG1haW4gKCkKICAgcmVkdWN0aW9uIChtaW46IGdhbmdzX21p biwgd29ya2Vyc19taW4sIHZlY3RvcnNfbWluKSByZWR1Y3Rpb24gKG1heDogZ2FuZ3NfbWF4 LCB3b3JrZXJzX21heCwgdmVjdG9yc19tYXgpCiAgICAgICAvKiB7IGRnLW5vdGUge3Zhcmlh YmxlICdpJyBpbiAncHJpdmF0ZScgY2xhdXNlIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRqdXN0 aW5nIE9wZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7fSB7 IHRhcmdldCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsgZGct b3B0aW1pemVkIHthc3NpZ25lZCBPcGVuQUNDIHdvcmtlciBsb29wIHBhcmFsbGVsaXNtfSB7 fSB7IHRhcmdldCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KLSAgICAgIGZvciAo aW50IGkgPSAxMDAgKiB3b3JrZXJzX2FjdHVhbDsgaSA+IC0xMDAgKiB3b3JrZXJzX2FjdHVh bDsgLS1pKQorICAgICAgZm9yIChpbnQgaSA9IE4gKiB3b3JrZXJzX2FjdHVhbDsgaSA+IC1O ICogd29ya2Vyc19hY3R1YWw7IC0taSkKIAl7CiAJICBnYW5nc19taW4gPSBnYW5nc19tYXgg PSBhY2NfZ2FuZyAoKTsKIAkgIHdvcmtlcnNfbWluID0gd29ya2Vyc19tYXggPSBhY2Nfd29y a2VyICgpOwpAQCAtMjAwLDcgKzIwNyw3IEBAIGludCBtYWluICgpCiAgIHJlZHVjdGlvbiAo bWluOiBnYW5nc19taW4sIHdvcmtlcnNfbWluLCB2ZWN0b3JzX21pbikgcmVkdWN0aW9uICht YXg6IGdhbmdzX21heCwgd29ya2Vyc19tYXgsIHZlY3RvcnNfbWF4KQogICAgICAgLyogeyBk Zy1ub3RlIHt2YXJpYWJsZSAnaScgaW4gJ3ByaXZhdGUnIGNsYXVzZSBpc24ndCBjYW5kaWRh dGUgZm9yIGFkanVzdGluZyBPcGVuQUNDIHByaXZhdGl6YXRpb24gbGV2ZWw6IG5vdCBhZGRy ZXNzYWJsZX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3BfaSB9ICovCiAg ICAgICAvKiB7IGRnLW9wdGltaXplZCB7YXNzaWduZWQgT3BlbkFDQyB2ZWN0b3IgbG9vcCBw YXJhbGxlbGlzbX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3BfaSB9ICov Ci0gICAgICBmb3IgKGludCBpID0gMTAwICogdmVjdG9yc19hY3R1YWw7IGkgPiAtMTAwICog dmVjdG9yc19hY3R1YWw7IC0taSkKKyAgICAgIGZvciAoaW50IGkgPSBOICogdmVjdG9yc19h Y3R1YWw7IGkgPiAtTiAqIHZlY3RvcnNfYWN0dWFsOyAtLWkpCiAJewogCSAgZ2FuZ3NfbWlu ID0gZ2FuZ3NfbWF4ID0gYWNjX2dhbmcgKCk7CiAJICB3b3JrZXJzX21pbiA9IHdvcmtlcnNf bWF4ID0gYWNjX3dvcmtlciAoKTsKQEAgLTI1MCw3ICsyNTcsNyBAQCBpbnQgbWFpbiAoKQog CX0KICAgICAgIC8qIEFzIHdlJ3JlIGV4ZWN1dGluZyBHUiBub3QgR1AsIGRvbid0IG11bHRp cGx5IHdpdGggYSAiZ2FuZ3NfYWN0dWFsIgogCSBmYWN0b3IuICAqLwotICAgICAgZm9yIChp bnQgaSA9IDEwMCAvKiAqIGdhbmdzX2FjdHVhbCAqLzsgaSA+IC0xMDAgLyogKiBnYW5nc19h Y3R1YWwgKi87IC0taSkKKyAgICAgIGZvciAoaW50IGkgPSBOIC8qICogZ2FuZ3NfYWN0dWFs ICovOyBpID4gLU4gLyogKiBnYW5nc19hY3R1YWwgKi87IC0taSkKIAl7CiAJICBnYW5nc19t aW4gPSBnYW5nc19tYXggPSBhY2NfZ2FuZyAoKTsKIAkgIHdvcmtlcnNfbWluID0gd29ya2Vy c19tYXggPSBhY2Nfd29ya2VyICgpOwpAQCAtMjkxLDcgKzI5OCw3IEBAIGludCBtYWluICgp CiAgIHJlZHVjdGlvbiAobWluOiBnYW5nc19taW4sIHdvcmtlcnNfbWluLCB2ZWN0b3JzX21p bikgcmVkdWN0aW9uIChtYXg6IGdhbmdzX21heCwgd29ya2Vyc19tYXgsIHZlY3RvcnNfbWF4 KQogICAgICAgLyogeyBkZy1ub3RlIHt2YXJpYWJsZSAnaScgaW4gJ3ByaXZhdGUnIGNsYXVz ZSBpc24ndCBjYW5kaWRhdGUgZm9yIGFkanVzdGluZyBPcGVuQUNDIHByaXZhdGl6YXRpb24g bGV2ZWw6IG5vdCBhZGRyZXNzYWJsZX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRj X2xvb3BfaSB9ICovCiAgICAgICAvKiB7IGRnLW9wdGltaXplZCB7YXNzaWduZWQgT3BlbkFD QyBnYW5nIGxvb3AgcGFyYWxsZWxpc219IHt9IHsgdGFyZ2V0ICotKi0qIH0gbF9sb29wX2kk Y19sb29wX2kgfSAqLwotICAgICAgZm9yIChpbnQgaSA9IDEwMCAqIGdhbmdzX2FjdHVhbDsg aSA+IC0xMDAgKiBnYW5nc19hY3R1YWw7IC0taSkKKyAgICAgIGZvciAoaW50IGkgPSBOICog Z2FuZ3NfYWN0dWFsOyBpID4gLU4gKiBnYW5nc19hY3R1YWw7IC0taSkKIAl7CiAJICBnYW5n c19taW4gPSBnYW5nc19tYXggPSBhY2NfZ2FuZyAoKTsKIAkgIHdvcmtlcnNfbWluID0gd29y a2Vyc19tYXggPSBhY2Nfd29ya2VyICgpOwpAQCAtMzQ4LDcgKzM1NSw3IEBAIGludCBtYWlu ICgpCiAgIHJlZHVjdGlvbiAobWluOiBnYW5nc19taW4sIHdvcmtlcnNfbWluLCB2ZWN0b3Jz X21pbikgcmVkdWN0aW9uIChtYXg6IGdhbmdzX21heCwgd29ya2Vyc19tYXgsIHZlY3RvcnNf bWF4KQogICAgICAgLyogeyBkZy1ub3RlIHt2YXJpYWJsZSAnaScgaW4gJ3ByaXZhdGUnIGNs YXVzZSBpc24ndCBjYW5kaWRhdGUgZm9yIGFkanVzdGluZyBPcGVuQUNDIHByaXZhdGl6YXRp b24gbGV2ZWw6IG5vdCBhZGRyZXNzYWJsZX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3Bf aSRjX2xvb3BfaSB9ICovCiAgICAgICAvKiB7IGRnLW9wdGltaXplZCB7YXNzaWduZWQgT3Bl bkFDQyB3b3JrZXIgbG9vcCBwYXJhbGxlbGlzbX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xv b3BfaSRjX2xvb3BfaSB9ICovCi0gICAgICBmb3IgKGludCBpID0gMTAwICogd29ya2Vyc19h Y3R1YWw7IGkgPiAtMTAwICogd29ya2Vyc19hY3R1YWw7IC0taSkKKyAgICAgIGZvciAoaW50 IGkgPSBOICogd29ya2Vyc19hY3R1YWw7IGkgPiAtTiAqIHdvcmtlcnNfYWN0dWFsOyAtLWkp CiAJewogCSAgZ2FuZ3NfbWluID0gZ2FuZ3NfbWF4ID0gYWNjX2dhbmcgKCk7CiAJICB3b3Jr ZXJzX21pbiA9IHdvcmtlcnNfbWF4ID0gYWNjX3dvcmtlciAoKTsKQEAgLTQxMSw3ICs0MTgs NyBAQCBpbnQgbWFpbiAoKQogICByZWR1Y3Rpb24gKG1pbjogZ2FuZ3NfbWluLCB3b3JrZXJz X21pbiwgdmVjdG9yc19taW4pIHJlZHVjdGlvbiAobWF4OiBnYW5nc19tYXgsIHdvcmtlcnNf bWF4LCB2ZWN0b3JzX21heCkKICAgICAgIC8qIHsgZGctbm90ZSB7dmFyaWFibGUgJ2knIGlu ICdwcml2YXRlJyBjbGF1c2UgaXNuJ3QgY2FuZGlkYXRlIGZvciBhZGp1c3RpbmcgT3BlbkFD QyBwcml2YXRpemF0aW9uIGxldmVsOiBub3QgYWRkcmVzc2FibGV9IHt9IHsgdGFyZ2V0ICot Ki0qIH0gbF9sb29wX2kkY19sb29wX2kgfSAqLwogICAgICAgLyogeyBkZy1vcHRpbWl6ZWQg e2Fzc2lnbmVkIE9wZW5BQ0Mgd29ya2VyIGxvb3AgcGFyYWxsZWxpc219IHt9IHsgdGFyZ2V0 ICotKi0qIH0gbF9sb29wX2kkY19sb29wX2kgfSAqLwotICAgICAgZm9yIChpbnQgaSA9IDEw MCAqIHdvcmtlcnNfYWN0dWFsOyBpID4gLTEwMCAqIHdvcmtlcnNfYWN0dWFsOyAtLWkpCisg ICAgICBmb3IgKGludCBpID0gTiAqIHdvcmtlcnNfYWN0dWFsOyBpID4gLU4gKiB3b3JrZXJz X2FjdHVhbDsgLS1pKQogCXsKIAkgIGdhbmdzX21pbiA9IGdhbmdzX21heCA9IGFjY19nYW5n ICgpOwogCSAgd29ya2Vyc19taW4gPSB3b3JrZXJzX21heCA9IGFjY193b3JrZXIgKCk7CkBA IC00NjgsNyArNDc1LDcgQEAgaW50IG1haW4gKCkKICAgcmVkdWN0aW9uIChtaW46IGdhbmdz X21pbiwgd29ya2Vyc19taW4sIHZlY3RvcnNfbWluKSByZWR1Y3Rpb24gKG1heDogZ2FuZ3Nf bWF4LCB3b3JrZXJzX21heCwgdmVjdG9yc19tYXgpCiAgICAgICAvKiB7IGRnLW5vdGUge3Zh cmlhYmxlICdpJyBpbiAncHJpdmF0ZScgY2xhdXNlIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRq dXN0aW5nIE9wZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7 fSB7IHRhcmdldCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsg ZGctb3B0aW1pemVkIHthc3NpZ25lZCBPcGVuQUNDIHZlY3RvciBsb29wIHBhcmFsbGVsaXNt fSB7fSB7IHRhcmdldCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KLSAgICAgIGZv ciAoaW50IGkgPSAxMDAgKiB2ZWN0b3JzX2FjdHVhbDsgaSA+IC0xMDAgKiB2ZWN0b3JzX2Fj dHVhbDsgLS1pKQorICAgICAgZm9yIChpbnQgaSA9IE4gKiB2ZWN0b3JzX2FjdHVhbDsgaSA+ IC1OICogdmVjdG9yc19hY3R1YWw7IC0taSkKIAl7CiAJICBnYW5nc19taW4gPSBnYW5nc19t YXggPSBhY2NfZ2FuZyAoKTsKIAkgIHdvcmtlcnNfbWluID0gd29ya2Vyc19tYXggPSBhY2Nf d29ya2VyICgpOwpAQCAtNTI4LDcgKzUzNSw3IEBAIGludCBtYWluICgpCiAgIHJlZHVjdGlv biAobWluOiBnYW5nc19taW4sIHdvcmtlcnNfbWluLCB2ZWN0b3JzX21pbikgcmVkdWN0aW9u IChtYXg6IGdhbmdzX21heCwgd29ya2Vyc19tYXgsIHZlY3RvcnNfbWF4KQogICAgICAgLyog eyBkZy1ub3RlIHt2YXJpYWJsZSAnaScgaW4gJ3ByaXZhdGUnIGNsYXVzZSBpc24ndCBjYW5k aWRhdGUgZm9yIGFkanVzdGluZyBPcGVuQUNDIHByaXZhdGl6YXRpb24gbGV2ZWw6IG5vdCBh ZGRyZXNzYWJsZX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3BfaSB9ICov CiAgICAgICAvKiB7IGRnLW9wdGltaXplZCB7YXNzaWduZWQgT3BlbkFDQyB2ZWN0b3IgbG9v cCBwYXJhbGxlbGlzbX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3BfaSB9 ICovCi0gICAgICBmb3IgKGludCBpID0gMTAwICogdmVjdG9yc19hY3R1YWw7IGkgPiAtMTAw ICogdmVjdG9yc19hY3R1YWw7IC0taSkKKyAgICAgIGZvciAoaW50IGkgPSBOICogdmVjdG9y c19hY3R1YWw7IGkgPiAtTiAqIHZlY3RvcnNfYWN0dWFsOyAtLWkpCiAJewogCSAgZ2FuZ3Nf bWluID0gZ2FuZ3NfbWF4ID0gYWNjX2dhbmcgKCk7CiAJICB3b3JrZXJzX21pbiA9IHdvcmtl cnNfbWF4ID0gYWNjX3dvcmtlciAoKTsKQEAgLTYwMiwyMCArNjA5LDIwIEBAIGludCBtYWlu ICgpCiAgICAgICAvKiB7IGRnLW5vdGUge3ZhcmlhYmxlICdpJyBpbiAncHJpdmF0ZScgY2xh dXNlIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRqdXN0aW5nIE9wZW5BQ0MgcHJpdmF0aXphdGlv biBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7fSB7IHRhcmdldCAqLSotKiB9IGxfbG9vcF9p JGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsgZGctbm90ZSB7dmFyaWFibGUgJ2onIGRlY2xh cmVkIGluIGJsb2NrIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRqdXN0aW5nIE9wZW5BQ0MgcHJp dmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7fSB7IHRhcmdldCAqLSotKiB9 IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsgZGctb3B0aW1pemVkIHthc3Np Z25lZCBPcGVuQUNDIGdhbmcgbG9vcCBwYXJhbGxlbGlzbX0ge30geyB0YXJnZXQgKi0qLSog fSBsX2xvb3BfaSRjX2xvb3BfaSB9ICovCi0gICAgICBmb3IgKGludCBpID0gMTAwICogZ2Fu Z3NfYWN0dWFsOyBpID4gLTEwMCAqIGdhbmdzX2FjdHVhbDsgLS1pKQorICAgICAgZm9yIChp bnQgaSA9IE4gKiBnYW5nc19hY3R1YWw7IGkgPiAtTiAqIGdhbmdzX2FjdHVhbDsgLS1pKQog I3ByYWdtYSBhY2MgbG9vcCAvKiB7IGRnLWxpbmUgbF9sb29wX2pbaW5jciBjX2xvb3Bfal0g fSAqLyBcCiAgIHdvcmtlciBcCiAgIHJlZHVjdGlvbiAobWluOiBnYW5nc19taW4sIHdvcmtl cnNfbWluLCB2ZWN0b3JzX21pbikgcmVkdWN0aW9uIChtYXg6IGdhbmdzX21heCwgd29ya2Vy c19tYXgsIHZlY3RvcnNfbWF4KQogCS8qIHsgZGctbm90ZSB7dmFyaWFibGUgJ2onIGluICdw cml2YXRlJyBjbGF1c2UgaXNuJ3QgY2FuZGlkYXRlIGZvciBhZGp1c3RpbmcgT3BlbkFDQyBw cml2YXRpemF0aW9uIGxldmVsOiBub3QgYWRkcmVzc2FibGV9IHt9IHsgdGFyZ2V0ICotKi0q IH0gbF9sb29wX2okY19sb29wX2ogfSAqLwogCS8qIHsgZGctbm90ZSB7dmFyaWFibGUgJ2sn IGRlY2xhcmVkIGluIGJsb2NrIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRqdXN0aW5nIE9wZW5B Q0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7fSB7IHRhcmdldCAq LSotKiB9IGxfbG9vcF9qJGNfbG9vcF9qIH0gKi8KIAkvKiB7IGRnLW9wdGltaXplZCB7YXNz aWduZWQgT3BlbkFDQyB3b3JrZXIgbG9vcCBwYXJhbGxlbGlzbX0ge30geyB0YXJnZXQgKi0q LSogfSBsX2xvb3BfaiRjX2xvb3BfaiB9ICovCi0JZm9yIChpbnQgaiA9IDEwMCAqIHdvcmtl cnNfYWN0dWFsOyBqID4gLTEwMCAqIHdvcmtlcnNfYWN0dWFsOyAtLWopCisJZm9yIChpbnQg aiA9IE4gKiB3b3JrZXJzX2FjdHVhbDsgaiA+IC1OICogd29ya2Vyc19hY3R1YWw7IC0taikK ICNwcmFnbWEgYWNjIGxvb3AgLyogeyBkZy1saW5lIGxfbG9vcF9rW2luY3IgY19sb29wX2td IH0gKi8gXAogICB2ZWN0b3IgXAogICByZWR1Y3Rpb24gKG1pbjogZ2FuZ3NfbWluLCB3b3Jr ZXJzX21pbiwgdmVjdG9yc19taW4pIHJlZHVjdGlvbiAobWF4OiBnYW5nc19tYXgsIHdvcmtl cnNfbWF4LCB2ZWN0b3JzX21heCkKIAkgIC8qIHsgZGctbm90ZSB7dmFyaWFibGUgJ2snIGlu ICdwcml2YXRlJyBjbGF1c2UgaXNuJ3QgY2FuZGlkYXRlIGZvciBhZGp1c3RpbmcgT3BlbkFD QyBwcml2YXRpemF0aW9uIGxldmVsOiBub3QgYWRkcmVzc2FibGV9IHt9IHsgdGFyZ2V0ICot Ki0qIH0gbF9sb29wX2skY19sb29wX2sgfSAqLwogCSAgLyogeyBkZy1vcHRpbWl6ZWQge2Fz c2lnbmVkIE9wZW5BQ0MgdmVjdG9yIGxvb3AgcGFyYWxsZWxpc219IHt9IHsgdGFyZ2V0ICot Ki0qIH0gbF9sb29wX2skY19sb29wX2sgfSAqLwotCSAgZm9yIChpbnQgayA9IDEwMCAqIHZl Y3RvcnNfYWN0dWFsOyBrID4gLTEwMCAqIHZlY3RvcnNfYWN0dWFsOyAtLWspCisJICBmb3Ig KGludCBrID0gTiAqIHZlY3RvcnNfYWN0dWFsOyBrID4gLU4gKiB2ZWN0b3JzX2FjdHVhbDsg LS1rKQogCSAgICB7CiAJICAgICAgZ2FuZ3NfbWluID0gZ2FuZ3NfbWF4ID0gYWNjX2dhbmcg KCk7CiAJICAgICAgd29ya2Vyc19taW4gPSB3b3JrZXJzX21heCA9IGFjY193b3JrZXIgKCk7 CkBAIC02NjQsNyArNjcxLDcgQEAgaW50IG1haW4gKCkKICAgICAgIC8qIHsgZGctbm90ZSB7 dmFyaWFibGUgJ2knIGRlY2xhcmVkIGluIGJsb2NrIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRq dXN0aW5nIE9wZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7 fSB7IHRhcmdldCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsg ZGctbm90ZSB7dmFyaWFibGUgJ2knIGluICdwcml2YXRlJyBjbGF1c2UgaXNuJ3QgY2FuZGlk YXRlIGZvciBhZGp1c3RpbmcgT3BlbkFDQyBwcml2YXRpemF0aW9uIGxldmVsOiBub3QgYWRk cmVzc2FibGV9IHt9IHsgdGFyZ2V0ICotKi0qIH0gbF9sb29wX2kkY19sb29wX2kgfSAqLwog ICAgICAgLyogeyBkZy1vcHRpbWl6ZWQge2Fzc2lnbmVkIE9wZW5BQ0Mgc2VxIGxvb3AgcGFy YWxsZWxpc219IHt9IHsgdGFyZ2V0ICotKi0qIH0gbF9sb29wX2kkY19sb29wX2kgfSAqLwot ICAgICAgZm9yIChpbnQgaSA9IDEwMDsgaSA+IC0xMDA7IC0taSkKKyAgICAgIGZvciAoaW50 IGkgPSBOOyBpID4gLU47IC0taSkKIAl7CiAJICAvKiBUaGlzIGlzIHRvIG1ha2UgdGhlIGxv b3AgdW5wYXJhbGxlbGl6YWJsZS4gICovCiAJICBhc20gdm9sYXRpbGUgKCIiIDogOiA6ICJt ZW1vcnkiKTsKQEAgLTcxNCw3ICs3MjEsNyBAQCBpbnQgbWFpbiAoKQogICAgICAgLyogeyBk Zy1ub3RlIHt2YXJpYWJsZSAnaScgZGVjbGFyZWQgaW4gYmxvY2sgaXNuJ3QgY2FuZGlkYXRl IGZvciBhZGp1c3RpbmcgT3BlbkFDQyBwcml2YXRpemF0aW9uIGxldmVsOiBub3QgYWRkcmVz c2FibGV9IHt9IHsgdGFyZ2V0ICotKi0qIH0gbF9sb29wX2kkY19sb29wX2kgfSAqLwogICAg ICAgLyogeyBkZy1ub3RlIHt2YXJpYWJsZSAnaScgaW4gJ3ByaXZhdGUnIGNsYXVzZSBpc24n dCBjYW5kaWRhdGUgZm9yIGFkanVzdGluZyBPcGVuQUNDIHByaXZhdGl6YXRpb24gbGV2ZWw6 IG5vdCBhZGRyZXNzYWJsZX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3Bf aSB9ICovCiAgICAgICAvKiB7IGRnLW9wdGltaXplZCB7YXNzaWduZWQgT3BlbkFDQyBzZXEg bG9vcCBwYXJhbGxlbGlzbX0ge30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3Bf aSB9ICovCi0gICAgICBmb3IgKGludCBpID0gMTAwOyBpID4gLTEwMDsgLS1pKQorICAgICAg Zm9yIChpbnQgaSA9IE47IGkgPiAtTjsgLS1pKQogCXsKIAkgIC8qIFRoaXMgaXMgdG8gbWFr ZSB0aGUgbG9vcCB1bnBhcmFsbGVsaXphYmxlLiAgKi8KIAkgIGFzbSB2b2xhdGlsZSAoIiIg OiA6IDogIm1lbW9yeSIpOwpAQCAtNzQ1LDcgKzc1Miw3IEBAIGludCBtYWluICgpCiAgICAg LyogeyBkZy1ub3RlIHt2YXJpYWJsZSAnaScgZGVjbGFyZWQgaW4gYmxvY2sgaXNuJ3QgY2Fu ZGlkYXRlIGZvciBhZGp1c3RpbmcgT3BlbkFDQyBwcml2YXRpemF0aW9uIGxldmVsOiBub3Qg YWRkcmVzc2FibGV9IHt9IHsgdGFyZ2V0ICotKi0qIH0gbF9jb21wdXRlJGNfY29tcHV0ZSB9 ICovCiAgICAgLyogeyBkZy13YXJuaW5nIHt1c2luZyAndmVjdG9yX2xlbmd0aCBcKDMyXCkn LCBpZ25vcmluZyAxfSB7fSB7IHRhcmdldCBvcGVuYWNjX252aWRpYV9hY2NlbF9zZWxlY3Rl ZCB9IGxfY29tcHV0ZSRjX2NvbXB1dGUgfSAqLwogICAgIHsKLSAgICAgIGZvciAoaW50IGkg PSAxMDA7IGkgPiAtMTAwOyBpLS0pCisgICAgICBmb3IgKGludCBpID0gTjsgaSA+IC1OOyBp LS0pCiAJewogCSAgZ2FuZ3NfbWluID0gZ2FuZ3NfbWF4ID0gYWNjX2dhbmcgKCk7CiAJICB3 b3JrZXJzX21pbiA9IHdvcmtlcnNfbWF4ID0gYWNjX3dvcmtlciAoKTsKQEAgLTc4OSwyMCAr Nzk2LDIwIEBAIGludCBtYWluICgpCiAgICAgICAvKiB7IGRnLW5vdGUge3ZhcmlhYmxlICdp JyBpbiAncHJpdmF0ZScgY2xhdXNlIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRqdXN0aW5nIE9w ZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7fSB7IHRhcmdl dCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsgZGctbm90ZSB7 dmFyaWFibGUgJ2onIGRlY2xhcmVkIGluIGJsb2NrIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRq dXN0aW5nIE9wZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7 fSB7IHRhcmdldCAqLSotKiB9IGxfbG9vcF9pJGNfbG9vcF9pIH0gKi8KICAgICAgIC8qIHsg ZGctb3B0aW1pemVkIHthc3NpZ25lZCBPcGVuQUNDIGdhbmcgbG9vcCBwYXJhbGxlbGlzbX0g e30geyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaSRjX2xvb3BfaSB9ICovCi0gICAgICBmb3Ig KGludCBpID0gMTAwOyBpID4gLTEwMDsgaS0tKQorICAgICAgZm9yIChpbnQgaSA9IE47IGkg PiAtTjsgaS0tKQogI3ByYWdtYSBhY2MgbG9vcCAvKiB7IGRnLWxpbmUgbF9sb29wX2pbaW5j ciBjX2xvb3Bfal0gfSAqLyBcCiAgIHdvcmtlciBcCiAgIHJlZHVjdGlvbiAobWluOiBnYW5n c19taW4sIHdvcmtlcnNfbWluLCB2ZWN0b3JzX21pbikgcmVkdWN0aW9uIChtYXg6IGdhbmdz X21heCwgd29ya2Vyc19tYXgsIHZlY3RvcnNfbWF4KQogCS8qIHsgZGctbm90ZSB7dmFyaWFi bGUgJ2onIGluICdwcml2YXRlJyBjbGF1c2UgaXNuJ3QgY2FuZGlkYXRlIGZvciBhZGp1c3Rp bmcgT3BlbkFDQyBwcml2YXRpemF0aW9uIGxldmVsOiBub3QgYWRkcmVzc2FibGV9IHt9IHsg dGFyZ2V0ICotKi0qIH0gbF9sb29wX2okY19sb29wX2ogfSAqLwogCS8qIHsgZGctbm90ZSB7 dmFyaWFibGUgJ2snIGRlY2xhcmVkIGluIGJsb2NrIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRq dXN0aW5nIE9wZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7 fSB7IHRhcmdldCAqLSotKiB9IGxfbG9vcF9qJGNfbG9vcF9qIH0gKi8KIAkvKiB7IGRnLW9w dGltaXplZCB7YXNzaWduZWQgT3BlbkFDQyB3b3JrZXIgbG9vcCBwYXJhbGxlbGlzbX0ge30g eyB0YXJnZXQgKi0qLSogfSBsX2xvb3BfaiRjX2xvb3BfaiB9ICovCi0JZm9yIChpbnQgaiA9 IDEwMDsgaiA+IC0xMDA7IGotLSkKKwlmb3IgKGludCBqID0gTjsgaiA+IC1OOyBqLS0pCiAj cHJhZ21hIGFjYyBsb29wIC8qIHsgZGctbGluZSBsX2xvb3Bfa1tpbmNyIGNfbG9vcF9rXSB9 ICovIFwKICAgdmVjdG9yIFwKICAgcmVkdWN0aW9uIChtaW46IGdhbmdzX21pbiwgd29ya2Vy c19taW4sIHZlY3RvcnNfbWluKSByZWR1Y3Rpb24gKG1heDogZ2FuZ3NfbWF4LCB3b3JrZXJz X21heCwgdmVjdG9yc19tYXgpCiAJICAvKiB7IGRnLW5vdGUge3ZhcmlhYmxlICdrJyBpbiAn cHJpdmF0ZScgY2xhdXNlIGlzbid0IGNhbmRpZGF0ZSBmb3IgYWRqdXN0aW5nIE9wZW5BQ0Mg cHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJlc3NhYmxlfSB7fSB7IHRhcmdldCAqLSot KiB9IGxfbG9vcF9rJGNfbG9vcF9rIH0gKi8KIAkgIC8qIHsgZGctb3B0aW1pemVkIHthc3Np Z25lZCBPcGVuQUNDIHZlY3RvciBsb29wIHBhcmFsbGVsaXNtfSB7fSB7IHRhcmdldCAqLSot KiB9IGxfbG9vcF9rJGNfbG9vcF9rIH0gKi8KLQkgIGZvciAoaW50IGsgPSAxMDAgKiB2ZWN0 b3JzX2FjdHVhbDsgayA+IC0xMDAgKiB2ZWN0b3JzX2FjdHVhbDsgay0tKQorCSAgZm9yIChp bnQgayA9IE4gKiB2ZWN0b3JzX2FjdHVhbDsgayA+IC1OICogdmVjdG9yc19hY3R1YWw7IGst LSkKIAkgICAgewogCSAgICAgIGdhbmdzX21pbiA9IGdhbmdzX21heCA9IGFjY19nYW5nICgp OwogCSAgICAgIHdvcmtlcnNfbWluID0gd29ya2Vyc19tYXggPSBhY2Nfd29ya2VyICgpOwpk aWZmIC0tZ2l0IGEvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5vYWNjLWMtYysrLWNvbW1v bi92cmVkMmQtMTI4LmMgYi9saWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLm9hY2MtYy1jKyst Y29tbW9uL3ZyZWQyZC0xMjguYwppbmRleCA0ODlmMjZhZDlmMi4uOWMxODJkOTBhMGQgMTAw NjQ0Ci0tLSBhL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAub2FjYy1jLWMrKy1jb21tb24v dnJlZDJkLTEyOC5jCisrKyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAub2FjYy1jLWMr Ky1jb21tb24vdnJlZDJkLTEyOC5jCkBAIC0xLDEwICsxLDE2IEBACiAvKiBUZXN0IGxhcmdl IHZlY3RvciBsZW5ndGhzLiAgKi8KIAorLyogeyBkZy1hZGRpdGlvbmFsLW9wdGlvbnMgIi1E RVhQRU5TSVZFIiB7IHRhcmdldCBydW5fZXhwZW5zaXZlX3Rlc3RzIH0gfSAqLworCiAvKiB7 IGRnLWFkZGl0aW9uYWwtb3B0aW9ucyAtV3VuaW5pdGlhbGl6ZWQgfSAqLwogCiAjaW5jbHVk ZSA8YXNzZXJ0Lmg+CiAKKyNpZmRlZiBFWFBFTlNJVkUKICNkZWZpbmUgbiAxMDAwMAorI2Vs c2UKKyNkZWZpbmUgbiAyNTAwCisjZW5kaWYKIGludCBhMVtuXSwgYTJbbl07CiAKICNkZWZp bmUgZ2VudGVzdChuYW1lLCBvdXRlciwgaW5uZXIpCQlcCmRpZmYgLS1naXQgYS9saWJnb21w L3Rlc3RzdWl0ZS9saWJnb21wLm9hY2MtZm9ydHJhbi9wYXJhbGxlbC1kaW1zLmY5MCBiL2xp YmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAub2FjYy1mb3J0cmFuL3BhcmFsbGVsLWRpbXMuZjkw CmluZGV4IGNkM2YzNTU1Yjc4Li5kMjA1MGU2OWViOSAxMDA2NDQKLS0tIGEvbGliZ29tcC90 ZXN0c3VpdGUvbGliZ29tcC5vYWNjLWZvcnRyYW4vcGFyYWxsZWwtZGltcy5mOTAKKysrIGIv bGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5vYWNjLWZvcnRyYW4vcGFyYWxsZWwtZGltcy5m OTAKQEAgLTUsNiArNSw5IEBACiAhIHsgZGctZG8gcnVuIH0KICEgeyBkZy1wcnVuZS1vdXRw dXQgImNvbW1hbmQtbGluZSBvcHRpb24gJy1maW50cmluc2ljLW1vZHVsZXMtcGF0aD0uKicg aXMgdmFsaWQgZm9yIEZvcnRyYW4gYnV0IG5vdCBmb3IgQyIgfQogCishIHsgZGctYWRkaXRp b25hbC1vcHRpb25zICItREVYUEVOU0lWRSIgeyB0YXJnZXQgcnVuX2V4cGVuc2l2ZV90ZXN0 cyB9IH0KKyEgeyBkZy1hZGRpdGlvbmFsLW9wdGlvbnMgIi1jcHAiIH0KKwogISB7IGRnLWFk ZGl0aW9uYWwtb3B0aW9ucyAiLWZvcHQtaW5mby1ub3RlLW9tcCIgfQogISB7IGRnLWFkZGl0 aW9uYWwtb3B0aW9ucyAiLS1wYXJhbT1vcGVuYWNjLXByaXZhdGl6YXRpb249bm9pc3kiIH0K ICEgeyBkZy1hZGRpdGlvbmFsLW9wdGlvbnMgIi1mb2ZmbG9hZD0tZm9wdC1pbmZvLW5vdGUt b21wIiB9CkBAIC00NCw2ICs0NywxMyBAQCBwcm9ncmFtIG1haW4KICAgaW50ZWdlciA6OiB2 ZWN0b3JzX2FjdHVhbAogICBpbnRlZ2VyIDo6IGksIGosIGsKIAorCisjaWZkZWYgRVhQRU5T SVZFCisgIGludGVnZXIsIHBhcmFtZXRlciA6OiBOID0gMTAwCisjZWxzZQorICBpbnRlZ2Vy LCBwYXJhbWV0ZXIgOjogTiA9IDUwCisjZW5kaWYKKwogICBjYWxsIGFjY19pbml0IChhY2Nf ZGV2aWNlX2RlZmF1bHQpCiAKICAgISBPcGVuQUNDIHBhcmFsbGVsIGNvbnN0cnVjdC4KQEAg LTY5LDcgKzc5LDcgQEAgcHJvZ3JhbSBtYWluCiAgICEkYWNjIHNlcmlhbCAmCiAgICEkYWNj ICAgcmVkdWN0aW9uIChtaW46IGdhbmdzX21pbiwgd29ya2Vyc19taW4sIHZlY3RvcnNfbWlu KSByZWR1Y3Rpb24gKG1heDogZ2FuZ3NfbWF4LCB3b3JrZXJzX21heCwgdmVjdG9yc19tYXgp ICEgeyBkZy13YXJuaW5nICJ1c2luZyAudmVjdG9yX2xlbmd0aCBcXCgzMlxcKS4sIGlnbm9y aW5nIDEiICIiIHsgdGFyZ2V0IG9wZW5hY2NfbnZpZGlhX2FjY2VsX3NlbGVjdGVkIH0gfQog ICAhIHsgZGctbm90ZSB7dmFyaWFibGUgJ0RcLlswLTldKycgZGVjbGFyZWQgaW4gYmxvY2sg aXNuJ3QgY2FuZGlkYXRlIGZvciBhZGp1c3RpbmcgT3BlbkFDQyBwcml2YXRpemF0aW9uIGxl dmVsOiBub3QgYWRkcmVzc2FibGV9ICIiIHsgdGFyZ2V0ICotKi0qIH0gLi0xIH0KLSAgZG8g aSA9IDEwMCwgLTk5LCAtMQorICBkbyBpID0gTiwgLShOLTEpLCAtMQogICAgICBnYW5nc19t aW4gPSBhY2NfZ2FuZyAoKTsKICAgICAgZ2FuZ3NfbWF4ID0gYWNjX2dhbmcgKCk7CiAgICAg IHdvcmtlcnNfbWluID0gYWNjX3dvcmtlciAoKTsKQEAgLTEwOCwxNCArMTE4LDE0IEBAIHBy b2dyYW0gbWFpbgogICBlbmQgaWYKICAgISRhY2MgbG9vcCBnYW5nIHJlZHVjdGlvbiAobWlu OiBnYW5nc19taW4sIHdvcmtlcnNfbWluLCB2ZWN0b3JzX21pbikgcmVkdWN0aW9uIChtYXg6 IGdhbmdzX21heCwgd29ya2Vyc19tYXgsIHZlY3RvcnNfbWF4KQogICAhIHsgZGctbm90ZSB7 dmFyaWFibGUgJ2knIGluICdwcml2YXRlJyBjbGF1c2UgaXNuJ3QgY2FuZGlkYXRlIGZvciBh ZGp1c3RpbmcgT3BlbkFDQyBwcml2YXRpemF0aW9uIGxldmVsOiBub3QgYWRkcmVzc2FibGV9 ICIiIHsgdGFyZ2V0ICotKi0qIH0gLi0xIH0KLSAgZG8gaSA9IDEwMCwgLTk5LCAtMQorICBk byBpID0gTiwgLShOLTEpLCAtMQogICAgICAhJGFjYyBsb29wIHdvcmtlciByZWR1Y3Rpb24g KG1pbjogZ2FuZ3NfbWluLCB3b3JrZXJzX21pbiwgdmVjdG9yc19taW4pIHJlZHVjdGlvbiAo bWF4OiBnYW5nc19tYXgsIHdvcmtlcnNfbWF4LCB2ZWN0b3JzX21heCkKICAgICAgISB7IGRn LW5vdGUge3ZhcmlhYmxlICdqJyBpbiAncHJpdmF0ZScgY2xhdXNlIGlzbid0IGNhbmRpZGF0 ZSBmb3IgYWRqdXN0aW5nIE9wZW5BQ0MgcHJpdmF0aXphdGlvbiBsZXZlbDogbm90IGFkZHJl c3NhYmxlfSAiIiB7IHRhcmdldCAqLSotKiB9IC4tMSB9CiAgICAgICEgeyBkZy1ub3RlIHt2 YXJpYWJsZSAnRFwuWzAtOV0rJyBkZWNsYXJlZCBpbiBibG9jayBpc24ndCBjYW5kaWRhdGUg Zm9yIGFkanVzdGluZyBPcGVuQUNDIHByaXZhdGl6YXRpb24gbGV2ZWw6IG5vdCBhZGRyZXNz YWJsZX0gIiIgeyB0YXJnZXQgKi0qLSogfSAuLTIgfQotICAgICBkbyBqID0gMTAwLCAtOTks IC0xCisgICAgIGRvIGogPSBOLCAtKE4tMSksIC0xCiAgICAgICAgICEkYWNjIGxvb3AgdmVj dG9yIHJlZHVjdGlvbiAobWluOiBnYW5nc19taW4sIHdvcmtlcnNfbWluLCB2ZWN0b3JzX21p bikgcmVkdWN0aW9uIChtYXg6IGdhbmdzX21heCwgd29ya2Vyc19tYXgsIHZlY3RvcnNfbWF4 KQogICAgICAgICAhIHsgZGctbm90ZSB7dmFyaWFibGUgJ2snIGluICdwcml2YXRlJyBjbGF1 c2UgaXNuJ3QgY2FuZGlkYXRlIGZvciBhZGp1c3RpbmcgT3BlbkFDQyBwcml2YXRpemF0aW9u IGxldmVsOiBub3QgYWRkcmVzc2FibGV9ICIiIHsgdGFyZ2V0ICotKi0qIH0gLi0xIH0KLSAg ICAgICAgZG8gayA9IDEwMCAqIHZlY3RvcnNfYWN0dWFsLCAtOTkgKiB2ZWN0b3JzX2FjdHVh bCwgLTEKKyAgICAgICAgZG8gayA9IE4gKiB2ZWN0b3JzX2FjdHVhbCwgLShOLTEpICogdmVj dG9yc19hY3R1YWwsIC0xCiAgICAgICAgICAgIGdhbmdzX21pbiA9IGFjY19nYW5nICgpOwog ICAgICAgICAgICBnYW5nc19tYXggPSBhY2NfZ2FuZyAoKTsKICAgICAgICAgICAgd29ya2Vy c19taW4gPSBhY2Nfd29ya2VyICgpOwo= --------------3OIAQv6R5S7o0COjx1owwrUE--