92719 2012-07-31 00:25:51 -0700 [EFL][WK2] WTR is failing when X server is not running 2012-08-02 05:56:39 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 92643 1 alexander.shalamov alexander.shalamov abarth cdumez dpranke d-r kenneth morrita ojan tonikitoo webkit.review.bot oldest_to_newest 682780 0 alexander.shalamov 2012-07-31 00:25:51 -0700 All layout tests are crashing on build bot, since the X server is not running. 682788 1 155456 alexander.shalamov 2012-07-31 00:37:21 -0700 Created attachment 155456 Patch Remove extra checks for ecore_x_init initialisation 682798 2 155456 cdumez 2012-07-31 00:56:36 -0700 Comment on attachment 155456 Patch This is hardly a fix. It will still fail / crash later when you call ecore_x functions I believe. For example, with use ecore_x to emit a system beep. 682803 3 alexander.shalamov 2012-07-31 01:04:44 -0700 (In reply to comment #2) > (From update of attachment 155456 [details]) > This is hardly a fix. It will still fail / crash later when you call ecore_x functions I believe. For example, with use ecore_x to emit a system beep. Yes it will crash in the same way as WK1 build bot. I could remove dependency to ecore_x calls completely, as it was done for WK1 DRT. Would it be better? 682808 4 cdumez 2012-07-31 01:12:59 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 155456 [details] [details]) > > This is hardly a fix. It will still fail / crash later when you call ecore_x functions I believe. For example, with use ecore_x to emit a system beep. > > Yes it will crash in the same way as WK1 build bot. I could remove dependency to ecore_x calls completely, as it was done for WK1 DRT. Would it be better? Hmm. I was wondering if we could find a way to to handle this better. Basically, what we would need is a function in WebCore to tell us if we running X. And we should call this function before making any ecore_x call (there are not many). Maybe we could use the DISPLAY environment variable to do such check? We need to verify on the build bot that the DISPLAY variable is not set. 682917 5 155491 alexander.shalamov 2012-07-31 04:36:41 -0700 Created attachment 155491 Patch Use DISPLAY environment variable to identify if X server is running. 682923 6 155491 cdumez 2012-07-31 04:44:51 -0700 Comment on attachment 155491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155491&action=review Don't forget to unskip system beep test. > Tools/WebKitTestRunner/efl/main.cpp:36 > + const char* display = getenv("DISPLAY"); I would move the display detection code to WebCore in platform/efl/ScreenUtilities.h since it needs to be used in other places (for example in SystemBeep before calling score_x_beep() function). BTW, this is missing from your patch so it will still crash. 682928 7 cdumez 2012-07-31 04:57:56 -0700 (In reply to comment #6) > (From update of attachment 155491 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155491&action=review > > Don't forget to unskip system beep test. > > > Tools/WebKitTestRunner/efl/main.cpp:36 > > + const char* display = getenv("DISPLAY"); > > I would move the display detection code to WebCore in platform/efl/ScreenUtilities.h since it needs to be used in other places (for example in SystemBeep before calling score_x_beep() function). BTW, this is missing from your patch so it will still crash. Nevermind, we can fix the crasher in a separate patch since the test is skipped. LGTM. 685055 8 155491 morrita 2012-08-02 00:40:18 -0700 Comment on attachment 155491 Patch rubberstamping. 685056 9 155491 webkit.review.bot 2012-08-02 00:42:17 -0700 Comment on attachment 155491 Patch Rejecting attachment 155491 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: cceeded at 1 with fuzz 3. patching file Tools/Scripts/webkitpy/layout_tests/port/efl.py patching file Tools/WebKitTestRunner/efl/main.cpp Hunk #1 FAILED at 21. Hunk #2 succeeded at 35 (offset 3 lines). Hunk #3 succeeded at 50 (offset 3 lines). 1 out of 3 hunks FAILED -- saving rejects to file Tools/WebKitTestRunner/efl/main.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Hajime Mor..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/13428090 685135 10 156017 alexander.shalamov 2012-08-02 02:21:31 -0700 Created attachment 156017 Patch Rebased to master 685274 11 156017 webkit.review.bot 2012-08-02 05:56:33 -0700 Comment on attachment 156017 Patch Clearing flags on attachment: 156017 Committed r124445: <http://trac.webkit.org/changeset/124445> 685275 12 webkit.review.bot 2012-08-02 05:56:39 -0700 All reviewed patches have been landed. Closing bug. 155456 2012-07-31 00:37:21 -0700 2012-07-31 04:36:41 -0700 Patch efl_fix_wtr_x_server.patch text/plain 1206 alexander.shalamov ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZDhl ZDc5Li5lOTc2MTg3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDctMzEgIEFsZXhhbmRlciBTaGFsYW1vdiAg PGFsZXhhbmRlci5zaGFsYW1vdkBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBXVFIg aXMgZmFpbGluZyB3aGVuIFggc2VydmVyIGlzIG5vdCBydW5uaW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjcxOQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVGTCdzIFdlYktpdFRlc3RSdW5uZXIgZG9l c24ndCBleGVjdXRlIHRlc3RzIHdoZW4gWCBzZXJ2ZXIgaXMgbm90IHJ1bm5pbmcuCisgICAgICAg IFRoaXMgcGF0Y2ggZml4ZXMgdGhlIHByb2JsZW0gYnkgcmVtb3ZpbmcgY2hlY2tzIGZvciBlY29y ZSB4IGluaXRpYWxpemF0aW9uLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9lZmwvbWFp bi5jcHA6CisgICAgICAgIChtYWluKToKKwogMjAxMi0wNy0zMCAgTWlraGFpbCBQb3pkbnlha292 ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXVFJdIEVu Zm9yY2UgU0hJRlQgbW9kaWZpZXIgdG8gdXBwZXIgY2FzZSBrZXlzIGluIGV2ZW50IHNlbmRlci4K ZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZWZsL21haW4uY3BwIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9lZmwvbWFpbi5jcHAKaW5kZXggYzg2NGFjMS4uYjhiOTczOSAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9lZmwvbWFpbi5jcHAKKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9lZmwvbWFpbi5jcHAKQEAgLTMyLDEwICszMiw3IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyKiogYXJndikKICAgICAgICAgcmV0dXJuIDE7CiAKICNpZmRlZiBIQVZF X0VDT1JFX1gKLSAgICBpZiAoIWVjb3JlX3hfaW5pdCgwKSkgewotICAgICAgICBld2tfc2h1dGRv d24oKTsKLSAgICAgICAgcmV0dXJuIDE7Ci0gICAgfQorICAgIGVjb3JlX3hfaW5pdCgwKTsKICNl bmRpZgogCiAgICAgLy8gUHJlZmVyIHRoZSBub3QgaW5zdGFsbGVkIHdlYiBhbmQgcGx1Z2luIHBy b2Nlc3Nlcy4K 155491 2012-07-31 04:36:41 -0700 2012-08-02 02:21:31 -0700 Patch efl_fix_wtr_x_server_2.patch text/plain 3032 alexander.shalamov ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZDhl ZDc5Li5kZGFkYWFkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDctMzEgIEFsZXhhbmRlciBTaGFsYW1vdiAg PGFsZXhhbmRlci5zaGFsYW1vdkBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBXVFIg aXMgZmFpbGluZyB3aGVuIFggc2VydmVyIGlzIG5vdCBydW5uaW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjcxOQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVGTCdzIFdlYktpdFRlc3RSdW5uZXIgZG9l c24ndCBleGVjdXRlIHRlc3RzIHdoZW4gWCBzZXJ2ZXIgaXMgbm90IHJ1bm5pbmcuCisgICAgICAg IFRoaXMgcGF0Y2ggZml4ZXMgdGhlIHByb2JsZW0gYnkgY2hlY2tpbmcgZW52aXJvbm1lbnQgdmFy aWFibGUgYmVmb3JlIGVjb3JlIHggaW5pdGlhbGl6YXRpb24uCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2VmbC5weToKKyAgICAgICAgKEVmbFBvcnQuc2V0 dXBfZW52aXJvbl9mb3Jfc2VydmVyKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2VmbC9t YWluLmNwcDoKKyAgICAgICAgKG1haW4pOgorCiAyMDEyLTA3LTMwICBNaWtoYWlsIFBvemRueWFr b3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdW1dUUl0g RW5mb3JjZSBTSElGVCBtb2RpZmllciB0byB1cHBlciBjYXNlIGtleXMgaW4gZXZlbnQgc2VuZGVy LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9l ZmwucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2VmbC5weQpp bmRleCAyNWE4MWQyLi5lNTYzNTc0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2VmbC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2VmbC5weQpAQCAtMjcsNiArMjcsOCBAQAogCiAiIiJXZWJLaXQgRWZs IGltcGxlbWVudGF0aW9uIG9mIHRoZSBQb3J0IGludGVyZmFjZS4iIiIKIAoraW1wb3J0IG9zCisK IGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1w b3J0IFRlc3RDb25maWd1cmF0aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0LmJh c2UgaW1wb3J0IFBvcnQKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQucHVsc2VhdWRp b19zYW5pdGl6ZXIgaW1wb3J0IFB1bHNlQXVkaW9TYW5pdGl6ZXIKQEAgLTUxLDYgKzUzLDEwIEBA IGNsYXNzIEVmbFBvcnQoUG9ydCwgUHVsc2VBdWRpb1Nhbml0aXplcik6CiAKICAgICBkZWYgc2V0 dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlbGYsIHNlcnZlcl9uYW1lPU5vbmUpOgogICAgICAgICBl bnYgPSBzdXBlcihFZmxQb3J0LCBzZWxmKS5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VydmVy X25hbWUpCisgICAgICAgICMgSWYgRElTUExBWSBlbnZpcm9ubWVudCB2YXJpYWJsZSBpcyB1bnNl dCBpbiB0aGUgc3lzdGVtCisgICAgICAgICMgZS5nLiBvbiBidWlsZCBib3QsIHJlbW92ZSBESVNQ TEFZIHZhcmlhYmxlIGZyb20gdGhlIGRpY3Rpb25hcnkKKyAgICAgICAgaWYgbm90ICdESVNQTEFZ JyBpbiBvcy5lbnZpcm9uOgorICAgICAgICAgICAgZGVsIGVudlsnRElTUExBWSddCiAgICAgICAg IGVudlsnVEVTVF9SVU5ORVJfSU5KRUNURURfQlVORExFX0ZJTEVOQU1FJ10gPSBzZWxmLl9idWls ZF9wYXRoKCdsaWInLCAnbGliVGVzdFJ1bm5lckluamVjdGVkQnVuZGxlLnNvJykKICAgICAgICAg ZW52WydURVNUX1JVTk5FUl9QTFVHSU5fUEFUSCddID0gc2VsZi5fYnVpbGRfcGF0aCgnbGliJykK ICAgICAgICAgaWYgc2VsZi53ZWJwcm9jZXNzX2NtZF9wcmVmaXg6CmRpZmYgLS1naXQgYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL2VmbC9tYWluLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv ZWZsL21haW4uY3BwCmluZGV4IGM4NjRhYzEuLmRhMDQzNzAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvZWZsL21haW4uY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv ZWZsL21haW4uY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAKICNpbmNsdWRlICJFV2ViS2l0Mi5oIgog I2luY2x1ZGUgIlRlc3RDb250cm9sbGVyLmgiCisjaW5jbHVkZSA8c3RkbGliLmg+CiAKICNpZmRl ZiBIQVZFX0VDT1JFX1gKICNpbmNsdWRlIDxFY29yZV9YLmg+CkBAIC0zMiw5ICszMywxNCBAQCBp bnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgICAgICAgIHJldHVybiAxOwogCiAjaWZk ZWYgSEFWRV9FQ09SRV9YCi0gICAgaWYgKCFlY29yZV94X2luaXQoMCkpIHsKLSAgICAgICAgZXdr X3NodXRkb3duKCk7Ci0gICAgICAgIHJldHVybiAxOworICAgIGNvbnN0IGNoYXIqIGRpc3BsYXkg PSBnZXRlbnYoIkRJU1BMQVkiKTsKKyAgICBpbnQgaW50aWFsaXplZCA9IDA7CisgICAgaWYgKGRp c3BsYXkpIHsKKyAgICAgICAgaW50aWFsaXplZCA9IGVjb3JlX3hfaW5pdCgwKTsKKyAgICAgICAg aWYgKCFpbnRpYWxpemVkKSB7CisgICAgICAgICAgICBld2tfc2h1dGRvd24oKTsKKyAgICAgICAg ICAgIHJldHVybiAxOworICAgICAgICB9CiAgICAgfQogI2VuZGlmCiAKQEAgLTQyLDcgKzQ4LDgg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgIFdUUjo6VGVzdENvbnRyb2xs ZXIgY29udHJvbGxlcihhcmdjLCBjb25zdF9jYXN0PGNvbnN0IGNoYXIqKj4oYXJndikpOwogCiAj aWZkZWYgSEFWRV9FQ09SRV9YCi0gICAgZWNvcmVfeF9zaHV0ZG93bigpOworICAgIGlmIChpbnRp YWxpemVkKQorICAgICAgICBlY29yZV94X3NodXRkb3duKCk7CiAjZW5kaWYKIAogICAgIGV3a19z aHV0ZG93bigpOwo= 156017 2012-08-02 02:21:31 -0700 2012-08-02 05:56:33 -0700 Patch efl_fix_wtr_x_server_3.patch text/plain 3058 alexander.shalamov ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5YTRl YTkxLi5jMmQ3Zjg1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDgtMDIgIEFsZXhhbmRlciBTaGFsYW1vdiAg PGFsZXhhbmRlci5zaGFsYW1vdkBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBXVFIg aXMgZmFpbGluZyB3aGVuIFggc2VydmVyIGlzIG5vdCBydW5uaW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjcxOQorCisgICAgICAgIFJldmlld2Vk IGJ5IEhhamltZSBNb3JpdGEuCisKKyAgICAgICAgRUZMJ3MgV2ViS2l0VGVzdFJ1bm5lciBkb2Vz bid0IGV4ZWN1dGUgdGVzdHMgd2hlbiBYIHNlcnZlciBpcyBub3QgcnVubmluZy4KKyAgICAgICAg VGhpcyBwYXRjaCBmaXhlcyB0aGUgcHJvYmxlbSBieSBjaGVja2luZyBlbnZpcm9ubWVudCB2YXJp YWJsZSBiZWZvcmUgZWNvcmUgeCBpbml0aWFsaXphdGlvbi4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZWZsLnB5OgorICAgICAgICAoRWZsUG9ydC5zZXR1 cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvZWZsL21h aW4uY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMTItMDgtMDEgIERpcmsgUHJhbmtlICA8ZHBy YW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTIzODkzKTogUmVmdGVz dCBtaXNtYXRjaGVzIGFyZSBydW4gdGhyb3VnaCBJbWFnZURpZmYgd2l0aCAwLjEgdG9sZXJhbmNl CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Vm bC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZWZsLnB5Cmlu ZGV4IDI1YTgxZDIuLmU1NjM1NzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvZWZsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvZWZsLnB5CkBAIC0yNyw2ICsyNyw4IEBACiAKICIiIldlYktpdCBFZmwg aW1wbGVtZW50YXRpb24gb2YgdGhlIFBvcnQgaW50ZXJmYWNlLiIiIgogCitpbXBvcnQgb3MKKwog ZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfY29uZmlndXJhdGlvbiBpbXBv cnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQuYmFz ZSBpbXBvcnQgUG9ydAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5wdWxzZWF1ZGlv X3Nhbml0aXplciBpbXBvcnQgUHVsc2VBdWRpb1Nhbml0aXplcgpAQCAtNTEsNiArNTMsMTAgQEAg Y2xhc3MgRWZsUG9ydChQb3J0LCBQdWxzZUF1ZGlvU2FuaXRpemVyKToKIAogICAgIGRlZiBzZXR1 cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VsZiwgc2VydmVyX25hbWU9Tm9uZSk6CiAgICAgICAgIGVu diA9IHN1cGVyKEVmbFBvcnQsIHNlbGYpLnNldHVwX2Vudmlyb25fZm9yX3NlcnZlcihzZXJ2ZXJf bmFtZSkKKyAgICAgICAgIyBJZiBESVNQTEFZIGVudmlyb25tZW50IHZhcmlhYmxlIGlzIHVuc2V0 IGluIHRoZSBzeXN0ZW0KKyAgICAgICAgIyBlLmcuIG9uIGJ1aWxkIGJvdCwgcmVtb3ZlIERJU1BM QVkgdmFyaWFibGUgZnJvbSB0aGUgZGljdGlvbmFyeQorICAgICAgICBpZiBub3QgJ0RJU1BMQVkn IGluIG9zLmVudmlyb246CisgICAgICAgICAgICBkZWwgZW52WydESVNQTEFZJ10KICAgICAgICAg ZW52WydURVNUX1JVTk5FUl9JTkpFQ1RFRF9CVU5ETEVfRklMRU5BTUUnXSA9IHNlbGYuX2J1aWxk X3BhdGgoJ2xpYicsICdsaWJUZXN0UnVubmVySW5qZWN0ZWRCdW5kbGUuc28nKQogICAgICAgICBl bnZbJ1RFU1RfUlVOTkVSX1BMVUdJTl9QQVRIJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdsaWInKQog ICAgICAgICBpZiBzZWxmLndlYnByb2Nlc3NfY21kX3ByZWZpeDoKZGlmZiAtLWdpdCBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvZWZsL21haW4uY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9l ZmwvbWFpbi5jcHAKaW5kZXggYTg4ZWY2Mi4uOThiY2RlMiAxMDA2NDQKLS0tIGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9lZmwvbWFpbi5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9l ZmwvbWFpbi5jcHAKQEAgLTIyLDYgKzIyLDcgQEAKICNpbmNsdWRlICJFV2ViS2l0Mi5oIgogI2lu Y2x1ZGUgIlRlc3RDb250cm9sbGVyLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KKyNp bmNsdWRlIDxzdGRsaWIuaD4KIAogI2lmZGVmIEhBVkVfRUNPUkVfWAogI2luY2x1ZGUgPEVjb3Jl X1guaD4KQEAgLTM1LDkgKzM2LDE0IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikK ICAgICAgICAgcmV0dXJuIDE7CiAKICNpZmRlZiBIQVZFX0VDT1JFX1gKLSAgICBpZiAoIWVjb3Jl X3hfaW5pdCgwKSkgewotICAgICAgICBld2tfc2h1dGRvd24oKTsKLSAgICAgICAgcmV0dXJuIDE7 CisgICAgY29uc3QgY2hhciogZGlzcGxheSA9IGdldGVudigiRElTUExBWSIpOworICAgIGludCBp bnRpYWxpemVkID0gMDsKKyAgICBpZiAoZGlzcGxheSkgeworICAgICAgICBpbnRpYWxpemVkID0g ZWNvcmVfeF9pbml0KDApOworICAgICAgICBpZiAoIWludGlhbGl6ZWQpIHsKKyAgICAgICAgICAg IGV3a19zaHV0ZG93bigpOworICAgICAgICAgICAgcmV0dXJuIDE7CisgICAgICAgIH0KICAgICB9 CiAjZW5kaWYKIApAQCAtNDUsNyArNTEsOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFy Z3YpCiAgICAgV1RSOjpUZXN0Q29udHJvbGxlciBjb250cm9sbGVyKGFyZ2MsIGNvbnN0X2Nhc3Q8 Y29uc3QgY2hhcioqPihhcmd2KSk7CiAKICNpZmRlZiBIQVZFX0VDT1JFX1gKLSAgICBlY29yZV94 X3NodXRkb3duKCk7CisgICAgaWYgKGludGlhbGl6ZWQpCisgICAgICAgIGVjb3JlX3hfc2h1dGRv d24oKTsKICNlbmRpZgogCiAgICAgZXdrX3NodXRkb3duKCk7Cg==