178772 2017-10-24 22:59:47 -0700 Fix a bug in syncing script that test/build syncer is never set. 2024-02-25 09:46:46 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned ahmad.saleem792 dewei_zhu rniwa oldest_to_newest 1364111 0 dewei_zhu 2017-10-24 22:59:47 -0700 Fix a bug in syncing script that test/build syncer is never set. 1364113 1 324796 dewei_zhu 2017-10-24 23:05:59 -0700 Created attachment 324796 Patch 1364144 2 324796 rniwa 2017-10-25 01:09:20 -0700 Comment on attachment 324796 Patch Thanks for the fix! 2016714 3 ahmad.saleem792 2024-02-25 09:46:46 -0800 Landed - https://github.com/WebKit/WebKit/commit/2b53e5ed93295b64b24c55f5cabe4ab00532315f 324796 2017-10-24 23:05:59 -0700 2017-10-25 01:09:20 -0700 Patch bug-178772-20171024230558.patch text/plain 14697 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzOTQ4CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA4NzJhZGU4ZDAwY2MzOWJlODZmYTYwMGRiYmM3NjIwODA4MTViNjI1Li5hODdlYTQ4MmQz OGFlYjNlMWYzOGIzOTFmYmExM2M4MzA1OGY3MTM3IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxNy0xMC0yNCAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KIAorICAgICAgICBGaXggYSBidWcgaW4gc3luY2luZyBzY3JpcHQgdGhhdCB0 ZXN0L2J1aWxkIHN5bmNlciBpcyBuZXZlciBzZXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzg3NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBOZWl0aGVyICdidWlsZFN5bmNlcicgbm9yICd0ZXN0U3lu Y2VyJyBpcyBldmVyIHNldC4KKyAgICAgICAgQWRkZWQgYSB1bml0IHRlc3QgdG8gY292ZXIgdGhp cyBjYXNlLgorCisgICAgICAgICogc2VydmVyLXRlc3RzL3Rvb2xzLXN5bmMtYnVpbGRib3QtaW50 ZWdyYXRpb24tdGVzdHMuanM6CisgICAgICAgIChjcmVhdGVUcmlnZ2VyYWJsZSk6IFJlZmFjdG9y IGl0IHRvIGFsbG93IGN1c3RvbWl6ZWQgbmFtZS4KKyAgICAgICAgKiB0b29scy9qcy9idWlsZGJv dC10cmlnZ2VyYWJsZS5qczoKKyAgICAgICAgKEJ1aWxkYm90VHJpZ2dlcmFibGUucHJvdG90eXBl Ll9wdWxsQnVpbGRib3RPbkFsbFN5bmNlcnMpOiBVcGRhdGUgc3luY2VyIGluZm8gYWNjb3JkaW5n bHkuCisgICAgICAgIChCdWlsZGJvdFRyaWdnZXJhYmxlLl90ZXN0R3JvdXBNYXBGb3JCdWlsZFJl cXVlc3RzKTogSW5pdGlhbGl6ZSBidWlsZCBhbmQgdGVzdCBzeW5jZXIgdG8gbnVsbC4KKworMjAx Ny0xMC0yNCAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1QGFwcGxlLmNvbT4KKwogICAgICAgICBPd25l ciBjb21taXQgZG9lcyBub3QgbmVjZXNzYXJpbHkgZXhpc3QgaW4gdGhlIHNhbWUgY29tbWl0IHNl dCBmb3IgYW4gb3duZWQgY29tbWl0LgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc4NzYzCiAKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtc3luYy1idWlsZGJvdC1pbnRlZ3JhdGlvbi10ZXN0cy5q cyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtc3luYy1idWls ZGJvdC1pbnRlZ3JhdGlvbi10ZXN0cy5qcwppbmRleCBiNDY1MjlhODE0ZjQ1ZWYzNjE2ODcxZmU1 NmI1YjlmMmRhNWU3ODM5Li5mMTU5ZTNlYmE3ZGZiNDcwN2JjYjFiYTlmNDkxM2QxY2U2MzkxZmI0 IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Rvb2xz LXN5bmMtYnVpbGRib3QtaW50ZWdyYXRpb24tdGVzdHMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3NlcnZlci10ZXN0cy90b29scy1zeW5jLWJ1aWxkYm90LWludGVncmF0aW9uLXRl c3RzLmpzCkBAIC0xMyw1MiArMTMsOTAgQEAgY29uc3QgVGVtcG9yYXJ5RmlsZSA9IHJlcXVpcmUo Jy4vcmVzb3VyY2VzL3RlbXBvcmFyeS1maWxlLmpzJykuVGVtcG9yYXJ5RmlsZTsKIGNvbnN0IGFk ZFNsYXZlRm9yUmVwb3J0ID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMu anMnKS5hZGRTbGF2ZUZvclJlcG9ydDsKIGNvbnN0IHByZXBhcmVTZXJ2ZXJUZXN0ID0gcmVxdWly ZSgnLi9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMnKS5wcmVwYXJlU2VydmVyVGVzdDsK IAotZnVuY3Rpb24gY3JlYXRlVHJpZ2dlcmFibGUoKQorY29uc3QgY29uZmlnV2l0aE9uZVRlc3Rl clR3b0J1aWxkZXJzID0geworICAgIHRyaWdnZXJhYmxlTmFtZTogJ2J1aWxkLXdlYmtpdCcsCisg ICAgbG9va2JhY2tDb3VudDogMiwKKyAgICBidWlsZFJlcXVlc3RBcmd1bWVudDogJ2J1aWxkLXJl cXVlc3QtaWQnLAorICAgIHNsYXZlTmFtZTogJ3N5bmMtc2xhdmUnLAorICAgIHNsYXZlUGFzc3dv cmQ6ICdwYXNzd29yZCcsCisgICAgcmVwb3NpdG9yeUdyb3VwczogeworICAgICAgICAnd2Via2l0 JzogeworICAgICAgICAgICAgcmVwb3NpdG9yaWVzOiB7J1dlYktpdCc6IHthY2NlcHRzUGF0Y2g6 IHRydWV9fSwKKyAgICAgICAgICAgIHRlc3RQcm9wZXJ0aWVzOiB7J3drJzogeydyZXZpc2lvbic6 ICdXZWJLaXQnfSwgJ3Jvb3RzJzogeydyb290cyc6IHt9fX0sCisgICAgICAgICAgICBidWlsZFBy b3BlcnRpZXM6IHsnd2snOiB7J3JldmlzaW9uJzogJ1dlYktpdCd9LCAnd2stcGF0Y2gnOiB7J3Bh dGNoJzogJ1dlYktpdCd9LAorICAgICAgICAgICAgICAgICdjaGVja2JveCc6IHsnaWZSZXBvc2l0 b3J5U2V0JzogWydXZWJLaXQnXSwgJ3ZhbHVlJzogJ2J1aWxkLXdrJ30sCisgICAgICAgICAgICAg ICAgJ293bmVkLWNvbW1pdHMnOiB7J293bmVkUmV2aXNpb25zJzogJ1dlYktpdCd9fSwKKyAgICAg ICAgICAgIGFjY2VwdHNSb290czogdHJ1ZSwKKyAgICAgICAgfQorICAgIH0sCisgICAgdHlwZXM6 IHsKKyAgICAgICAgJ3NvbWUnOiB7CisgICAgICAgICAgICB0ZXN0OiBbJ3NvbWUgdGVzdCddLAor ICAgICAgICAgICAgcHJvcGVydGllczogeyd0ZXN0JzogJ3NvbWUtdGVzdCd9LAorICAgICAgICB9 CisgICAgfSwKKyAgICBidWlsZGVyczogeworICAgICAgICAnYnVpbGRlci0xJzogeworICAgICAg ICAgICAgYnVpbGRlcjogJ3NvbWUgdGVzdGVyJywKKyAgICAgICAgICAgIHByb3BlcnRpZXM6IHtm b3JjZXNjaGVkdWxlcjogJ2ZvcmNlLWFiLXRlc3RzJ30sCisgICAgICAgIH0sCisgICAgICAgICdi dWlsZGVyLTInOiB7CisgICAgICAgICAgICBidWlsZGVyOiAnc29tZSBidWlsZGVyJywKKyAgICAg ICAgICAgIHByb3BlcnRpZXM6IHtmb3JjZXNjaGVkdWxlcjogJ2ZvcmNlLWFiLWJ1aWxkcyd9LAor ICAgICAgICB9LAorICAgICAgICAnYnVpbGRlci0zJzogeworICAgICAgICAgICAgYnVpbGRlcjog J290aGVyIGJ1aWxkZXInLAorICAgICAgICAgICAgcHJvcGVydGllczoge2ZvcmNlc2NoZWR1bGVy OiAnZm9yY2UtYWItYnVpbGRzJ30sCisgICAgICAgIH0sCisgICAgfSwKKyAgICBidWlsZENvbmZp Z3VyYXRpb25zOiBbCisgICAgICAgIHtwbGF0Zm9ybXM6IFsnc29tZSBwbGF0Zm9ybSddLCBidWls ZGVyczogWydidWlsZGVyLTInLCAnYnVpbGRlci0zJ119LAorICAgIF0sCisgICAgdGVzdENvbmZp Z3VyYXRpb25zOiBbCisgICAgICAgIHt0eXBlczogWydzb21lJ10sIHBsYXRmb3JtczogWydzb21l IHBsYXRmb3JtJ10sIGJ1aWxkZXJzOiBbJ2J1aWxkZXItMSddfSwKKyAgICBdLAorfTsKKworY29u c3QgY29uZmlnV2l0aFR3b1Rlc3RlcnMgPSB7CisgICAgdHJpZ2dlcmFibGVOYW1lOiAnYnVpbGQt d2Via2l0JywKKyAgICBsb29rYmFja0NvdW50OiAyLAorICAgIGJ1aWxkUmVxdWVzdEFyZ3VtZW50 OiAnYnVpbGQtcmVxdWVzdC1pZCcsCisgICAgc2xhdmVOYW1lOiAnc3luYy1zbGF2ZScsCisgICAg c2xhdmVQYXNzd29yZDogJ3Bhc3N3b3JkJywKKyAgICByZXBvc2l0b3J5R3JvdXBzOiB7CisgICAg ICAgICd3ZWJraXQnOiB7CisgICAgICAgICAgICByZXBvc2l0b3JpZXM6IHsnV2ViS2l0Jzoge2Fj Y2VwdHNQYXRjaDogdHJ1ZX19LAorICAgICAgICAgICAgdGVzdFByb3BlcnRpZXM6IHsnd2snOiB7 J3JldmlzaW9uJzogJ1dlYktpdCd9LCAncm9vdHMnOiB7J3Jvb3RzJzoge319fSwKKyAgICAgICAg ICAgIGJ1aWxkUHJvcGVydGllczogeyd3ayc6IHsncmV2aXNpb24nOiAnV2ViS2l0J30sICd3ay1w YXRjaCc6IHsncGF0Y2gnOiAnV2ViS2l0J30sCisgICAgICAgICAgICAgICAgJ2NoZWNrYm94Jzog eydpZlJlcG9zaXRvcnlTZXQnOiBbJ1dlYktpdCddLCAndmFsdWUnOiAnYnVpbGQtd2snfSwKKyAg ICAgICAgICAgICAgICAnb3duZWQtY29tbWl0cyc6IHsnb3duZWRSZXZpc2lvbnMnOiAnV2ViS2l0 J319LAorICAgICAgICAgICAgYWNjZXB0c1Jvb3RzOiB0cnVlLAorICAgICAgICB9CisgICAgfSwK KyAgICB0eXBlczogeworICAgICAgICAnc29tZSc6IHsKKyAgICAgICAgICAgIHRlc3Q6IFsnc29t ZSB0ZXN0J10sCisgICAgICAgICAgICBwcm9wZXJ0aWVzOiB7J3Rlc3QnOiAnc29tZS10ZXN0J30s CisgICAgICAgIH0KKyAgICB9LAorICAgIGJ1aWxkZXJzOiB7CisgICAgICAgICdidWlsZGVyLTEn OiB7CisgICAgICAgICAgICBidWlsZGVyOiAnc29tZSB0ZXN0ZXInLAorICAgICAgICAgICAgcHJv cGVydGllczoge2ZvcmNlc2NoZWR1bGVyOiAnZm9yY2UtYWItdGVzdHMnfSwKKyAgICAgICAgfSwK KyAgICAgICAgJ2J1aWxkZXItMic6IHsKKyAgICAgICAgICAgIGJ1aWxkZXI6ICdhbm90aGVyIHRl c3RlcicsCisgICAgICAgICAgICBwcm9wZXJ0aWVzOiB7Zm9yY2VzY2hlZHVsZXI6ICdmb3JjZS1h Yi1idWlsZHMnfSwKKyAgICAgICAgfSwKKyAgICB9LAorICAgIHRlc3RDb25maWd1cmF0aW9uczog WworICAgICAgICB7dHlwZXM6IFsnc29tZSddLCBwbGF0Zm9ybXM6IFsnc29tZSBwbGF0Zm9ybSdd LCBidWlsZGVyczogWydidWlsZGVyLTEnLCAnYnVpbGRlci0yJ119LAorICAgIF0KK307CisKK2Z1 bmN0aW9uIGNyZWF0ZVRyaWdnZXJhYmxlKGNvbmZpZyA9IGNvbmZpZ1dpdGhPbmVUZXN0ZXJUd29C dWlsZGVycykKIHsKICAgICBsZXQgdHJpZ2dlcmFibGU7Ci0gICAgY29uc3QgY29uZmlnID0gewot ICAgICAgICAgICAgdHJpZ2dlcmFibGVOYW1lOiAnYnVpbGQtd2Via2l0JywKLSAgICAgICAgICAg IGxvb2tiYWNrQ291bnQ6IDIsCi0gICAgICAgICAgICBidWlsZFJlcXVlc3RBcmd1bWVudDogJ2J1 aWxkLXJlcXVlc3QtaWQnLAotICAgICAgICAgICAgc2xhdmVOYW1lOiAnc3luYy1zbGF2ZScsCi0g ICAgICAgICAgICBzbGF2ZVBhc3N3b3JkOiAncGFzc3dvcmQnLAotICAgICAgICAgICAgcmVwb3Np dG9yeUdyb3VwczogewotICAgICAgICAgICAgICAgICd3ZWJraXQnOiB7Ci0gICAgICAgICAgICAg ICAgICAgIHJlcG9zaXRvcmllczogeydXZWJLaXQnOiB7YWNjZXB0c1BhdGNoOiB0cnVlfX0sCi0g ICAgICAgICAgICAgICAgICAgIHRlc3RQcm9wZXJ0aWVzOiB7J3drJzogeydyZXZpc2lvbic6ICdX ZWJLaXQnfSwgJ3Jvb3RzJzogeydyb290cyc6IHt9fX0sCi0gICAgICAgICAgICAgICAgICAgIGJ1 aWxkUHJvcGVydGllczogeyd3ayc6IHsncmV2aXNpb24nOiAnV2ViS2l0J30sICd3ay1wYXRjaCc6 IHsncGF0Y2gnOiAnV2ViS2l0J30sCi0gICAgICAgICAgICAgICAgICAgICAgICAnY2hlY2tib3gn OiB7J2lmUmVwb3NpdG9yeVNldCc6IFsnV2ViS2l0J10sICd2YWx1ZSc6ICdidWlsZC13ayd9LAot ICAgICAgICAgICAgICAgICAgICAgICAgJ293bmVkLWNvbW1pdHMnOiB7J293bmVkUmV2aXNpb25z JzogJ1dlYktpdCd9fSwKLSAgICAgICAgICAgICAgICAgICAgYWNjZXB0c1Jvb3RzOiB0cnVlLAot ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB0eXBlczogewot ICAgICAgICAgICAgICAgICdzb21lJzogewotICAgICAgICAgICAgICAgICAgICB0ZXN0OiBbJ3Nv bWUgdGVzdCddLAotICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzOiB7J3Rlc3QnOiAnc29t ZS10ZXN0J30sCi0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfSwKLSAgICAgICAgICAg IGJ1aWxkZXJzOiB7Ci0gICAgICAgICAgICAgICAgJ2J1aWxkZXItMSc6IHsKLSAgICAgICAgICAg ICAgICAgICAgYnVpbGRlcjogJ3NvbWUgdGVzdGVyJywKLSAgICAgICAgICAgICAgICAgICAgcHJv cGVydGllczoge2ZvcmNlc2NoZWR1bGVyOiAnZm9yY2UtYWItdGVzdHMnfSwKLSAgICAgICAgICAg ICAgICB9LAotICAgICAgICAgICAgICAgICdidWlsZGVyLTInOiB7Ci0gICAgICAgICAgICAgICAg ICAgIGJ1aWxkZXI6ICdzb21lIGJ1aWxkZXInLAotICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0 aWVzOiB7Zm9yY2VzY2hlZHVsZXI6ICdmb3JjZS1hYi1idWlsZHMnfSwKLSAgICAgICAgICAgICAg ICB9LAotICAgICAgICAgICAgICAgICdidWlsZGVyLTMnOiB7Ci0gICAgICAgICAgICAgICAgICAg IGJ1aWxkZXI6ICdvdGhlciBidWlsZGVyJywKLSAgICAgICAgICAgICAgICAgICAgcHJvcGVydGll czoge2ZvcmNlc2NoZWR1bGVyOiAnZm9yY2UtYWItYnVpbGRzJ30sCi0gICAgICAgICAgICAgICAg fSwKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICBidWlsZENvbmZpZ3VyYXRpb25zOiBbCi0g ICAgICAgICAgICAgICAge3BsYXRmb3JtczogWydzb21lIHBsYXRmb3JtJ10sIGJ1aWxkZXJzOiBb J2J1aWxkZXItMicsICdidWlsZGVyLTMnXX0sCi0gICAgICAgICAgICBdLAotICAgICAgICAgICAg dGVzdENvbmZpZ3VyYXRpb25zOiBbCi0gICAgICAgICAgICAgICAge3R5cGVzOiBbJ3NvbWUnXSwg cGxhdGZvcm1zOiBbJ3NvbWUgcGxhdGZvcm0nXSwgYnVpbGRlcnM6IFsnYnVpbGRlci0xJ119LAot ICAgICAgICAgICAgXSwKLSAgICAgICAgfTsKICAgICByZXR1cm4gTW9ja0RhdGEuYWRkTW9ja0Nv bmZpZ3VyYXRpb24oVGVzdFNlcnZlci5kYXRhYmFzZSgpKS50aGVuKCgpID0+IHsKICAgICAgICAg cmV0dXJuIE1hbmlmZXN0LmZldGNoKCk7CiAgICAgfSkudGhlbigoKSA9PiB7CkBAIC02OSw2ICsx MDcsMTggQEAgZnVuY3Rpb24gY3JlYXRlVHJpZ2dlcmFibGUoKQogICAgIH0pOwogfQogCitmdW5j dGlvbiBjcmVhdGVUZXN0R3JvdXAodGFza19uYW1lPSdjdXN0b20gdGFzaycpIHsKKyAgICBjb25z dCBzb21lVGVzdCA9IFRlc3QuZmluZEJ5SWQoTW9ja0RhdGEuc29tZVRlc3RJZCgpKTsKKyAgICBj b25zdCB3ZWJraXQgPSBSZXBvc2l0b3J5LmZpbmRCeUlkKE1vY2tEYXRhLndlYmtpdFJlcG9zaXRv cnlJZCgpKTsKKyAgICBjb25zdCBzZXQxID0gbmV3IEN1c3RvbUNvbW1pdFNldDsKKyAgICBzZXQx LnNldFJldmlzaW9uRm9yUmVwb3NpdG9yeSh3ZWJraXQsICcxOTE2MjInKTsKKyAgICBjb25zdCBz ZXQyID0gbmV3IEN1c3RvbUNvbW1pdFNldDsKKyAgICBzZXQyLnNldFJldmlzaW9uRm9yUmVwb3Np dG9yeSh3ZWJraXQsICcxOTI3MzYnKTsKKyAgICByZXR1cm4gVGVzdEdyb3VwLmNyZWF0ZVdpdGhU YXNrKCdjdXN0b20gdGFzaycsIFBsYXRmb3JtLmZpbmRCeUlkKE1vY2tEYXRhLnNvbWVQbGF0Zm9y bUlkKCkpLCBzb21lVGVzdCwgJ3NvbWUgZ3JvdXAnLCAyLCBbc2V0MSwgc2V0Ml0pLnRoZW4oKHRh c2spID0+IHsKKyAgICAgICAgcmV0dXJuIFRlc3RHcm91cC5maW5kQWxsQnlUYXNrKHRhc2suaWQo KSlbMF07CisgICAgfSk7Cit9CisKIGZ1bmN0aW9uIGNyZWF0ZVRlc3RHcm91cFdpaFBhdGNoKCkK IHsKICAgICByZXR1cm4gVGVtcG9yYXJ5RmlsZS5tYWtlVGVtcG9yYXJ5RmlsZSgncGF0Y2guZGF0 JywgJ3BhdGNoIGZpbGUnKS50aGVuKChwYXRjaEZpbGUpID0+IHsKQEAgLTEzMyw2ICsxODMsOTMg QEAgZGVzY3JpYmUoJ3N5bmMtYnVpbGRib3QnLCBmdW5jdGlvbiAoKSB7CiAgICAgICAgIHJlcXVl c3QucmVzb2x2ZShjb250ZW50VG9SZXNvbHZlKTsKICAgICB9CiAKKyAgICBpdCgnc2hvdWxkIG5v dCBzY2hlZHVsZSBvbiBhbm90aGVyIGJ1aWxkZXIgaWYgdGhlIGJ1aWxkIHdhcyBzY2hlZHVsZWQg b24gb25lIGJ1aWxkZXIgYmVmb3JlJywgKCkgPT4geworICAgICAgICBjb25zdCByZXF1ZXN0cyA9 IE1vY2tSZW1vdGVBUEkucmVxdWVzdHM7CisgICAgICAgIGxldCBmaXJzdFRlc3RHcm91cDsKKyAg ICAgICAgbGV0IHNlY29uZFRlc3RHcm91cDsKKyAgICAgICAgbGV0IHN5bmNQcm9taXNlOworICAg ICAgICBsZXQgdHJpZ2dlcmFibGU7CisgICAgICAgIGxldCB0YXNrSWQgPSBudWxsOworICAgICAg ICBsZXQgYW5vdGhlclRhc2tJZCA9IG51bGw7CisgICAgICAgIHJldHVybiBjcmVhdGVUcmlnZ2Vy YWJsZShjb25maWdXaXRoVHdvVGVzdGVycykudGhlbigobmV3VHJpZ2dlcmFibGUpID0+IHsKKyAg ICAgICAgICAgIHRyaWdnZXJhYmxlID0gbmV3VHJpZ2dlcmFibGU7CisgICAgICAgICAgICByZXR1 cm4gUHJvbWlzZS5hbGwoW2NyZWF0ZVRlc3RHcm91cCgpLCBjcmVhdGVUZXN0R3JvdXAoJ2Fub3Ro ZXIgY3VzdG9tIHRhc2snKV0pOworICAgICAgICB9KS50aGVuKCh0ZXN0R3JvdXBzKSA9PiB7Cisg ICAgICAgICAgICBmaXJzdFRlc3RHcm91cCA9IHRlc3RHcm91cHNbMF07CisgICAgICAgICAgICBz ZWNvbmRUZXN0R3JvdXAgPSB0ZXN0R3JvdXBzWzFdOworICAgICAgICAgICAgdGFza0lkID0gZmly c3RUZXN0R3JvdXAudGFzaygpLmlkKCk7CisgICAgICAgICAgICBhbm90aGVyVGFza0lkID0gc2Vj b25kVGVzdEdyb3VwLnRhc2soKS5pZCgpOworICAgICAgICAgICAgc3luY1Byb21pc2UgPSB0cmln Z2VyYWJsZS5pbml0U3luY2VycygpLnRoZW4oKCkgPT4gdHJpZ2dlcmFibGUuc3luY09uY2UoKSk7 CisgICAgICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9yUmVxdWVzdCgpOworICAg ICAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5s ZW5ndGgsIDIpOworICAgICAgICAgICAgYXNzZXJ0QW5kUmVzb2x2ZVJlcXVlc3QocmVxdWVzdHNb MF0sICdHRVQnLCAnL2pzb24vYnVpbGRlcnMvc29tZSUyMHRlc3Rlci9wZW5kaW5nQnVpbGRzJywg W01vY2tEYXRhLnBlbmRpbmdCdWlsZCh7YnVpbGRlcjogJ3NvbWUgdGVzdGVyJywgYnVpbGRSZXF1 ZXN0SWQ6IDV9KV0pOworICAgICAgICAgICAgYXNzZXJ0QW5kUmVzb2x2ZVJlcXVlc3QocmVxdWVz dHNbMV0sICdHRVQnLCAnL2pzb24vYnVpbGRlcnMvYW5vdGhlciUyMHRlc3Rlci9wZW5kaW5nQnVp bGRzJywgW10pOworICAgICAgICAgICAgcmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZvclJlcXVl c3QoKTsKKyAgICAgICAgfSkudGhlbigoKSA9PiB7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwo cmVxdWVzdHMubGVuZ3RoLCA0KTsKKyAgICAgICAgICAgIGFzc2VydEFuZFJlc29sdmVSZXF1ZXN0 KHJlcXVlc3RzWzJdLCAnR0VUJywgJy9qc29uL2J1aWxkZXJzL3NvbWUlMjB0ZXN0ZXIvYnVpbGRz Lz9zZWxlY3Q9LTEmc2VsZWN0PS0yJywgeworICAgICAgICAgICAgICAgIFstMV06IE1vY2tEYXRh LnJ1bm5pbmdCdWlsZCh7YnVpbGRlcjogJ3NvbWUgdGVzdGVyJywgYnVpbGRSZXF1ZXN0SWQ6IDF9 KX0pOworICAgICAgICAgICAgYXNzZXJ0QW5kUmVzb2x2ZVJlcXVlc3QocmVxdWVzdHNbM10sICdH RVQnLCAnL2pzb24vYnVpbGRlcnMvYW5vdGhlciUyMHRlc3Rlci9idWlsZHMvP3NlbGVjdD0tMSZz ZWxlY3Q9LTInLCB7fSk7CisgICAgICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9y UmVxdWVzdCgpOworICAgICAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgIGFzc2VydC5l cXVhbChyZXF1ZXN0cy5sZW5ndGgsIDYpOworICAgICAgICAgICAgYXNzZXJ0QW5kUmVzb2x2ZVJl cXVlc3QocmVxdWVzdHNbNF0sICdHRVQnLCAnL2pzb24vYnVpbGRlcnMvc29tZSUyMHRlc3Rlci9w ZW5kaW5nQnVpbGRzJywgW10pOworICAgICAgICAgICAgYXNzZXJ0QW5kUmVzb2x2ZVJlcXVlc3Qo cmVxdWVzdHNbNV0sICdHRVQnLCAnL2pzb24vYnVpbGRlcnMvYW5vdGhlciUyMHRlc3Rlci9wZW5k aW5nQnVpbGRzJyxbXSk7CisgICAgICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9y UmVxdWVzdCgpOworICAgICAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgIGFzc2VydC5l cXVhbChyZXF1ZXN0cy5sZW5ndGgsIDgpOworICAgICAgICAgICAgYXNzZXJ0QW5kUmVzb2x2ZVJl cXVlc3QocmVxdWVzdHNbNl0sICdHRVQnLCAnL2pzb24vYnVpbGRlcnMvc29tZSUyMHRlc3Rlci9i dWlsZHMvP3NlbGVjdD0tMSZzZWxlY3Q9LTInLCB7CisgICAgICAgICAgICAgICAgWy0xXTogTW9j a0RhdGEucnVubmluZ0J1aWxkKHtidWlsZGVyOiAnc29tZSB0ZXN0ZXInLCBidWlsZFJlcXVlc3RJ ZDogNX0pLAorICAgICAgICAgICAgICAgIFstMl06IE1vY2tEYXRhLmZpbmlzaGVkQnVpbGQoe2J1 aWxkZXI6ICdzb21lIHRlc3RlcicsIGJ1aWxkUmVxdWVzdElkOiAxfSkKKyAgICAgICAgICAgIH0p OworICAgICAgICAgICAgYXNzZXJ0QW5kUmVzb2x2ZVJlcXVlc3QocmVxdWVzdHNbN10sICdHRVQn LCAnL2pzb24vYnVpbGRlcnMvYW5vdGhlciUyMHRlc3Rlci9idWlsZHMvP3NlbGVjdD0tMSZzZWxl Y3Q9LTInLCB7fSk7CisgICAgICAgICAgICByZXR1cm4gc3luY1Byb21pc2U7CisgICAgICAgIH0p LnRoZW4oKCkgPT4geworICAgICAgICAgICAgcmV0dXJuIFRlc3RHcm91cC5mZXRjaEZvclRhc2so dGFza0lkLCB0cnVlKTsKKyAgICAgICAgfSkudGhlbigodGVzdEdyb3VwcykgPT4geworICAgICAg ICAgICAgYXNzZXJ0LmVxdWFsKHRlc3RHcm91cHMubGVuZ3RoLCAxKTsKKyAgICAgICAgICAgIGNv bnN0IHRlc3RHcm91cCA9IHRlc3RHcm91cHNbMF07CisgICAgICAgICAgICBjb25zdCB3ZWJraXQg PSBSZXBvc2l0b3J5LmZpbmRCeUlkKE1vY2tEYXRhLndlYmtpdFJlcG9zaXRvcnlJZCgpKTsKKwor ICAgICAgICAgICAgY29uc3QgYnVpbGRSZXF1ZXN0ID0gdGVzdEdyb3VwLmJ1aWxkUmVxdWVzdHMo KVswXTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbCh0ZXN0R3JvdXAuYnVpbGRSZXF1ZXN0cygp Lmxlbmd0aCwgNCk7CisgICAgICAgICAgICBhc3NlcnQoIWJ1aWxkUmVxdWVzdC5pc0J1aWxkKCkp OworICAgICAgICAgICAgYXNzZXJ0KGJ1aWxkUmVxdWVzdC5pc1Rlc3QoKSk7CisKKyAgICAgICAg ICAgIGNvbnN0IGNvbW1pdFNldCA9IGJ1aWxkUmVxdWVzdC5jb21taXRTZXQoKTsKKyAgICAgICAg ICAgIGFzc2VydC5lcXVhbChjb21taXRTZXQucmV2aXNpb25Gb3JSZXBvc2l0b3J5KHdlYmtpdCks ICcxOTE2MjInKTsKKworICAgICAgICAgICAgY29uc3Qgb3RoZXJCdWlsZFJlcXVlc3QgPSB0ZXN0 R3JvdXAuYnVpbGRSZXF1ZXN0cygpWzFdOworICAgICAgICAgICAgYXNzZXJ0KCFvdGhlckJ1aWxk UmVxdWVzdC5pc0J1aWxkKCkpOworICAgICAgICAgICAgYXNzZXJ0KG90aGVyQnVpbGRSZXF1ZXN0 LmlzVGVzdCgpKTsKKworICAgICAgICAgICAgY29uc3Qgb3RoZXJDb21taXRTZXQgPSBvdGhlckJ1 aWxkUmVxdWVzdC5jb21taXRTZXQoKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChvdGhlckNv bW1pdFNldC5yZXZpc2lvbkZvclJlcG9zaXRvcnkod2Via2l0KSwgJzE5MjczNicpOworCisgICAg ICAgICAgICByZXR1cm4gVGVzdEdyb3VwLmZldGNoRm9yVGFzayhhbm90aGVyVGFza0lkLCB0cnVl KTsKKyAgICAgICAgfSkudGhlbigodGVzdEdyb3VwcykgPT4geworICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKHRlc3RHcm91cHMubGVuZ3RoLCAxKTsKKyAgICAgICAgICAgIGNvbnN0IHRlc3RHcm91 cCA9IHRlc3RHcm91cHNbMF07CisgICAgICAgICAgICBjb25zdCB3ZWJraXQgPSBSZXBvc2l0b3J5 LmZpbmRCeUlkKE1vY2tEYXRhLndlYmtpdFJlcG9zaXRvcnlJZCgpKTsKKworICAgICAgICAgICAg Y29uc3QgYnVpbGRSZXF1ZXN0ID0gdGVzdEdyb3VwLmJ1aWxkUmVxdWVzdHMoKVswXTsKKyAgICAg ICAgICAgIGFzc2VydC5lcXVhbCh0ZXN0R3JvdXAuYnVpbGRSZXF1ZXN0cygpLmxlbmd0aCwgNCk7 CisgICAgICAgICAgICBhc3NlcnQoIWJ1aWxkUmVxdWVzdC5pc0J1aWxkKCkpOworICAgICAgICAg ICAgYXNzZXJ0KGJ1aWxkUmVxdWVzdC5pc1Rlc3QoKSk7CisKKyAgICAgICAgICAgIGNvbnN0IGNv bW1pdFNldCA9IGJ1aWxkUmVxdWVzdC5jb21taXRTZXQoKTsKKyAgICAgICAgICAgIGFzc2VydC5l cXVhbChjb21taXRTZXQucmV2aXNpb25Gb3JSZXBvc2l0b3J5KHdlYmtpdCksICcxOTE2MjInKTsK KworICAgICAgICAgICAgY29uc3Qgb3RoZXJCdWlsZFJlcXVlc3QgPSB0ZXN0R3JvdXAuYnVpbGRS ZXF1ZXN0cygpWzFdOworICAgICAgICAgICAgYXNzZXJ0KCFvdGhlckJ1aWxkUmVxdWVzdC5pc0J1 aWxkKCkpOworICAgICAgICAgICAgYXNzZXJ0KG90aGVyQnVpbGRSZXF1ZXN0LmlzVGVzdCgpKTsK KworICAgICAgICAgICAgY29uc3Qgb3RoZXJDb21taXRTZXQgPSBvdGhlckJ1aWxkUmVxdWVzdC5j b21taXRTZXQoKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChvdGhlckNvbW1pdFNldC5yZXZp c2lvbkZvclJlcG9zaXRvcnkod2Via2l0KSwgJzE5MjczNicpOworICAgICAgICB9KTsKKyAgICB9 KTsKKwogICAgIGl0KCdzaG91bGQgc2NoZWR1bGUgYSBidWlsZCB0byBidWlsZCBhIHBhdGNoJywg KCkgPT4gewogICAgICAgICBjb25zdCByZXF1ZXN0cyA9IE1vY2tSZW1vdGVBUEkucmVxdWVzdHM7 CiAgICAgICAgIGxldCB0cmlnZ2VyYWJsZTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy90b29scy9qcy9idWlsZGJvdC10cmlnZ2VyYWJsZS5qcyBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy90b29scy9qcy9idWlsZGJvdC10cmlnZ2VyYWJsZS5qcwppbmRleCAxYmYxOTFk MzU2YmY2NWQ4NzIzZjg5NjE2MDZjNjIyNTNhNjA4NzY4Li4xMDM1MmFhOTI2MzhlNDdlNzNiYjVm NGZiMjZhMTI0MWI0MGE3MmViIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv dG9vbHMvanMvYnVpbGRib3QtdHJpZ2dlcmFibGUuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXRyaWdnZXJhYmxlLmpzCkBAIC0xNTQsMTcgKzE1NCwx OSBAQCBjbGFzcyBCdWlsZGJvdFRyaWdnZXJhYmxlIHsKIAogICAgICAgICAgICAgICAgICAgICBj b25zdCBpbmZvID0gYnVpbGRSZXFldXN0c0J5R3JvdXAuZ2V0KHJlcXVlc3QudGVzdEdyb3VwSWQo KSk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChyZXF1ZXN0LmlzQnVpbGQoKSkgewotICAgICAg ICAgICAgICAgICAgICAgICAgYXNzZXJ0KCFpbmZvLmJ1aWxkU3luY2VyIHx8IGluZm8uYnVpbGRT eW5jZXIgPT0gYnVpbGRTeW5jZXIpOworICAgICAgICAgICAgICAgICAgICAgICAgYXNzZXJ0KCFp bmZvLmJ1aWxkU3luY2VyIHx8IGluZm8uYnVpbGRTeW5jZXIgPT0gc3luY2VyKTsKICAgICAgICAg ICAgICAgICAgICAgICAgIGlmIChlbnRyeS5zbGF2ZU5hbWUoKSkgewogICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGFzc2VydCghaW5mby5idWlsZFNsYXZlTmFtZSB8fCBpbmZvLmJ1aWxkU2xh dmVOYW1lID09IGVudHJ5LnNsYXZlTmFtZSgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbmZvLmJ1aWxkU2xhdmVOYW1lID0gZW50cnkuc2xhdmVOYW1lKCk7CiAgICAgICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLmJ1aWxkU3luY2VyID0g c3luY2VyOwogICAgICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAg ICAgICAgYXNzZXJ0KCFpbmZvLnRlc3RTeW5jZXIgfHwgaW5mby50ZXN0U3luY2VyID09IHRlc3RT eW5jZXIpOworICAgICAgICAgICAgICAgICAgICAgICAgYXNzZXJ0KCFpbmZvLnRlc3RTeW5jZXIg fHwgaW5mby50ZXN0U3luY2VyID09IHN5bmNlcik7CiAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAoZW50cnkuc2xhdmVOYW1lKCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhc3Nl cnQoIWluZm8udGVzdFNsYXZlTmFtZSB8fCBpbmZvLnRlc3RTbGF2ZU5hbWUgPT0gZW50cnkuc2xh dmVOYW1lKCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZm8udGVzdFNsYXZlTmFt ZSA9IGVudHJ5LnNsYXZlTmFtZSgpOwogICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgICAgICAgICAgaW5mby50ZXN0U3luY2VyID0gc3luY2VyOwogICAgICAgICAgICAg ICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAgICAgY29uc3QgbmV3U3RhdHVzID0gZW50cnku YnVpbGRSZXF1ZXN0U3RhdHVzSWZVcGRhdGVJc05lZWRlZChyZXF1ZXN0KTsKQEAgLTIzOCw3ICsy NDAsNyBAQCBjbGFzcyBCdWlsZGJvdFRyaWdnZXJhYmxlIHsKICAgICAgICAgZm9yIChsZXQgcmVx dWVzdCBvZiBidWlsZFJlcXVlc3RzKSB7CiAgICAgICAgICAgICBsZXQgZ3JvdXBJZCA9IHJlcXVl c3QudGVzdEdyb3VwSWQoKTsKICAgICAgICAgICAgIGlmICghbWFwLmhhcyhncm91cElkKSkgLy8g RG9uJ3QgdXNlIHJlYWwgVGVzdEdyb3VwIG9iamVjdHMgdG8gYXZvaWQgZXhlY3V0aW5nIHBvc3Rn cmVzIHF1ZXJ5IGluIHRoZSBzZXJ2ZXIKLSAgICAgICAgICAgICAgICBtYXAuc2V0KGdyb3VwSWQs IHtpZDogZ3JvdXBJZCwgZ3JvdXBPcmRlcjogZ3JvdXBPcmRlcisrLCByZXF1ZXN0czogW3JlcXVl c3RdLCBzeW5jZXI6IG51bGwsIHNsYXZlTmFtZTogbnVsbH0pOworICAgICAgICAgICAgICAgIG1h cC5zZXQoZ3JvdXBJZCwge2lkOiBncm91cElkLCBncm91cE9yZGVyOiBncm91cE9yZGVyKyssIHJl cXVlc3RzOiBbcmVxdWVzdF0sIGJ1aWxkU3luY2VyOiBudWxsLCB0ZXN0U3luY2VyOiBudWxsLCBz bGF2ZU5hbWU6IG51bGx9KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBtYXAu Z2V0KGdyb3VwSWQpLnJlcXVlc3RzLnB1c2gocmVxdWVzdCk7CiAgICAgICAgIH0K