81028 2012-03-13 13:20:42 -0700 nrwt: run with no args on lion, is putting baselines in platform/mac-lion, not platform/mac 2012-03-14 11:53:45 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth adele ap darin eric ggaren jberlin mjs mrowe ojan sam thorton oldest_to_newest 577730 0 dpranke 2012-03-13 13:20:42 -0700 mac-lion shouldn't be automatically used for baselines until Mountain Lion ships and the apple guys decide that 'mac' == 'mountain lion'. platform/mac-lion should be included in the search path for baseline retrieval, but we should only be able to put new baselines there by hand (explicitly moving them from platform/mac by those who know if the baseline is different between Lion and Mountain Lion. 577733 1 dpranke 2012-03-13 13:21:56 -0700 Looks like we broke this either in r92882 or r105951. 577742 2 ap 2012-03-13 13:26:43 -0700 We do not intend to put any results in mac-lion by hand until Mountain Lion ships. 577909 3 dpranke 2012-03-13 15:42:49 -0700 (In reply to comment #2) > We do not intend to put any results in mac-lion by hand until Mountain Lion ships. Does that mean that you don't need there to be a mac-lion directory at all? 577929 4 dpranke 2012-03-13 15:49:58 -0700 The last time I discussed this (w/ Darin, I believe), I thought there was a need for apple employees to be able to distinguish between 'mac-future' and 'mac-lion' for some period of time prior to Mountain Lion actually shipping (technically, it was Lion at the time). It may have been that the only thing in mac-lion should be a Skipped file? I think the most recent discussion of this was in https://bugs.webkit.org/show_bug.cgi?id=72748 . cf. also http://trac.webkit.org/wiki/LayoutTestsSearchPath ... If there will not be any baselines in mac-lion until ML ships, that simplifies the code slightly (mac-lion doesn't need to be in the baseline path for reads or writes, not just writes), which is why I am asking ... 578023 5 131757 dpranke 2012-03-13 17:17:47 -0700 Created attachment 131757 Patch 578028 6 dpranke 2012-03-13 17:23:14 -0700 ap, darin: note the tests in test_skipped_file_search_paths() and test_baseline_search_path() and make sure that they are what you'd like the behavior to be (hopefully the tests are close enough to english that their intent will be clear). If they aren't, let me know and I'll be happy to change them. In English, my expectations are: by default, on lion (platform mac-lion), we will look for baselines in mac-lion and then mac, but write new baselines into mac 'mac-future' will only read from 'mac' and will write to 'mac'. Nothing should ever be written to 'platform/mac-future'. There is no 'platform/mac-future/Skipped', and there are no baselines. 578044 7 ap 2012-03-13 17:34:33 -0700 > In English, my expectations are: > > by default, on lion (platform mac-lion), we will look for baselines in mac-lion and then mac, but write new baselines into mac This looks right to me. > 'mac-future' will only read from 'mac' and will write to 'mac'. > > Nothing should ever be written to 'platform/mac-future'. There is no 'platform/mac-future/Skipped', and there are no baselines. I don't know what mac-future platform is needed for, but this behavior sounds safe. 578055 8 131757 mrowe 2012-03-13 17:43:59 -0700 Comment on attachment 131757 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131757&action=review > Tools/Scripts/webkitpy/layout_tests/port/mac.py:56 > + if self.name() == 'mac-lion': > + # mac-lion should normally write baselines into platform/mac until Mountain Lion ships. > + # It can still read baselines from platform/mac-lion, though. Can we avoid hard-coding Lion / Mountain Lion in here? This will always be the case for the currently-shipping version of the OS. 578070 9 dpranke 2012-03-13 18:15:58 -0700 (In reply to comment #8) > (From update of attachment 131757 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=131757&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/mac.py:56 > > + if self.name() == 'mac-lion': > > + # mac-lion should normally write baselines into platform/mac until Mountain Lion ships. > > + # It can still read baselines from platform/mac-lion, though. > > Can we avoid hard-coding Lion / Mountain Lion in here? This will always be the case for the currently-shipping version of the OS. I can certainly delete the "Mountain Lion" reference, and rework this so that we have a mac.CURRENT_VERSION='lion' or something - is that what you were suggesting? Or were you suggesting that somehow I attempt to figure out what "the currently shipping version of the OS" is dynamically? I don't know how I'd do that. 578072 10 dpranke 2012-03-13 18:18:10 -0700 (In reply to comment #7) > > In English, my expectations are: > > > > by default, on lion (platform mac-lion), we will look for baselines in mac-lion and then mac, but write new baselines into mac > > This looks right to me. > > > 'mac-future' will only read from 'mac' and will write to 'mac'. > > > > Nothing should ever be written to 'platform/mac-future'. There is no 'platform/mac-future/Skipped', and there are no baselines. > > I don't know what mac-future platform is needed for, but this behavior sounds safe. 'mac-future' as a name/concept is needed for you guys to be able to run on unreleased versions of the operating system and have that get handled properly (distinguishing it from the currently shipping version). There isn't supposed to be a directory -- there is one currently checked in, but that's the result of a bug. Partially I am looking to confirm that the unreleased version of the OS doesn't need a Skipped file (at least not one that's checked into webkit). 578073 11 mrowe 2012-03-13 18:19:12 -0700 (In reply to comment #10) > Partially I am looking to confirm that the unreleased version of the OS doesn't need a Skipped file (at least not one that's checked into webkit). That's correct. 578074 12 mrowe 2012-03-13 18:20:44 -0700 (In reply to comment #9) > > Or were you suggesting that somehow I attempt to figure out what "the currently shipping version of the OS" is dynamically? I don't know how I'd do that. MacPort has a list of OS X versions in order of release. It seems relatively easy to derive the desired information from there. 578075 13 dpranke 2012-03-13 18:22:50 -0700 (In reply to comment #12) > (In reply to comment #9) > > > > Or were you suggesting that somehow I attempt to figure out what "the currently shipping version of the OS" is dynamically? I don't know how I'd do that. > > MacPort has a list of OS X versions in order of release. It seems relatively easy to derive the desired information from there. Sure, that works as well. 578102 14 131771 dpranke 2012-03-13 18:59:52 -0700 Created attachment 131771 don't hardcode mac-lion 578611 15 dpranke 2012-03-14 11:53:45 -0700 Committed r110722: <http://trac.webkit.org/changeset/110722> 131757 2012-03-13 17:17:47 -0700 2012-03-13 18:59:35 -0700 Patch bug-81028-20120313171745.patch text/plain 8455 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDEzOGE4MjI2MDFkN2Y3NGE0NmZmZTkxMTZkYmNhNDAw MDU0NWMzMy4uMzA3OTRiODlhZDI2OGU3MzNiNjVhZmNmODE3YmQ0ZGRmMDc4Y2NmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAzLTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IHJ1biB3aXRoIG5vIGFyZ3Mgb24gbGlvbiwgaXMgcHV0dGluZyBiYXNlbGlu ZXMgaW4gcGxhdGZvcm0vbWFjLWxpb24sIG5vdCBwbGF0Zm9ybS9tYWMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMDI4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG1hYyBwb3J0IGhhZCBpbmNvcnJl Y3QgbG9va3VwcyBmb3IgJ21hYy1saW9uJyBhbmQKKyAgICAgICAgJ21hYy1mdXR1cmUnIGluIHNv bWUgcGxhY2VzLiBUaGlzIHBhdGNoIGZpeGVzIHRoYXQgYW5kIGFkZHMgYQorICAgICAgICBidW5j aCBvZiB0ZXN0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbWFjLnB5OgorICAgICAgICAoTWFjUG9ydC5iYXNlbGluZV9wYXRoKToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weToKKyAgICAg ICAgKE1hY1Rlc3QuYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMpOgorICAgICAgICAo TWFjVGVzdC50ZXN0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMpOgorICAgICAgICAoX2Fzc2Vy dF9zZWFyY2hfcGF0aCk6CisgICAgICAgICh0ZXN0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weToKKyAg ICAgICAgKFdlYktpdFBvcnQuX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMpOgorCiAyMDEyLTAz LTEzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmViYXNlbGlu aW5nIGZvciBhIG5ldyBwb3J0IGRvZXNuJ3Qgd29yayByaWdodCB3aXRoIG11bHRpcGxlIGZhbGxi YWNrIHBvcnRzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hYy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv bWFjLnB5CmluZGV4IDgyOWI4OTZmYTQ4YjNjNDk4YzQxMDRmNDkzZGE5NmVkNzJhMDc5NzAuLjM1 Yzg4NTRhN2IxZjQzNWJlNWRmOTZmZjkzM2NhYzc0YzE0MzVmN2MgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CkBAIC01MCw2ICs1MCwxNSBA QCBjbGFzcyBNYWNQb3J0KEFwcGxlUG9ydCk6CiAgICAgICAgICAgICAjIHdpdGggTWFsbG9jU3Rh Y2tMb2dnaW5nIGVuYWJsZWQuCiAgICAgICAgICAgICBzZWxmLnNldF9vcHRpb25fZGVmYXVsdCgi YmF0Y2hfc2l6ZSIsIDEwMDApCiAKKyAgICBkZWYgYmFzZWxpbmVfcGF0aChzZWxmKToKKyAgICAg ICAgaWYgc2VsZi5uYW1lKCkgPT0gJ21hYy1saW9uJzoKKyAgICAgICAgICAgICMgbWFjLWxpb24g c2hvdWxkIG5vcm1hbGx5IHdyaXRlIGJhc2VsaW5lcyBpbnRvIHBsYXRmb3JtL21hYyB1bnRpbCBN b3VudGFpbiBMaW9uIHNoaXBzLgorICAgICAgICAgICAgIyBJdCBjYW4gc3RpbGwgcmVhZCBiYXNl bGluZXMgZnJvbSBwbGF0Zm9ybS9tYWMtbGlvbiwgdGhvdWdoLgorICAgICAgICAgICAgaWYgc2Vs Zi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAgICAgICByZXR1 cm4gc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ21hYy13azInKQorICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdtYWMnKQorICAgICAgICByZXR1cm4gQXBw bGVQb3J0LmJhc2VsaW5lX3BhdGgoc2VsZikKKwogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0 aChzZWxmKToKICAgICAgICAgZmFsbGJhY2tfaW5kZXggPSBzZWxmLlZFUlNJT05fRkFMTEJBQ0tf T1JERVIuaW5kZXgoc2VsZi5fcG9ydF9uYW1lX3dpdGhfdmVyc2lvbigpKQogICAgICAgICBmYWxs YmFja19uYW1lcyA9IGxpc3Qoc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVSW2ZhbGxiYWNrX2lu ZGV4Ol0pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L21hY191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvbWFjX3VuaXR0ZXN0LnB5CmluZGV4IDM1ZTY0ZTQ5ZjVlYmEwNGZmYmZkZTIwNzUwOThl ZmM0OTQzYjczYzIuLmYwM2NlMjAyZTA3NTNjODQ4NjhiNWM5ZTNlMTliNWJiZTAwODEwM2MgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv bWFjX3VuaXR0ZXN0LnB5CkBAIC00MSwxNSArNDEsMjMgQEAgY2xhc3MgTWFjVGVzdChwb3J0X3Rl c3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgcG9ydF9uYW1lID0gJ21hYy1sZW9wYXJkJwogICAg IHBvcnRfbWFrZXIgPSBNYWNQb3J0CiAKLSAgICBkZWYgYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFy Y2hfcGF0aHMoc2VsZiwgcG9ydF9uYW1lLCBleHBlY3RlZF9wYXRocyk6Ci0gICAgICAgIHBvcnQg PSBzZWxmLm1ha2VfcG9ydChwb3J0X25hbWU9cG9ydF9uYW1lKQorICAgIGRlZiBhc3NlcnRfc2tp cHBlZF9maWxlX3NlYXJjaF9wYXRocyhzZWxmLCBwb3J0X25hbWUsIGV4cGVjdGVkX3BhdGhzLCB1 c2Vfd2Via2l0Mj1GYWxzZSk6CisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0X25h bWU9cG9ydF9uYW1lLCBvcHRpb25zPU1vY2tPcHRpb25zKHdlYmtpdF90ZXN0X3J1bm5lcj11c2Vf d2Via2l0MikpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5fc2tpcHBlZF9maWxlX3Nl YXJjaF9wYXRocygpLCBleHBlY3RlZF9wYXRocykKIAogICAgIGRlZiB0ZXN0X3NraXBwZWRfZmls ZV9zZWFyY2hfcGF0aHMoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0X3NraXBwZWRfZmlsZV9z ZWFyY2hfcGF0aHMoJ21hYy1zbm93bGVvcGFyZCcsIHNldChbJ21hYy1zbm93bGVvcGFyZCcsICdt YWMnXSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoJ21h Yy1sZW9wYXJkJywgc2V0KFsnbWFjLWxlb3BhcmQnLCAnbWFjJ10pKQotICAgICAgICAjIFdlIGNh bm5vdCB0ZXN0IGp1c3QgIm1hYyIgaGVyZSBhcyB0aGUgTWFjUG9ydCBjb25zdHJ1Y3RvciBhdXRv bWF0aWNhbGx5IGZpbGxzIGluIHRoZSB2ZXJzaW9uIGZyb20gdGhlIHJ1bm5pbmcgT1MuCi0gICAg ICAgICMgc2VsZi5hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygnbWFjJywgWydtYWMn XSkKKyAgICAgICAgc2VsZi5hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygnbWFjLWxp b24nLCBzZXQoWydtYWMtbGlvbicsICdtYWMnXSkpCisKKyAgICAgICAgIyBGSVhNRTogU2hvdWxk IHRoZXJlIGJlIGEgcGxhdGZvcm0vbWFjLWZ1dHVyZS9Ta2lwcGVkPworICAgICAgICBzZWxmLmFz c2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKCdtYWMtZnV0dXJlJywgc2V0KFsnbWFjJ10p KQorCisgICAgICAgIHNlbGYuYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoJ21hYy1z bm93bGVvcGFyZCcsIHNldChbJ21hYy1zbm93bGVvcGFyZCcsICdtYWMnLCAnbWFjLXdrMicsICd3 azInXSksIHVzZV93ZWJraXQyPVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0X3NraXBwZWRfZmls ZV9zZWFyY2hfcGF0aHMoJ21hYy1sZW9wYXJkJywgc2V0KFsnbWFjLWxlb3BhcmQnLCAnbWFjJywg J21hYy13azInLCAnd2syJ10pLCB1c2Vfd2Via2l0Mj1UcnVlKQorICAgICAgICBzZWxmLmFzc2Vy dF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKCdtYWMtbGlvbicsIHNldChbJ21hYy1saW9uJywg J21hYycsICdtYWMtd2syJywgJ3drMiddKSwgdXNlX3dlYmtpdDI9VHJ1ZSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygnbWFjLWZ1dHVyZScsIHNldChbJ21h YycsICdtYWMtd2syJywgJ3drMiddKSwgdXNlX3dlYmtpdDI9VHJ1ZSkKKwogCiAKICAgICBleGFt cGxlX3NraXBwZWRfZmlsZSA9IHUiIiIKQEAgLTEzOSwyMyArMTQ3LDI0IEBAIGphdmEvCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGVudlsnTWFsbG9jU3RhY2tMb2dnaW5nJ10sICcxJykKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZW52WydEWUxEX0lOU0VSVF9MSUJSQVJJRVMnXSwgJy91 c3IvbGliL2xpYmdtYWxsb2MuZHlsaWInKQogCi0gICAgZGVmIF9hc3NlcnRfc2VhcmNoX3BhdGgo c2VsZiwgc2VhcmNoX3BhdGhzLCB2ZXJzaW9uLCB1c2Vfd2Via2l0Mj1GYWxzZSk6Ci0gICAgICAg ICMgRklYTUU6IFBvcnQgY29uc3RydWN0b3JzIHNob3VsZCBub3QgInBhcnNlIiB0aGUgcG9ydCBu YW1lLCBidXQKLSAgICAgICAgIyByYXRoZXIgYmUgcGFzc2VkIGNvbXBvbmVudHMgKGRpcmVjdGx5 IG9yIHZpYSBzZXR0ZXJzKS4gIE9uY2UKLSAgICAgICAgIyB3ZSBmaXggdGhhdCwgdGhpcyBtZXRo b2Qgd2lsbCBuZWVkIGEgcmUtd3JpdGUuCi0gICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChw b3J0X25hbWU9J21hYy0lcycgJSB2ZXJzaW9uLCBvcHRpb25zPU1vY2tPcHRpb25zKHdlYmtpdF90 ZXN0X3J1bm5lcj11c2Vfd2Via2l0MikpCisgICAgZGVmIF9hc3NlcnRfc2VhcmNoX3BhdGgoc2Vs ZiwgcG9ydF9uYW1lLCBiYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMsIHVzZV93ZWJraXQyPUZh bHNlKToKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT1wb3J0X25hbWUs IG9wdGlvbnM9TW9ja09wdGlvbnMod2Via2l0X3Rlc3RfcnVubmVyPXVzZV93ZWJraXQyKSkKICAg ICAgICAgYWJzb2x1dGVfc2VhcmNoX3BhdGhzID0gbWFwKHBvcnQuX3dlYmtpdF9iYXNlbGluZV9w YXRoLCBzZWFyY2hfcGF0aHMpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFzZWxp bmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aChiYXNlbGluZV9wYXRoKSkKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpLCBhYnNv bHV0ZV9zZWFyY2hfcGF0aHMpCiAKICAgICBkZWYgdGVzdF9iYXNlbGluZV9zZWFyY2hfcGF0aChz ZWxmKToKLSAgICAgICAgIyBGSVhNRTogSXMgdGhpcyByZWFsbHkgcmlnaHQ/ICBTaG91bGQgbWFj LWxlb3BhcmQgZmFsbGJhY2sgdG8gbWFjLXNub3dsZW9wYXJkPwotICAgICAgICBzZWxmLl9hc3Nl cnRfc2VhcmNoX3BhdGgoWydtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFjLWxp b24nLCAnbWFjJ10sICdsZW9wYXJkJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRo KFsnbWFjLXNub3dsZW9wYXJkJywgJ21hYy1saW9uJywgJ21hYyddLCAnc25vd2xlb3BhcmQnKQot ICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydtYWMtbGlvbicsICdtYWMnXSwgJ2xp b24nKQotCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ21hYy13azInLCAnbWFj LWxlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJywgJ21hYy1saW9uJywgJ21hYyddLCAnbGVvcGFy ZCcsIHVzZV93ZWJraXQyPVRydWUpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J21hYy13azInLCAnbWFjLXNub3dsZW9wYXJkJywgJ21hYy1saW9uJywgJ21hYyddLCAnc25vd2xl b3BhcmQnLCB1c2Vfd2Via2l0Mj1UcnVlKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3Bh dGgoWydtYWMtd2syJywgJ21hYy1saW9uJywgJ21hYyddLCAnbGlvbicsIHVzZV93ZWJraXQyPVRy dWUpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLWxlb3BhcmQnLCAnbWFj LWxlb3BhcmQnLCBbJ21hYy1sZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcsICdtYWMtbGlvbics ICdtYWMnXSkKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKCdtYWMtc25vd2xlb3Bh cmQnLCAnbWFjLXNub3dsZW9wYXJkJywgWydtYWMtc25vd2xlb3BhcmQnLCAnbWFjLWxpb24nLCAn bWFjJ10pCisKKyAgICAgICAgIyBOb3RlIHRoYXQgbWFjLWxpb24gd3JpdGVzIGJhc2VsaW5lcyBp bnRvIG1hYywgbm90IG1hYy1saW9uIQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgo J21hYy1saW9uJywgJ21hYycsIFsnbWFjLWxpb24nLCAnbWFjJ10pCisgICAgICAgIHNlbGYuX2Fz c2VydF9zZWFyY2hfcGF0aCgnbWFjLWZ1dHVyZScsICdtYWMnLCBbJ21hYyddKQorCisgICAgICAg IHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLWxlb3BhcmQnLCAnbWFjLXdrMicsIFsnbWFj LXdrMicsICdtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFjLWxpb24nLCAnbWFj J10sIHVzZV93ZWJraXQyPVRydWUpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgn bWFjLXNub3dsZW9wYXJkJywgJ21hYy13azInLCBbJ21hYy13azInLCAnbWFjLXNub3dsZW9wYXJk JywgJ21hYy1saW9uJywgJ21hYyddLCB1c2Vfd2Via2l0Mj1UcnVlKQorICAgICAgICBzZWxmLl9h c3NlcnRfc2VhcmNoX3BhdGgoJ21hYy1saW9uJywgJ21hYy13azInLCBbJ21hYy13azInLCAnbWFj LWxpb24nLCAnbWFjJ10sIHVzZV93ZWJraXQyPVRydWUpCisgICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aCgnbWFjLWZ1dHVyZScsICdtYWMtd2syJywgWydtYWMtd2syJywgJ21hYyddLCB1 c2Vfd2Via2l0Mj1UcnVlKQogCiAgICAgZGVmIHRlc3Rfc2hvd19yZXN1bHRzX2h0bWxfZmlsZShz ZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKaW5kZXggNTZlYjBjNzQ4 NzViMmJhYTIyNTBhNTEyZWMwNDFiNTRhMWI2ZmZhOS4uZDMxNWYwNWNmY2MwNzM0YTc2ZDZlYWI1 MWQwYjYzOTU3Y2JhYzU2ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTMzNSwxMiArMzM1LDkgQEAgY2xhc3MgV2ViS2l0 UG9ydChQb3J0KToKICAgICBkZWYgX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2VsZik6CiAg ICAgICAgICMgVW5saWtlIGJhc2VsaW5lX3NlYXJjaF9wYXRoLCB3ZSBvbmx5IHdhbnQgdG8gc2Vh cmNoIFtXSzItUE9SVCwgUE9SVC1WRVJTSU9OLCBQT1JUXSBub3QgdGhlIGZ1bGwgY2FzYWRlLgog ICAgICAgICAjIE5vdGUgb3JkZXIgZG9lc24ndCBtYXR0ZXIgc2luY2UgdGhlIFNraXBwZWQgZmls ZSBjb250ZW50cyBhcmUgYWxsIGNvbWJpbmVkLgotICAgICAgICAjCi0gICAgICAgICMgRklYTUU6 IEl0J3Mgbm90IGNvcnJlY3QgdG8gYXNzdW1lIHRoYXQgcG9ydCBuYW1lcyBtYXAgZGlyZWN0bHkg dG8KLSAgICAgICAgIyBkaXJlY3RvcnkgbmFtZXMuIEZvciBleGFtcGxlLCBtYWMtZnV0dXJlIGlz IGEgcG9ydCBuYW1lIHRoYXQgZG9lcwotICAgICAgICAjIG5vdCBoYXZlIGEgY29vcmVzcG9uZGlu ZyBkaXJlY3RvcnkuIFRoZSBXZWJLaXQyIHBvcnRzIGFyZSBhbm90aGVyCi0gICAgICAgICMgZXhh bXBsZS4KLSAgICAgICAgc2VhcmNoX3BhdGhzID0gc2V0KFtzZWxmLnBvcnRfbmFtZSwgc2VsZi5u YW1lKCldKQorICAgICAgICBzZWFyY2hfcGF0aHMgPSBzZXQoW3NlbGYucG9ydF9uYW1lXSkKKyAg ICAgICAgaWYgJ2Z1dHVyZScgbm90IGluIHNlbGYubmFtZSgpOgorICAgICAgICAgICAgc2VhcmNo X3BhdGhzLmFkZChzZWxmLm5hbWUoKSkKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJr aXRfdGVzdF9ydW5uZXInKToKICAgICAgICAgICAgICMgQmVjYXVzZSBuZWFybHkgYWxsIG9mIHRo ZSBza2lwcGVkIHRlc3RzIGZvciBXZWJLaXQgMiBhcmUgZHVlIHRvIGNyb3NzLXBsYXRmb3JtCiAg ICAgICAgICAgICAjIGlzc3VlcywgYWxsIHdrMiBwb3J0cyBzaGFyZSBhIHNraXBwZWQgbGlzdCB1 bmRlciBwbGF0Zm9ybS93azIuCg== 131771 2012-03-13 18:59:52 -0700 2012-03-13 19:35:30 -0700 don't hardcode mac-lion bug-81028-20120313185951.patch text/plain 8686 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDEzOGE4MjI2MDFkN2Y3NGE0NmZmZTkxMTZkYmNhNDAw MDU0NWMzMy4uMzA3OTRiODlhZDI2OGU3MzNiNjVhZmNmODE3YmQ0ZGRmMDc4Y2NmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAzLTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IHJ1biB3aXRoIG5vIGFyZ3Mgb24gbGlvbiwgaXMgcHV0dGluZyBiYXNlbGlu ZXMgaW4gcGxhdGZvcm0vbWFjLWxpb24sIG5vdCBwbGF0Zm9ybS9tYWMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMDI4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG1hYyBwb3J0IGhhZCBpbmNvcnJl Y3QgbG9va3VwcyBmb3IgJ21hYy1saW9uJyBhbmQKKyAgICAgICAgJ21hYy1mdXR1cmUnIGluIHNv bWUgcGxhY2VzLiBUaGlzIHBhdGNoIGZpeGVzIHRoYXQgYW5kIGFkZHMgYQorICAgICAgICBidW5j aCBvZiB0ZXN0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbWFjLnB5OgorICAgICAgICAoTWFjUG9ydC5iYXNlbGluZV9wYXRoKToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weToKKyAgICAg ICAgKE1hY1Rlc3QuYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMpOgorICAgICAgICAo TWFjVGVzdC50ZXN0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMpOgorICAgICAgICAoX2Fzc2Vy dF9zZWFyY2hfcGF0aCk6CisgICAgICAgICh0ZXN0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weToKKyAg ICAgICAgKFdlYktpdFBvcnQuX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMpOgorCiAyMDEyLTAz LTEzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmViYXNlbGlu aW5nIGZvciBhIG5ldyBwb3J0IGRvZXNuJ3Qgd29yayByaWdodCB3aXRoIG11bHRpcGxlIGZhbGxi YWNrIHBvcnRzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hYy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv bWFjLnB5CmluZGV4IDgyOWI4OTZmYTQ4YjNjNDk4YzQxMDRmNDkzZGE5NmVkNzJhMDc5NzAuLjVh YTk4MjZkMzA5NzA3NzY1ZjJhY2UwNDk4OGE5ZGZjNjk3NTU4NmUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CkBAIC01MCw2ICs1MCwxOCBA QCBjbGFzcyBNYWNQb3J0KEFwcGxlUG9ydCk6CiAgICAgICAgICAgICAjIHdpdGggTWFsbG9jU3Rh Y2tMb2dnaW5nIGVuYWJsZWQuCiAgICAgICAgICAgICBzZWxmLnNldF9vcHRpb25fZGVmYXVsdCgi YmF0Y2hfc2l6ZSIsIDEwMDApCiAKKyAgICBkZWYgX21vc3RfcmVjZW50X3ZlcnNpb24oc2VsZik6 CisgICAgICAgICMgVGhpcyByZXByZXNlbnRzIHRoZSBtb3N0IHJlY2VudGx5LXNoaXBwaW5nIHZl cnNpb24gb2YgdGhlIG9wZXJhdGluZyBzeXN0ZW0uCisgICAgICAgIHJldHVybiBzZWxmLlZFUlNJ T05fRkFMTEJBQ0tfT1JERVJbLTJdCisKKyAgICBkZWYgYmFzZWxpbmVfcGF0aChzZWxmKToKKyAg ICAgICAgaWYgc2VsZi5uYW1lKCkgPT0gc2VsZi5fbW9zdF9yZWNlbnRfdmVyc2lvbigpOgorICAg ICAgICAgICAgIyBCYXNlbGluZXMgZm9yIHRoZSBtb3N0IHJlY2VudGx5IHNoaXBpbmcgdmVyc2lv biBzaG91bGQgZ28gaW50byAnbWFjJywgbm90ICdtYWMtZm9vJy4KKyAgICAgICAgICAgIGlmIHNl bGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdtYWMtd2syJykKKyAgICAgICAgICAgIHJl dHVybiBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgnbWFjJykKKyAgICAgICAgcmV0dXJuIEFw cGxlUG9ydC5iYXNlbGluZV9wYXRoKHNlbGYpCisKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3Bh dGgoc2VsZik6CiAgICAgICAgIGZhbGxiYWNrX2luZGV4ID0gc2VsZi5WRVJTSU9OX0ZBTExCQUNL X09SREVSLmluZGV4KHNlbGYuX3BvcnRfbmFtZV93aXRoX3ZlcnNpb24oKSkKICAgICAgICAgZmFs bGJhY2tfbmFtZXMgPSBsaXN0KHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUltmYWxsYmFja19p bmRleDpdKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tYWNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hY191bml0dGVzdC5weQppbmRleCAzNWU2NGU0OWY1ZWJhMDRmZmJmZGUyMDc1MDk4 ZWZjNDk0M2I3M2MyLi4xYzg1YjQ3YzNkNzBkOTk4MWI1OGUzZTU1MzcyNzVhMTA4YTFmMTkwIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191 bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L21hY191bml0dGVzdC5weQpAQCAtNDEsMTUgKzQxLDIzIEBAIGNsYXNzIE1hY1Rlc3QocG9ydF90 ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgIHBvcnRfbmFtZSA9ICdtYWMtbGVvcGFyZCcKICAg ICBwb3J0X21ha2VyID0gTWFjUG9ydAogCi0gICAgZGVmIGFzc2VydF9za2lwcGVkX2ZpbGVfc2Vh cmNoX3BhdGhzKHNlbGYsIHBvcnRfbmFtZSwgZXhwZWN0ZWRfcGF0aHMpOgotICAgICAgICBwb3J0 ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPXBvcnRfbmFtZSkKKyAgICBkZWYgYXNzZXJ0X3Nr aXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2VsZiwgcG9ydF9uYW1lLCBleHBlY3RlZF9wYXRocywg dXNlX3dlYmtpdDI9RmFsc2UpOgorICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9u YW1lPXBvcnRfbmFtZSwgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9dXNl X3dlYmtpdDIpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuX3NraXBwZWRfZmlsZV9z ZWFyY2hfcGF0aHMoKSwgZXhwZWN0ZWRfcGF0aHMpCiAKICAgICBkZWYgdGVzdF9za2lwcGVkX2Zp bGVfc2VhcmNoX3BhdGhzKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydF9za2lwcGVkX2ZpbGVf c2VhcmNoX3BhdGhzKCdtYWMtc25vd2xlb3BhcmQnLCBzZXQoWydtYWMtc25vd2xlb3BhcmQnLCAn bWFjJ10pKQogICAgICAgICBzZWxmLmFzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKCdt YWMtbGVvcGFyZCcsIHNldChbJ21hYy1sZW9wYXJkJywgJ21hYyddKSkKLSAgICAgICAgIyBXZSBj YW5ub3QgdGVzdCBqdXN0ICJtYWMiIGhlcmUgYXMgdGhlIE1hY1BvcnQgY29uc3RydWN0b3IgYXV0 b21hdGljYWxseSBmaWxscyBpbiB0aGUgdmVyc2lvbiBmcm9tIHRoZSBydW5uaW5nIE9TLgotICAg ICAgICAjIHNlbGYuYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoJ21hYycsIFsnbWFj J10pCisgICAgICAgIHNlbGYuYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoJ21hYy1s aW9uJywgc2V0KFsnbWFjLWxpb24nLCAnbWFjJ10pKQorCisgICAgICAgICMgTm90ZSB0aGF0IHRo ZXJlIGlzIG5vIHBsYXRmb3JtL21hYy1mdXR1cmUvU2tpcHBlZC4KKyAgICAgICAgc2VsZi5hc3Nl cnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygnbWFjLWZ1dHVyZScsIHNldChbJ21hYyddKSkK KworICAgICAgICBzZWxmLmFzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKCdtYWMtc25v d2xlb3BhcmQnLCBzZXQoWydtYWMtc25vd2xlb3BhcmQnLCAnbWFjJywgJ21hYy13azInLCAnd2sy J10pLCB1c2Vfd2Via2l0Mj1UcnVlKQorICAgICAgICBzZWxmLmFzc2VydF9za2lwcGVkX2ZpbGVf c2VhcmNoX3BhdGhzKCdtYWMtbGVvcGFyZCcsIHNldChbJ21hYy1sZW9wYXJkJywgJ21hYycsICdt YWMtd2syJywgJ3drMiddKSwgdXNlX3dlYmtpdDI9VHJ1ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRf c2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygnbWFjLWxpb24nLCBzZXQoWydtYWMtbGlvbicsICdt YWMnLCAnbWFjLXdrMicsICd3azInXSksIHVzZV93ZWJraXQyPVRydWUpCisgICAgICAgIHNlbGYu YXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoJ21hYy1mdXR1cmUnLCBzZXQoWydtYWMn LCAnbWFjLXdrMicsICd3azInXSksIHVzZV93ZWJraXQyPVRydWUpCisKIAogCiAgICAgZXhhbXBs ZV9za2lwcGVkX2ZpbGUgPSB1IiIiCkBAIC0xMzksMjMgKzE0NywyNiBAQCBqYXZhLwogICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhlbnZbJ01hbGxvY1N0YWNrTG9nZ2luZyddLCAnMScpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGVudlsnRFlMRF9JTlNFUlRfTElCUkFSSUVTJ10sICcvdXNy L2xpYi9saWJnbWFsbG9jLmR5bGliJykKIAotICAgIGRlZiBfYXNzZXJ0X3NlYXJjaF9wYXRoKHNl bGYsIHNlYXJjaF9wYXRocywgdmVyc2lvbiwgdXNlX3dlYmtpdDI9RmFsc2UpOgotICAgICAgICAj IEZJWE1FOiBQb3J0IGNvbnN0cnVjdG9ycyBzaG91bGQgbm90ICJwYXJzZSIgdGhlIHBvcnQgbmFt ZSwgYnV0Ci0gICAgICAgICMgcmF0aGVyIGJlIHBhc3NlZCBjb21wb25lbnRzIChkaXJlY3RseSBv ciB2aWEgc2V0dGVycykuICBPbmNlCi0gICAgICAgICMgd2UgZml4IHRoYXQsIHRoaXMgbWV0aG9k IHdpbGwgbmVlZCBhIHJlLXdyaXRlLgotICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9y dF9uYW1lPSdtYWMtJXMnICUgdmVyc2lvbiwgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVz dF9ydW5uZXI9dXNlX3dlYmtpdDIpKQorICAgIGRlZiBfYXNzZXJ0X3NlYXJjaF9wYXRoKHNlbGYs IHBvcnRfbmFtZSwgYmFzZWxpbmVfcGF0aCwgc2VhcmNoX3BhdGhzLCB1c2Vfd2Via2l0Mj1GYWxz ZSk6CisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0X25hbWU9cG9ydF9uYW1lLCBv cHRpb25zPU1vY2tPcHRpb25zKHdlYmtpdF90ZXN0X3J1bm5lcj11c2Vfd2Via2l0MikpCiAgICAg ICAgIGFic29sdXRlX3NlYXJjaF9wYXRocyA9IG1hcChwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0 aCwgc2VhcmNoX3BhdGhzKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5l X3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoYmFzZWxpbmVfcGF0aCkpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKSwgYWJzb2x1 dGVfc2VhcmNoX3BhdGhzKQogCiAgICAgZGVmIHRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2Vs Zik6Ci0gICAgICAgICMgRklYTUU6IElzIHRoaXMgcmVhbGx5IHJpZ2h0PyAgU2hvdWxkIG1hYy1s ZW9wYXJkIGZhbGxiYWNrIHRvIG1hYy1zbm93bGVvcGFyZD8KLSAgICAgICAgc2VsZi5fYXNzZXJ0 X3NlYXJjaF9wYXRoKFsnbWFjLWxlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJywgJ21hYy1saW9u JywgJ21hYyddLCAnbGVvcGFyZCcpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J21hYy1zbm93bGVvcGFyZCcsICdtYWMtbGlvbicsICdtYWMnXSwgJ3Nub3dsZW9wYXJkJykKLSAg ICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsnbWFjLWxpb24nLCAnbWFjJ10sICdsaW9u JykKLQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydtYWMtd2syJywgJ21hYy1s ZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcsICdtYWMtbGlvbicsICdtYWMnXSwgJ2xlb3BhcmQn LCB1c2Vfd2Via2l0Mj1UcnVlKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydt YWMtd2syJywgJ21hYy1zbm93bGVvcGFyZCcsICdtYWMtbGlvbicsICdtYWMnXSwgJ3Nub3dsZW9w YXJkJywgdXNlX3dlYmtpdDI9VHJ1ZSkKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRo KFsnbWFjLXdrMicsICdtYWMtbGlvbicsICdtYWMnXSwgJ2xpb24nLCB1c2Vfd2Via2l0Mj1UcnVl KQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoJ21hYy1sZW9wYXJkJywgJ21hYy1s ZW9wYXJkJywgWydtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFjLWxpb24nLCAn bWFjJ10pCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLXNub3dsZW9wYXJk JywgJ21hYy1zbm93bGVvcGFyZCcsIFsnbWFjLXNub3dsZW9wYXJkJywgJ21hYy1saW9uJywgJ21h YyddKQorCisgICAgICAgICMgTm90ZSB0aGF0IG1hYy1saW9uIHdyaXRlcyBiYXNlbGluZXMgaW50 byBtYWMsIG5vdCBtYWMtbGlvbiEgKGJ1dCBpdCB3aWxsIHJlYWQgZnJvbSBtYWMtbGlvbikKKyAg ICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKCdtYWMtbGlvbicsICdtYWMnLCBbJ21hYy1s aW9uJywgJ21hYyddKQorCisgICAgICAgICMgTm90ZSB0aGF0IHRoZXJlIGlzIG5vICdtYWMtZnV0 dXJlJzsgaXQgdXNlcyB0aGUgJ21hYycgZGlyZWN0b3J5IGFzIHdlbGwuCisgICAgICAgIHNlbGYu X2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLWZ1dHVyZScsICdtYWMnLCBbJ21hYyddKQorCisgICAg ICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLWxlb3BhcmQnLCAnbWFjLXdrMicsIFsn bWFjLXdrMicsICdtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFjLWxpb24nLCAn bWFjJ10sIHVzZV93ZWJraXQyPVRydWUpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0 aCgnbWFjLXNub3dsZW9wYXJkJywgJ21hYy13azInLCBbJ21hYy13azInLCAnbWFjLXNub3dsZW9w YXJkJywgJ21hYy1saW9uJywgJ21hYyddLCB1c2Vfd2Via2l0Mj1UcnVlKQorICAgICAgICBzZWxm Ll9hc3NlcnRfc2VhcmNoX3BhdGgoJ21hYy1saW9uJywgJ21hYy13azInLCBbJ21hYy13azInLCAn bWFjLWxpb24nLCAnbWFjJ10sIHVzZV93ZWJraXQyPVRydWUpCisgICAgICAgIHNlbGYuX2Fzc2Vy dF9zZWFyY2hfcGF0aCgnbWFjLWZ1dHVyZScsICdtYWMtd2syJywgWydtYWMtd2syJywgJ21hYydd LCB1c2Vfd2Via2l0Mj1UcnVlKQogCiAgICAgZGVmIHRlc3Rfc2hvd19yZXN1bHRzX2h0bWxfZmls ZShzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKaW5kZXggNTZlYjBj NzQ4NzViMmJhYTIyNTBhNTEyZWMwNDFiNTRhMWI2ZmZhOS4uZDMxNWYwNWNmY2MwNzM0YTc2ZDZl YWI1MWQwYjYzOTU3Y2JhYzU2ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTMzNSwxMiArMzM1LDkgQEAgY2xhc3MgV2Vi S2l0UG9ydChQb3J0KToKICAgICBkZWYgX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2VsZik6 CiAgICAgICAgICMgVW5saWtlIGJhc2VsaW5lX3NlYXJjaF9wYXRoLCB3ZSBvbmx5IHdhbnQgdG8g c2VhcmNoIFtXSzItUE9SVCwgUE9SVC1WRVJTSU9OLCBQT1JUXSBub3QgdGhlIGZ1bGwgY2FzYWRl LgogICAgICAgICAjIE5vdGUgb3JkZXIgZG9lc24ndCBtYXR0ZXIgc2luY2UgdGhlIFNraXBwZWQg ZmlsZSBjb250ZW50cyBhcmUgYWxsIGNvbWJpbmVkLgotICAgICAgICAjCi0gICAgICAgICMgRklY TUU6IEl0J3Mgbm90IGNvcnJlY3QgdG8gYXNzdW1lIHRoYXQgcG9ydCBuYW1lcyBtYXAgZGlyZWN0 bHkgdG8KLSAgICAgICAgIyBkaXJlY3RvcnkgbmFtZXMuIEZvciBleGFtcGxlLCBtYWMtZnV0dXJl IGlzIGEgcG9ydCBuYW1lIHRoYXQgZG9lcwotICAgICAgICAjIG5vdCBoYXZlIGEgY29vcmVzcG9u ZGluZyBkaXJlY3RvcnkuIFRoZSBXZWJLaXQyIHBvcnRzIGFyZSBhbm90aGVyCi0gICAgICAgICMg ZXhhbXBsZS4KLSAgICAgICAgc2VhcmNoX3BhdGhzID0gc2V0KFtzZWxmLnBvcnRfbmFtZSwgc2Vs Zi5uYW1lKCldKQorICAgICAgICBzZWFyY2hfcGF0aHMgPSBzZXQoW3NlbGYucG9ydF9uYW1lXSkK KyAgICAgICAgaWYgJ2Z1dHVyZScgbm90IGluIHNlbGYubmFtZSgpOgorICAgICAgICAgICAgc2Vh cmNoX3BhdGhzLmFkZChzZWxmLm5hbWUoKSkKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3 ZWJraXRfdGVzdF9ydW5uZXInKToKICAgICAgICAgICAgICMgQmVjYXVzZSBuZWFybHkgYWxsIG9m IHRoZSBza2lwcGVkIHRlc3RzIGZvciBXZWJLaXQgMiBhcmUgZHVlIHRvIGNyb3NzLXBsYXRmb3Jt CiAgICAgICAgICAgICAjIGlzc3VlcywgYWxsIHdrMiBwb3J0cyBzaGFyZSBhIHNraXBwZWQgbGlz dCB1bmRlciBwbGF0Zm9ybS93azIuCg==