From: Ian Jackson Subject: [OSSTEST PATCH 34/62] TestSupport: Move `stashed files' and `next_unique_name' earlier Date: Wed, 10 Apr 2019 15:23:40 +0100 Message-ID: <20190410142408.22848-35-ian.jackson@eu.citrix.com> References: <20190410142408.22848-1-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hEEAN-0006X8-EE for xen-devel@lists.xenproject.org; Wed, 10 Apr 2019 14:25:31 +0000 In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org V2UgYXJlIGdvaW5nIHRvIG1ha2UgbW9yZSB1c2Ugb2YgdGhpcyBpbiBpbnRlcnZlbmluZyBjb2Rl LgoKUHVyZSBjb2RlIG1vdGlvbi4KClNpZ25lZC1vZmYtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgotLS0KIE9zc3Rlc3QvVGVzdFN1cHBvcnQucG0gfCA3OCArKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL09z c3Rlc3QvVGVzdFN1cHBvcnQucG0gYi9Pc3N0ZXN0L1Rlc3RTdXBwb3J0LnBtCmluZGV4IDQxZjZm NWY4Li5jZTM0NjA5NyAxMDA2NDQKLS0tIGEvT3NzdGVzdC9UZXN0U3VwcG9ydC5wbQorKysgYi9P c3N0ZXN0L1Rlc3RTdXBwb3J0LnBtCkBAIC0zMDAsNiArMzAwLDQ1IEBAIHN1YiBnZXRfZmlsZWNv bnRlbnRzICgkOyQpIHsKICAgICByZXR1cm4gJGRhdGE7CiB9CiAKKyMtLS0tLS0tLS0tIHN0YXNo ZWQgZmlsZXMgLS0tLS0tLS0tLQorCitzdWIgbmV4dF91bmlxdWVfbmFtZSAoJCkgeworICAgIG15 ICgkZm5yZWYpID0gQF87CisgICAgbXkgJG51bSA9ICQkZm5yZWYgPX4gcy9cKyhbMS05XVxkKikk Ly8gPyAkMSA6IDA7CisgICAgJCRmbnJlZiAuPSAnKycuKCRudW0rMSk7Cit9CisKK3N1YiBvcGVu X3VuaXF1ZV9zdGFzaGZpbGUgKCQpIHsKKyAgICBteSAoJGxlYWZyZWYpID0gQF87CisgICAgbXkg JGRoOworICAgIGZvciAoOzspIHsKKyAgICAgICAgbXkgJGRmPSAkJGxlYWZyZWY7CisgICAgICAg ICRkaD0gbmV3IElPOjpGaWxlICIkc3Rhc2gvJGRmIiwgT19SRFdSfE9fRVhDTHxPX0NSRUFUOwor ICAgICAgICBsYXN0IGlmICRkaDsKKyAgICAgICAgZGllICIkZGYgJCEiIHVubGVzcyAkIT09JkVF WElTVDsKKyAgICAgICAgbmV4dF91bmlxdWVfbmFtZSAkbGVhZnJlZjsKKyAgICB9CisgICAgcmV0 dXJuICRkaDsKK30KKworc3ViIGdldF9zdGFzaGVkICgkJCkgeworICAgIG15ICgkcGFyYW0sICRv dGhlcmZsaWdodGpvYikgPSBAXzsgCisgICAgIyBtYXkgYmUgcnVuIG91dHNpZGUgdHJhbnNhY3Rp b24sIG9yIHdpdGggZmxpZ2h0cyBsb2NrZWQKKyAgICBteSAoJG9mbGlnaHQsICRvam9iKSA9IG90 aGVyZmxpZ2h0am9iKCRvdGhlcmZsaWdodGpvYik7CisgICAgbXkgJHBhdGg9IGdldF9ydW52YXIo JHBhcmFtLCAkb3RoZXJmbGlnaHRqb2IpOworICAgIGRpZSAiJHBhdGggJCYgIiBpZgorICAgICAg ICAkcGF0aCA9fiBtLFteLSsuXzAtOWEtekEtWi9dLCBvcgorICAgICAgICAkcGF0aCA9fiBtL1wu XC4vOworICAgIHJldHVybiAiJGN7U3Rhc2h9LyRvZmxpZ2h0LyRvam9iLyRwYXRoIjsKK30KKwor c3ViIGNvbXByZXNzX3N0YXNoZWQoJCkgeworICAgIG15ICgkcGF0aCkgPSBAXzsKKyAgICByZXR1 cm4gdW5sZXNzIC1lICIkc3Rhc2gvJHBhdGgiOworICAgIG15ICRyPSBzeXN0ZW0gJ2d6aXAnLCct OXZmJywnLS0nLCIkc3Rhc2gvJHBhdGgiOworICAgIGRpZSAiJHIgJCEiIGlmICRyOworfQorCiAj LS0tLS0tLS0tLSBydW52YXJzIC0tLS0tLS0tLS0KIAogc3ViIHN0b3JlX3J1bnZhciAoJCQpIHsK QEAgLTU5NywxMiArNjM2LDYgQEAgc3ViIHRhcmdldF9maWxlX2V4aXN0cyAoJCQpIHsKICAgICBk aWUgIiRyZmlsZSAkb3V0ID8iOwogfQogCi1zdWIgbmV4dF91bmlxdWVfbmFtZSAoJCkgewotICAg IG15ICgkZm5yZWYpID0gQF87Ci0gICAgbXkgJG51bSA9ICQkZm5yZWYgPX4gcy9cKyhbMS05XVxk KikkLy8gPyAkMSA6IDA7Ci0gICAgJCRmbnJlZiAuPSAnKycuKCRudW0rMSk7Ci19Ci0KIG91ciAk dGFyZ2V0X2VkaXRmaWxlX2NhbmNlbF9leGNlcHRpb24gPQogICAgIGJsZXNzIHsgfSwgJ09zc3Rl c3Q6OlRlc3RTdXBwb3J0OjpUYXJnZXRFZGl0ZmlsZUNhbmNlbEV4Y2VwdGlvbic7CiAKQEAgLTEz NjksMzkgKzE0MDIsNiBAQCBzdWIgaG9zdG5hbWVwYXRoICgkKSB7CiAgICAgam9pbiAnXycsIHJl dmVyc2UgQGw7CiB9CiAKLSMtLS0tLS0tLS0tIHN0YXNoZWQgZmlsZXMgLS0tLS0tLS0tLQotCi1z dWIgb3Blbl91bmlxdWVfc3Rhc2hmaWxlICgkKSB7Ci0gICAgbXkgKCRsZWFmcmVmKSA9IEBfOwot ICAgIG15ICRkaDsKLSAgICBmb3IgKDs7KSB7Ci0gICAgICAgIG15ICRkZj0gJCRsZWFmcmVmOwot ICAgICAgICAkZGg9IG5ldyBJTzo6RmlsZSAiJHN0YXNoLyRkZiIsIE9fUkRXUnxPX0VYQ0x8T19D UkVBVDsKLSAgICAgICAgbGFzdCBpZiAkZGg7Ci0gICAgICAgIGRpZSAiJGRmICQhIiB1bmxlc3Mg JCE9PSZFRVhJU1Q7Ci0gICAgICAgIG5leHRfdW5pcXVlX25hbWUgJGxlYWZyZWY7Ci0gICAgfQot ICAgIHJldHVybiAkZGg7Ci19Ci0KLXN1YiBnZXRfc3Rhc2hlZCAoJCQpIHsKLSAgICBteSAoJHBh cmFtLCAkb3RoZXJmbGlnaHRqb2IpID0gQF87IAotICAgICMgbWF5IGJlIHJ1biBvdXRzaWRlIHRy YW5zYWN0aW9uLCBvciB3aXRoIGZsaWdodHMgbG9ja2VkCi0gICAgbXkgKCRvZmxpZ2h0LCAkb2pv YikgPSBvdGhlcmZsaWdodGpvYigkb3RoZXJmbGlnaHRqb2IpOwotICAgIG15ICRwYXRoPSBnZXRf cnVudmFyKCRwYXJhbSwgJG90aGVyZmxpZ2h0am9iKTsKLSAgICBkaWUgIiRwYXRoICQmICIgaWYK LSAgICAgICAgJHBhdGggPX4gbSxbXi0rLl8wLTlhLXpBLVovXSwgb3IKLSAgICAgICAgJHBhdGgg PX4gbS9cLlwuLzsKLSAgICByZXR1cm4gIiRje1N0YXNofS8kb2ZsaWdodC8kb2pvYi8kcGF0aCI7 Ci19Ci0KLXN1YiBjb21wcmVzc19zdGFzaGVkKCQpIHsKLSAgICBteSAoJHBhdGgpID0gQF87Ci0g ICAgcmV0dXJuIHVubGVzcyAtZSAiJHN0YXNoLyRwYXRoIjsKLSAgICBteSAkcj0gc3lzdGVtICdn emlwJywnLTl2ZicsJy0tJywiJHN0YXNoLyRwYXRoIjsKLSAgICBkaWUgIiRyICQhIiBpZiAkcjsK LX0KLQogIy0tLS0tLS0tLS0gb3RoZXIgc3R1ZmYgLS0tLS0tLS0tLQogCiBzdWIgY29tbW9uX3Rv b2xzdGFjayAoJCkgewotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3Rp bmZvL3hlbi1kZXZlbA==