142230 2015-03-03 12:10:04 -0800 BuildAndTestFactory is redundant and needs cleaning 2015-03-09 10:56:45 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=142094 P2 Enhancement --- 1 mmirman mmirman ap commit-queue jake.nielsen.webkit lforschler mmaxfield mmirman ossy rniwa thorton oldest_to_newest 1073744 0 mmirman 2015-03-03 12:10:04 -0800 BuildAndTestFactory in Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg contains code duplication from TestFactory, and BuildAndTestWebKit2Factory is unused. Patch Forthcoming. 1073756 1 247779 mmirman 2015-03-03 12:28:36 -0800 Created attachment 247779 Patch 1073769 2 247779 ossy 2015-03-03 13:16:56 -0800 Comment on attachment 247779 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247779&action=review Some comments added, otherwise looks good to me. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:806 > self.addStep(RunEflAPITests) RunEflAPITests() similar to CompileClass() below. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:-811 > - CompileClass = CompileWebKit > - LayoutTestClass = RunWebKitTests > - ExtractTestResultsClass = ExtractTestResults Good catch, it seems CompileClass and ExtractTestResultsClass are really useless. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:813 > + self.addStep(CompileWebKit) Use self.addStep(CompileWebKit()) , because passing BuildStep subclass is deprecated. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:815 > + def __init__(self, *args, triggers=None, **kwargs): self, *args, triggers=None, **kwargs --> self, triggers=None, *args, **kwargs > Tools/ChangeLog:15 > + (BuildAndTestWebKit2Factory.getProduct): Deleted. Wasn't used anywhere. getProduct? I know it is generated, but it can be fixed manually. 1073773 3 mmirman 2015-03-03 13:27:31 -0800 (In reply to comment #2) > > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:815 > > + def __init__(self, *args, triggers=None, **kwargs): > > self, *args, triggers=None, **kwargs --> self, triggers=None, *args, **kwargs Is triggers being used as a keyword argument? If so, putting it at the beginning will disable any non keyword arguments being passed in. Otherwise, if it isn't, this change doesn't work at all, since it changes the order of args. 1073774 4 247785 mmirman 2015-03-03 13:33:53 -0800 Created attachment 247785 Patch 1073779 5 mmirman 2015-03-03 13:43:08 -0800 (In reply to comment #2) > > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:815 > > + def __init__(self, *args, triggers=None, **kwargs): > > self, *args, triggers=None, **kwargs --> self, triggers=None, *args, **kwarg I decided to just revert this. 1073786 6 247785 ossy 2015-03-03 13:52:10 -0800 Comment on attachment 247785 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247785&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:814 > + self.addStep(CompileWebKit()) > def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, **kwargs): please add a newline > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:815 > + TestFactory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs) without False, TestFactory.__init__ has only 6 arguments. 1073821 7 247798 mmirman 2015-03-03 14:55:49 -0800 Created attachment 247798 Patch 1073838 8 247798 commit-queue 2015-03-03 16:02:14 -0800 Comment on attachment 247798 Patch Rejecting attachment 247798 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 247798, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: fs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 180958 = ba5f5701f3d812202858234b65effa39dbd3461b r180959 = 0011a228a1f200b552f03bd2fcd3b09c02fc00a3 r180960 = a0a2f39cf8dd053e9648572ffaa30ae0cf423d0d r180961 = 06addba3300bbc41107c7a4233ed9bac2bb510bf Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.appspot.com/results/6625932274040832 1074468 9 ossy 2015-03-05 04:07:34 -0800 It seems it needs to be rebased before landing. 1075642 10 ossy 2015-03-09 10:21:54 -0700 (In reply to comment #9) > It seems it needs to be rebased before landing. Are you going to rebase and land it in the near future? 1075655 11 mmirman 2015-03-09 10:53:21 -0700 (In reply to comment #10) > (In reply to comment #9) > > It seems it needs to be rebased before landing. > > Are you going to rebase and land it in the near future? Yes, I didn't notice this didn't get commit queued. 1075656 12 mmirman 2015-03-09 10:56:07 -0700 (In reply to comment #10) > (In reply to comment #9) > > It seems it needs to be rebased before landing. > > Are you going to rebase and land it in the near future? (In reply to comment #10) > (In reply to comment #9) > > It seems it needs to be rebased before landing. > > Are you going to rebase and land it in the near future? nvm, I had already landed it, and forgot to close it. http://trac.webkit.org/changeset/180999 1075657 13 247798 mmirman 2015-03-09 10:56:45 -0700 Comment on attachment 247798 Patch Landed in http://trac.webkit.org/changeset/180999 247779 2015-03-03 12:28:36 -0800 2015-03-03 13:33:53 -0800 Patch 0001-Cleaned-up-BuildAndTestFactory-to-not-be-a-near-dupl.patch text/plain 5325 mmirman RnJvbSA4YjU1ZWI0NjBhYzhiOWEyYTI4YTNiY2ZjYTVkODE4MjljMzIyYjdkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IE1pcm1hbiA8bW1pcm1hbkBhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMyBNYXIgMjAxNSAxMjoyNjowMiAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIENsZWFu ZWQgdXAgQnVpbGRBbmRUZXN0RmFjdG9yeSB0byBub3QgYmUgYSBuZWFyIGR1cGxpY2F0ZSBvZgog VGVzdEZhY3RvcnkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjIz MAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CihUZXN0RmFjdG9yeSk6CihUZXN0RmFjdG9y eS5nZXRQcm9kdWN0KTogQWRkZWQKKFRlc3RGYWN0b3J5Ll9faW5pdF9fKTogbW92ZWQgZG93bmxv YWRlciB0byBnZXRQcm9kdWN0CihCdWlsZEFuZFRlc3RGYWN0b3J5KToKKEJ1aWxkQW5kVGVzdEZh Y3RvcnkuZ2V0UHJvZHVjdCk6IEFkZGVkCihCdWlsZEFuZFRlc3RGYWN0b3J5Ll9faW5pdF9fKTog bWFkZSB0byBjYWxsIFRlc3RGYWN0b3J5Ll9faW5pdF9fIGFuZCBhcHBlbmQgc3RlcHMgdG8gdGhl IGVuZC4KKEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5LmdldFByb2R1Y3QpOiBEZWxldGVkLiAg V2Fzbid0IHVzZWQgYW55d2hlcmUuCgpkaWZmIC0tZ2l0IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcgVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCA1ZGJkZGFlLi4yNDhh MzRiIDEwMDY0NAotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvbWFzdGVyLmNmZworKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyLmNmZwpAQCAtNzgwLDExICs3ODAsMTQgQEAgZGVmIHBpY2tMYXRl c3RCdWlsZChidWlsZGVyLCByZXF1ZXN0cyk6CiBjbGFzcyBUZXN0RmFjdG9yeShGYWN0b3J5KToK ICAgICBKU0NUZXN0Q2xhc3MgPSBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzCiAgICAgTGF5b3V0VGVz dENsYXNzID0gUnVuV2ViS2l0VGVzdHMKLSAgICBFeHRyYWN0VGVzdFJlc3VsdHNDbGFzcyA9IEV4 dHJhY3RUZXN0UmVzdWx0cwotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmln dXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCBTVk5NaXJy b3I9Tm9uZSk6Ci0gICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZp Z3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnRzLCBTVk5N aXJyb3IpCisKKyAgICBkZWYgZ2V0UHJvZHVjdChzZWxmKToKICAgICAgICAgc2VsZi5hZGRTdGVw KERvd25sb2FkQnVpbHRQcm9kdWN0KCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChFeHRyYWN0QnVp bHRQcm9kdWN0KCkpCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb24sIGFyY2hpdGVjdHVyZXMsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgU1ZOTWlycm9y PU5vbmUpOgorICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1 cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cywgU1ZOTWly cm9yKQorICAgICAgICBzZWxmLmdldFByb2R1Y3QoKQogICAgICAgICBpZiBzZWxmLkpTQ1Rlc3RD bGFzczoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkpTQ1Rlc3RDbGFzcygpKQogICAg ICAgICBpZiBzZWxmLkxheW91dFRlc3RDbGFzczoKQEAgLTc5OCwzNSArODAxLDE5IEBAIGNsYXNz IFRlc3RGYWN0b3J5KEZhY3RvcnkpOgogICAgICAgICBpZiBzZWxmLkxheW91dFRlc3RDbGFzczoK ICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlVGVzdFJlc3VsdHMoKSkKICAgICAgICAg ICAgIHNlbGYuYWRkU3RlcChVcGxvYWRUZXN0UmVzdWx0cygpKQotICAgICAgICAgICAgc2VsZi5h ZGRTdGVwKHNlbGYuRXh0cmFjdFRlc3RSZXN1bHRzQ2xhc3MoKSkKKyAgICAgICAgICAgIHNlbGYu YWRkU3RlcChFeHRyYWN0VGVzdFJlc3VsdHMoKSkKICAgICAgICAgaWYgcGxhdGZvcm0gPT0gImVm bCI6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuRWZsQVBJVGVzdHMpCiAgICAgICAgIGlm IHBsYXRmb3JtID09ICJndGsiOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkd0a0FQSVRl c3RzKCkpCiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuR3RrV2ViS2l0R09iamVjdERPTUJp bmRpbmdzQVBJQnJlYWtUZXN0cygpKQogCi1jbGFzcyBCdWlsZEFuZFRlc3RGYWN0b3J5KEZhY3Rv cnkpOgotICAgIENvbXBpbGVDbGFzcyA9IENvbXBpbGVXZWJLaXQKLSAgICBMYXlvdXRUZXN0Q2xh c3MgPSBSdW5XZWJLaXRUZXN0cwotICAgIEV4dHJhY3RUZXN0UmVzdWx0c0NsYXNzID0gRXh0cmFj dFRlc3RSZXN1bHRzCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0 aW9uLCBhcmNoaXRlY3R1cmVzLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5v bmUsIFNWTk1pcnJvcj1Ob25lLCAqKmt3YXJncyk6Ci0gICAgICAgIEZhY3RvcnkuX19pbml0X18o c2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRp dGlvbmFsQXJndW1lbnRzLCBTVk5NaXJyb3IsICoqa3dhcmdzKQotICAgICAgICBzZWxmLmFkZFN0 ZXAoc2VsZi5Db21waWxlQ2xhc3MoKSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkphdmFTY3Jp cHRDb3JlVGVzdHMoKSkKLSAgICAgICAgaWYgc2VsZi5MYXlvdXRUZXN0Q2xhc3M6Ci0gICAgICAg ICAgICBzZWxmLmFkZFN0ZXAoc2VsZi5MYXlvdXRUZXN0Q2xhc3MoKSkKLSAgICAgICAgc2VsZi5h ZGRTdGVwKFJ1blB5dGhvblRlc3RzKCkpCi0gICAgICAgIHNlbGYuYWRkU3RlcChSdW5QZXJsVGVz dHMoKSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkJpbmRpbmdzVGVzdHMoKSkKLSAgICAgICAg aWYgc2VsZi5MYXlvdXRUZXN0Q2xhc3M6Ci0gICAgICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2 ZVRlc3RSZXN1bHRzKCkpCi0gICAgICAgICAgICBzZWxmLmFkZFN0ZXAoVXBsb2FkVGVzdFJlc3Vs dHMoKSkKLSAgICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkV4dHJhY3RUZXN0UmVzdWx0c0Ns YXNzKCkpCi0gICAgICAgIGlmIHBsYXRmb3JtID09ICJlZmwiOgotICAgICAgICAgICAgc2VsZi5h ZGRTdGVwKFJ1bkVmbEFQSVRlc3RzKCkpCi0gICAgICAgIGlmIHBsYXRmb3JtID09ICJndGsiOgot ICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkd0a0FQSVRlc3RzKCkpCi0gICAgICAgICAgICBz ZWxmLmFkZFN0ZXAoUnVuR3RrV2ViS2l0R09iamVjdERPTUJpbmRpbmdzQVBJQnJlYWtUZXN0cygp KQorY2xhc3MgQnVpbGRBbmRUZXN0RmFjdG9yeShUZXN0RmFjdG9yeSk6CisgICAgZGVmIGdldFBy b2R1Y3Qoc2VsZik6CisgICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlV2ViS2l0KQorCisgICAg ZGVmIF9faW5pdF9fKHNlbGYsICphcmdzLCB0cmlnZ2Vycz1Ob25lLCAqKmt3YXJncyk6CisgICAg ICAgIFRlc3RGYWN0b3J5Ll9faW5pdF9fKHNlbGYsICphcmdzLCAqKmt3YXJncykKICAgICAgICAg aWYgdHJpZ2dlcnM6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2ZUJ1aWx0UHJvZHVj dCgpKQogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCgpKQpAQCAt ODQ0LDEwICs4MzEsNiBAQCBjbGFzcyBCdWlsZEFuZFRlc3QzMmJpdEpTQ0ZhY3RvcnkoRmFjdG9y eSk6CiAgICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlMzJiaXRKU0MoKSkKICAgICAgICAgc2Vs Zi5hZGRTdGVwKFJ1bjMyYml0SlNDVGVzdHMoKSkKIAotY2xhc3MgQnVpbGRBbmRUZXN0V2ViS2l0 MkZhY3RvcnkoQnVpbGRBbmRUZXN0RmFjdG9yeSk6Ci0gICAgQ29tcGlsZUNsYXNzID0gQ29tcGls ZVdlYktpdAotICAgIExheW91dFRlc3RDbGFzcyA9IFJ1bldlYktpdDJUZXN0cwotCiBjbGFzcyBC dWlsZEFuZE5vbkxheW91dFRlc3RGYWN0b3J5KEJ1aWxkQW5kVGVzdEZhY3RvcnkpOgogICAgIExh eW91dFRlc3RDbGFzcyA9IE5vbmUKIApkaWZmIC0tZ2l0IFRvb2xzL0NoYW5nZUxvZyBUb29scy9D aGFuZ2VMb2cKaW5kZXggYzdlM2M5Ny4uMGJiZjFjMCAxMDA2NDQKLS0tIFRvb2xzL0NoYW5nZUxv ZworKysgVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTUtMDMtMDMgIE1hdHRo ZXcgTWlybWFuICA8bW1pcm1hbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW5lZCB1cCBCdWls ZEFuZFRlc3RGYWN0b3J5IHRvIG5vdCBiZSBhIG5lYXIgZHVwbGljYXRlIG9mIFRlc3RGYWN0b3J5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIyMzAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisgICAgICAg IChUZXN0RmFjdG9yeSk6CisgICAgICAgIChUZXN0RmFjdG9yeS5nZXRQcm9kdWN0KTogQWRkZWQK KyAgICAgICAgKFRlc3RGYWN0b3J5Ll9faW5pdF9fKTogbW92ZWQgZG93bmxvYWRlciB0byBnZXRQ cm9kdWN0CisgICAgICAgIChCdWlsZEFuZFRlc3RGYWN0b3J5KTogICAgICAgIAorICAgICAgICAo QnVpbGRBbmRUZXN0RmFjdG9yeS5nZXRQcm9kdWN0KTogQWRkZWQKKyAgICAgICAgKEJ1aWxkQW5k VGVzdEZhY3RvcnkuX19pbml0X18pOiBtYWRlIHRvIGNhbGwgVGVzdEZhY3RvcnkuX19pbml0X18g YW5kIGFwcGVuZCBzdGVwcyB0byB0aGUgZW5kLgorICAgICAgICAoQnVpbGRBbmRUZXN0V2ViS2l0 MkZhY3RvcnkuZ2V0UHJvZHVjdCk6IERlbGV0ZWQuICBXYXNuJ3QgdXNlZCBhbnl3aGVyZS4KKwor MjAxNS0wMy0wMyAgTWF0dGhldyBNaXJtYW4gIDxtbWlybWFuQGFwcGxlLmNvbT4KKwogICAgICAg ICBKU0MgdGVzdHMgc2hvdWxkIG5vdCBiZSByZXBlYXRlZCB0d2ljZSBmb3IgZWFjaCBicmFuY2gg YnVpbGRlciwgYW5kIHNob3VsZCBpZiBwb3NzaWJsZSBoYXZlIHRoZWlyIG93biBxdWV1ZS4KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjA5NAogCi0t IAoyLjIuMSAoQXBwbGUgR2l0LTUzKQoK 247785 2015-03-03 13:33:53 -0800 2015-03-03 14:55:49 -0800 Patch 0001-Cleaned-up-BuildAndTestFactory-to-not-be-a-near-dupl.patch text/plain 5362 mmirman RnJvbSA5MDRkNjQxNjdiNTg5NWVhOGZiNzkyM2Q4NmNmOTk4ZGRlMWRhZTg1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IE1pcm1hbiA8bW1pcm1hbkBhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMyBNYXIgMjAxNSAxMzozMjozNCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIENsZWFu ZWQgdXAgQnVpbGRBbmRUZXN0RmFjdG9yeSB0byBub3QgYmUgYSBuZWFyIGR1cGxpY2F0ZSBvZgog VGVzdEZhY3RvcnkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjIz MAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CihUZXN0RmFjdG9yeSk6CihUZXN0RmFjdG9y eS5nZXRQcm9kdWN0KTogQWRkZWQKKFRlc3RGYWN0b3J5Ll9faW5pdF9fKTogbW92ZWQgZG93bmxv YWRlciB0byBnZXRQcm9kdWN0CihCdWlsZEFuZFRlc3RGYWN0b3J5KToKKEJ1aWxkQW5kVGVzdEZh Y3RvcnkuZ2V0UHJvZHVjdCk6IEFkZGVkCihCdWlsZEFuZFRlc3RGYWN0b3J5Ll9faW5pdF9fKTog bWFkZSB0byBjYWxsIFRlc3RGYWN0b3J5Ll9faW5pdF9fIGFuZCBhcHBlbmQgc3RlcHMgdG8gdGhl IGVuZC4KKEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5KTogRGVsZXRlZC4gIFdhc24ndCB1c2Vk IGFueXdoZXJlLgoKZGlmZiAtLWdpdCBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKaW5kZXggNWRiZGRhZS4uYzM0YjQ5YiAxMDA2NDQK LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmcKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L21hc3Rlci5jZmcKQEAgLTc4MCwxMSArNzgwLDE0IEBAIGRlZiBwaWNrTGF0ZXN0QnVpbGQoYnVp bGRlciwgcmVxdWVzdHMpOgogY2xhc3MgVGVzdEZhY3RvcnkoRmFjdG9yeSk6CiAgICAgSlNDVGVz dENsYXNzID0gUnVuSmF2YVNjcmlwdENvcmVUZXN0cwogICAgIExheW91dFRlc3RDbGFzcyA9IFJ1 bldlYktpdFRlc3RzCi0gICAgRXh0cmFjdFRlc3RSZXN1bHRzQ2xhc3MgPSBFeHRyYWN0VGVzdFJl c3VsdHMKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFy Y2hpdGVjdHVyZXMsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgU1ZOTWlycm9yPU5vbmUpOgot ICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBh cmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cywgU1ZOTWlycm9yKQorCisg ICAgZGVmIGdldFByb2R1Y3Qoc2VsZik6CiAgICAgICAgIHNlbGYuYWRkU3RlcChEb3dubG9hZEJ1 aWx0UHJvZHVjdCgpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoRXh0cmFjdEJ1aWx0UHJvZHVjdCgp KQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNo aXRlY3R1cmVzLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIFNWTk1pcnJvcj1Ob25lKToKKyAg ICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJj aGl0ZWN0dXJlcywgRmFsc2UsIGFkZGl0aW9uYWxBcmd1bWVudHMsIFNWTk1pcnJvcikKKyAgICAg ICAgc2VsZi5nZXRQcm9kdWN0KCkKICAgICAgICAgaWYgc2VsZi5KU0NUZXN0Q2xhc3M6CiAgICAg ICAgICAgICBzZWxmLmFkZFN0ZXAoc2VsZi5KU0NUZXN0Q2xhc3MoKSkKICAgICAgICAgaWYgc2Vs Zi5MYXlvdXRUZXN0Q2xhc3M6CkBAIC03OTgsMzUgKzgwMSwxOCBAQCBjbGFzcyBUZXN0RmFjdG9y eShGYWN0b3J5KToKICAgICAgICAgaWYgc2VsZi5MYXlvdXRUZXN0Q2xhc3M6CiAgICAgICAgICAg ICBzZWxmLmFkZFN0ZXAoQXJjaGl2ZVRlc3RSZXN1bHRzKCkpCiAgICAgICAgICAgICBzZWxmLmFk ZFN0ZXAoVXBsb2FkVGVzdFJlc3VsdHMoKSkKLSAgICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxm LkV4dHJhY3RUZXN0UmVzdWx0c0NsYXNzKCkpCisgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoRXh0 cmFjdFRlc3RSZXN1bHRzKCkpCiAgICAgICAgIGlmIHBsYXRmb3JtID09ICJlZmwiOgotICAgICAg ICAgICAgc2VsZi5hZGRTdGVwKFJ1bkVmbEFQSVRlc3RzKQorICAgICAgICAgICAgc2VsZi5hZGRT dGVwKFJ1bkVmbEFQSVRlc3RzKCkpCiAgICAgICAgIGlmIHBsYXRmb3JtID09ICJndGsiOgogICAg ICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkd0a0FQSVRlc3RzKCkpCiAgICAgICAgICAgICBzZWxm LmFkZFN0ZXAoUnVuR3RrV2ViS2l0R09iamVjdERPTUJpbmRpbmdzQVBJQnJlYWtUZXN0cygpKQog Ci1jbGFzcyBCdWlsZEFuZFRlc3RGYWN0b3J5KEZhY3RvcnkpOgotICAgIENvbXBpbGVDbGFzcyA9 IENvbXBpbGVXZWJLaXQKLSAgICBMYXlvdXRUZXN0Q2xhc3MgPSBSdW5XZWJLaXRUZXN0cwotICAg IEV4dHJhY3RUZXN0UmVzdWx0c0NsYXNzID0gRXh0cmFjdFRlc3RSZXN1bHRzCitjbGFzcyBCdWls ZEFuZFRlc3RGYWN0b3J5KFRlc3RGYWN0b3J5KToKKyAgICBkZWYgZ2V0UHJvZHVjdChzZWxmKToK KyAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVXZWJLaXQoKSkKICAgICBkZWYgX19pbml0X18o c2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzPU5v bmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgU1ZOTWlycm9yPU5vbmUsICoqa3dhcmdzKToK LSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwg YXJjaGl0ZWN0dXJlcywgRmFsc2UsIGFkZGl0aW9uYWxBcmd1bWVudHMsIFNWTk1pcnJvciwgKipr d2FyZ3MpCi0gICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkNvbXBpbGVDbGFzcygpKQotICAgICAg ICBzZWxmLmFkZFN0ZXAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cygpKQotICAgICAgICBpZiBzZWxm LkxheW91dFRlc3RDbGFzczoKLSAgICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkxheW91dFRl c3RDbGFzcygpKQotICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuUHl0aG9uVGVzdHMoKSkKLSAgICAg ICAgc2VsZi5hZGRTdGVwKFJ1blBlcmxUZXN0cygpKQotICAgICAgICBzZWxmLmFkZFN0ZXAoUnVu QmluZGluZ3NUZXN0cygpKQotICAgICAgICBpZiBzZWxmLkxheW91dFRlc3RDbGFzczoKLSAgICAg ICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlVGVzdFJlc3VsdHMoKSkKLSAgICAgICAgICAgIHNl bGYuYWRkU3RlcChVcGxvYWRUZXN0UmVzdWx0cygpKQotICAgICAgICAgICAgc2VsZi5hZGRTdGVw KHNlbGYuRXh0cmFjdFRlc3RSZXN1bHRzQ2xhc3MoKSkKLSAgICAgICAgaWYgcGxhdGZvcm0gPT0g ImVmbCI6Ci0gICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuRWZsQVBJVGVzdHMoKSkKLSAgICAg ICAgaWYgcGxhdGZvcm0gPT0gImd0ayI6Ci0gICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuR3Rr QVBJVGVzdHMoKSkKLSAgICAgICAgICAgIHNlbGYuYWRkU3RlcChSdW5HdGtXZWJLaXRHT2JqZWN0 RE9NQmluZGluZ3NBUElCcmVha1Rlc3RzKCkpCisgICAgICAgIFRlc3RGYWN0b3J5Ll9faW5pdF9f KHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRk aXRpb25hbEFyZ3VtZW50cywgU1ZOTWlycm9yLCAqKmt3YXJncykKICAgICAgICAgaWYgdHJpZ2dl cnM6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2ZUJ1aWx0UHJvZHVjdCgpKQogICAg ICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCgpKQpAQCAtODQ0LDEwICs4 MzAsNiBAQCBjbGFzcyBCdWlsZEFuZFRlc3QzMmJpdEpTQ0ZhY3RvcnkoRmFjdG9yeSk6CiAgICAg ICAgIHNlbGYuYWRkU3RlcChDb21waWxlMzJiaXRKU0MoKSkKICAgICAgICAgc2VsZi5hZGRTdGVw KFJ1bjMyYml0SlNDVGVzdHMoKSkKIAotY2xhc3MgQnVpbGRBbmRUZXN0V2ViS2l0MkZhY3Rvcnko QnVpbGRBbmRUZXN0RmFjdG9yeSk6Ci0gICAgQ29tcGlsZUNsYXNzID0gQ29tcGlsZVdlYktpdAot ICAgIExheW91dFRlc3RDbGFzcyA9IFJ1bldlYktpdDJUZXN0cwotCiBjbGFzcyBCdWlsZEFuZE5v bkxheW91dFRlc3RGYWN0b3J5KEJ1aWxkQW5kVGVzdEZhY3RvcnkpOgogICAgIExheW91dFRlc3RD bGFzcyA9IE5vbmUKIApkaWZmIC0tZ2l0IFRvb2xzL0NoYW5nZUxvZyBUb29scy9DaGFuZ2VMb2cK aW5kZXggYzdlM2M5Ny4uYTZlMmIxZSAxMDA2NDQKLS0tIFRvb2xzL0NoYW5nZUxvZworKysgVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTUtMDMtMDMgIE1hdHRoZXcgTWlybWFu ICA8bW1pcm1hbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW5lZCB1cCBCdWlsZEFuZFRlc3RG YWN0b3J5IHRvIG5vdCBiZSBhIG5lYXIgZHVwbGljYXRlIG9mIFRlc3RGYWN0b3J5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIyMzAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisgICAgICAgIChUZXN0RmFj dG9yeSk6CisgICAgICAgIChUZXN0RmFjdG9yeS5nZXRQcm9kdWN0KTogQWRkZWQKKyAgICAgICAg KFRlc3RGYWN0b3J5Ll9faW5pdF9fKTogbW92ZWQgZG93bmxvYWRlciB0byBnZXRQcm9kdWN0Cisg ICAgICAgIChCdWlsZEFuZFRlc3RGYWN0b3J5KTogICAgICAgIAorICAgICAgICAoQnVpbGRBbmRU ZXN0RmFjdG9yeS5nZXRQcm9kdWN0KTogQWRkZWQKKyAgICAgICAgKEJ1aWxkQW5kVGVzdEZhY3Rv cnkuX19pbml0X18pOiBtYWRlIHRvIGNhbGwgVGVzdEZhY3RvcnkuX19pbml0X18gYW5kIGFwcGVu ZCBzdGVwcyB0byB0aGUgZW5kLgorICAgICAgICAoQnVpbGRBbmRUZXN0V2ViS2l0MkZhY3Rvcnkp OiBEZWxldGVkLiAgV2Fzbid0IHVzZWQgYW55d2hlcmUuCisKKzIwMTUtMDMtMDMgIE1hdHRoZXcg TWlybWFuICA8bW1pcm1hbkBhcHBsZS5jb20+CisKICAgICAgICAgSlNDIHRlc3RzIHNob3VsZCBu b3QgYmUgcmVwZWF0ZWQgdHdpY2UgZm9yIGVhY2ggYnJhbmNoIGJ1aWxkZXIsIGFuZCBzaG91bGQg aWYgcG9zc2libGUgaGF2ZSB0aGVpciBvd24gcXVldWUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwOTQKIAotLSAKMi4yLjEgKEFwcGxlIEdpdC01 MykKCg== 247798 2015-03-03 14:55:49 -0800 2015-03-09 10:56:45 -0700 Patch 0001-Cleaned-up-BuildAndTestFactory-to-not-be-a-near-dupl.patch text/plain 5377 mmirman RnJvbSA0ZTA4ZTQwMDU2YjYzN2JjODNjZDczMTJmZGI4NDVlMDFmMmMyYWI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IE1pcm1hbiA8bW1pcm1hbkBhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMyBNYXIgMjAxNSAxNDo1NDo0NSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIENsZWFu ZWQgdXAgQnVpbGRBbmRUZXN0RmFjdG9yeSB0byBub3QgYmUgYSBuZWFyIGR1cGxpY2F0ZSBvZgog VGVzdEZhY3RvcnkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjIz MAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CihUZXN0RmFjdG9yeSk6CihUZXN0RmFjdG9y eS5nZXRQcm9kdWN0KTogQWRkZWQKKFRlc3RGYWN0b3J5Ll9faW5pdF9fKTogbW92ZWQgZG93bmxv YWRlciB0byBnZXRQcm9kdWN0CihCdWlsZEFuZFRlc3RGYWN0b3J5KToKKEJ1aWxkQW5kVGVzdEZh Y3RvcnkuZ2V0UHJvZHVjdCk6IEFkZGVkCihCdWlsZEFuZFRlc3RGYWN0b3J5Ll9faW5pdF9fKTog bWFkZSB0byBjYWxsIFRlc3RGYWN0b3J5Ll9faW5pdF9fIGFuZCBhcHBlbmQgc3RlcHMgdG8gdGhl IGVuZC4KKEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5KTogRGVsZXRlZC4gIFdhc24ndCB1c2Vk IGFueXdoZXJlLgoKZGlmZiAtLWdpdCBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKaW5kZXggNWRiZGRhZS4uZGU1YjlkMCAxMDA2NDQK LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmcKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L21hc3Rlci5jZmcKQEAgLTc4MCwxMSArNzgwLDE0IEBAIGRlZiBwaWNrTGF0ZXN0QnVpbGQoYnVp bGRlciwgcmVxdWVzdHMpOgogY2xhc3MgVGVzdEZhY3RvcnkoRmFjdG9yeSk6CiAgICAgSlNDVGVz dENsYXNzID0gUnVuSmF2YVNjcmlwdENvcmVUZXN0cwogICAgIExheW91dFRlc3RDbGFzcyA9IFJ1 bldlYktpdFRlc3RzCi0gICAgRXh0cmFjdFRlc3RSZXN1bHRzQ2xhc3MgPSBFeHRyYWN0VGVzdFJl c3VsdHMKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFy Y2hpdGVjdHVyZXMsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgU1ZOTWlycm9yPU5vbmUpOgot ICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBh cmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cywgU1ZOTWlycm9yKQorCisg ICAgZGVmIGdldFByb2R1Y3Qoc2VsZik6CiAgICAgICAgIHNlbGYuYWRkU3RlcChEb3dubG9hZEJ1 aWx0UHJvZHVjdCgpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoRXh0cmFjdEJ1aWx0UHJvZHVjdCgp KQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNo aXRlY3R1cmVzLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIFNWTk1pcnJvcj1Ob25lLCAqKmt3 YXJncyk6CisgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnRzLCBTVk5NaXJy b3IsICoqa3dhcmdzKQorICAgICAgICBzZWxmLmdldFByb2R1Y3QoKQogICAgICAgICBpZiBzZWxm LkpTQ1Rlc3RDbGFzczoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkpTQ1Rlc3RDbGFz cygpKQogICAgICAgICBpZiBzZWxmLkxheW91dFRlc3RDbGFzczoKQEAgLTc5OCwzNSArODAxLDE5 IEBAIGNsYXNzIFRlc3RGYWN0b3J5KEZhY3RvcnkpOgogICAgICAgICBpZiBzZWxmLkxheW91dFRl c3RDbGFzczoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlVGVzdFJlc3VsdHMoKSkK ICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChVcGxvYWRUZXN0UmVzdWx0cygpKQotICAgICAgICAg ICAgc2VsZi5hZGRTdGVwKHNlbGYuRXh0cmFjdFRlc3RSZXN1bHRzQ2xhc3MoKSkKKyAgICAgICAg ICAgIHNlbGYuYWRkU3RlcChFeHRyYWN0VGVzdFJlc3VsdHMoKSkKICAgICAgICAgaWYgcGxhdGZv cm0gPT0gImVmbCI6Ci0gICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuRWZsQVBJVGVzdHMpCisg ICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuRWZsQVBJVGVzdHMoKSkKICAgICAgICAgaWYgcGxh dGZvcm0gPT0gImd0ayI6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuR3RrQVBJVGVzdHMo KSkKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChSdW5HdGtXZWJLaXRHT2JqZWN0RE9NQmluZGlu Z3NBUElCcmVha1Rlc3RzKCkpCiAKLWNsYXNzIEJ1aWxkQW5kVGVzdEZhY3RvcnkoRmFjdG9yeSk6 Ci0gICAgQ29tcGlsZUNsYXNzID0gQ29tcGlsZVdlYktpdAotICAgIExheW91dFRlc3RDbGFzcyA9 IFJ1bldlYktpdFRlc3RzCi0gICAgRXh0cmFjdFRlc3RSZXN1bHRzQ2xhc3MgPSBFeHRyYWN0VGVz dFJlc3VsdHMKK2NsYXNzIEJ1aWxkQW5kVGVzdEZhY3RvcnkoVGVzdEZhY3RvcnkpOgorICAgIGRl ZiBnZXRQcm9kdWN0KHNlbGYpOgorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZVdlYktpdCgp KQorCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNo aXRlY3R1cmVzLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIFNWTk1p cnJvcj1Ob25lLCAqKmt3YXJncyk6Ci0gICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxh dGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJn dW1lbnRzLCBTVk5NaXJyb3IsICoqa3dhcmdzKQotICAgICAgICBzZWxmLmFkZFN0ZXAoc2VsZi5D b21waWxlQ2xhc3MoKSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkphdmFTY3JpcHRDb3JlVGVz dHMoKSkKLSAgICAgICAgaWYgc2VsZi5MYXlvdXRUZXN0Q2xhc3M6Ci0gICAgICAgICAgICBzZWxm LmFkZFN0ZXAoc2VsZi5MYXlvdXRUZXN0Q2xhc3MoKSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1 blB5dGhvblRlc3RzKCkpCi0gICAgICAgIHNlbGYuYWRkU3RlcChSdW5QZXJsVGVzdHMoKSkKLSAg ICAgICAgc2VsZi5hZGRTdGVwKFJ1bkJpbmRpbmdzVGVzdHMoKSkKLSAgICAgICAgaWYgc2VsZi5M YXlvdXRUZXN0Q2xhc3M6Ci0gICAgICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2ZVRlc3RSZXN1 bHRzKCkpCi0gICAgICAgICAgICBzZWxmLmFkZFN0ZXAoVXBsb2FkVGVzdFJlc3VsdHMoKSkKLSAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkV4dHJhY3RUZXN0UmVzdWx0c0NsYXNzKCkpCi0g ICAgICAgIGlmIHBsYXRmb3JtID09ICJlZmwiOgotICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1 bkVmbEFQSVRlc3RzKCkpCi0gICAgICAgIGlmIHBsYXRmb3JtID09ICJndGsiOgotICAgICAgICAg ICAgc2VsZi5hZGRTdGVwKFJ1bkd0a0FQSVRlc3RzKCkpCi0gICAgICAgICAgICBzZWxmLmFkZFN0 ZXAoUnVuR3RrV2ViS2l0R09iamVjdERPTUJpbmRpbmdzQVBJQnJlYWtUZXN0cygpKQorICAgICAg ICBUZXN0RmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJj aGl0ZWN0dXJlcywgYWRkaXRpb25hbEFyZ3VtZW50cywgU1ZOTWlycm9yLCAqKmt3YXJncykKICAg ICAgICAgaWYgdHJpZ2dlcnM6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2ZUJ1aWx0 UHJvZHVjdCgpKQogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCgp KQpAQCAtODQ0LDEwICs4MzEsNiBAQCBjbGFzcyBCdWlsZEFuZFRlc3QzMmJpdEpTQ0ZhY3Rvcnko RmFjdG9yeSk6CiAgICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlMzJiaXRKU0MoKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKFJ1bjMyYml0SlNDVGVzdHMoKSkKIAotY2xhc3MgQnVpbGRBbmRUZXN0 V2ViS2l0MkZhY3RvcnkoQnVpbGRBbmRUZXN0RmFjdG9yeSk6Ci0gICAgQ29tcGlsZUNsYXNzID0g Q29tcGlsZVdlYktpdAotICAgIExheW91dFRlc3RDbGFzcyA9IFJ1bldlYktpdDJUZXN0cwotCiBj bGFzcyBCdWlsZEFuZE5vbkxheW91dFRlc3RGYWN0b3J5KEJ1aWxkQW5kVGVzdEZhY3RvcnkpOgog ICAgIExheW91dFRlc3RDbGFzcyA9IE5vbmUKIApkaWZmIC0tZ2l0IFRvb2xzL0NoYW5nZUxvZyBU b29scy9DaGFuZ2VMb2cKaW5kZXggYzdlM2M5Ny4uYTZlMmIxZSAxMDA2NDQKLS0tIFRvb2xzL0No YW5nZUxvZworKysgVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTUtMDMtMDMg IE1hdHRoZXcgTWlybWFuICA8bW1pcm1hbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW5lZCB1 cCBCdWlsZEFuZFRlc3RGYWN0b3J5IHRvIG5vdCBiZSBhIG5lYXIgZHVwbGljYXRlIG9mIFRlc3RG YWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDIyMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6Cisg ICAgICAgIChUZXN0RmFjdG9yeSk6CisgICAgICAgIChUZXN0RmFjdG9yeS5nZXRQcm9kdWN0KTog QWRkZWQKKyAgICAgICAgKFRlc3RGYWN0b3J5Ll9faW5pdF9fKTogbW92ZWQgZG93bmxvYWRlciB0 byBnZXRQcm9kdWN0CisgICAgICAgIChCdWlsZEFuZFRlc3RGYWN0b3J5KTogICAgICAgIAorICAg ICAgICAoQnVpbGRBbmRUZXN0RmFjdG9yeS5nZXRQcm9kdWN0KTogQWRkZWQKKyAgICAgICAgKEJ1 aWxkQW5kVGVzdEZhY3RvcnkuX19pbml0X18pOiBtYWRlIHRvIGNhbGwgVGVzdEZhY3RvcnkuX19p bml0X18gYW5kIGFwcGVuZCBzdGVwcyB0byB0aGUgZW5kLgorICAgICAgICAoQnVpbGRBbmRUZXN0 V2ViS2l0MkZhY3RvcnkpOiBEZWxldGVkLiAgV2Fzbid0IHVzZWQgYW55d2hlcmUuCisKKzIwMTUt MDMtMDMgIE1hdHRoZXcgTWlybWFuICA8bW1pcm1hbkBhcHBsZS5jb20+CisKICAgICAgICAgSlND IHRlc3RzIHNob3VsZCBub3QgYmUgcmVwZWF0ZWQgdHdpY2UgZm9yIGVhY2ggYnJhbmNoIGJ1aWxk ZXIsIGFuZCBzaG91bGQgaWYgcG9zc2libGUgaGF2ZSB0aGVpciBvd24gcXVldWUuCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwOTQKIAotLSAKMi4y LjEgKEFwcGxlIEdpdC01MykKCg==