111434 2013-03-05 06:43:38 -0800 [GTK] WebKit2 test TestWebKitFaviconDatabase times out with recent glib 2013-07-05 03:14:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia calvaris calvaris commit-queue gustavo mrobinson webkit.review.bot zan oldest_to_newest 847629 0 cgarcia 2013-03-05 06:43:38 -0800 The problem is that now glib groups the tests by test suite, so they are not executed in the same order when different test suites are used in the same test executable. This is not a problem if tests don't depend on each other, but in the case of the favicon database, the test that deletes the database should always be the last one. /webkit2/WebKitFaviconDatabase/not-initialized: OK /webkit2/WebKitFaviconDatabase/set-directory: OK /webkit2/WebKitFaviconDatabase/get-favicon: OK /webkit2/WebKitFaviconDatabase/get-favicon-uri: OK /webkit2/WebKitFaviconDatabase/clear-database: OK /webkit2/WebKitFaviconDatabase/WebKitWebView/favicon: 847632 1 cgarcia 2013-03-05 06:46:54 -0800 Sorry, I pasted the wrong example, it was: /webkit2/WebKitFaviconDatabase/not-initialized: OK /webkit2/WebKitFaviconDatabase/set-directory: OK /webkit2/WebKitFaviconDatabase/get-favicon: OK /webkit2/WebKitFaviconDatabase/get-favicon-uri: OK /webkit2/WebKitFaviconDatabase/clear-database: OK /webkit2/WebKitWebView/favicon: 847635 2 191488 cgarcia 2013-03-05 06:49:18 -0800 Created attachment 191488 Patch 847638 3 webkit.review.bot 2013-03-05 06:51:16 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 847668 4 191488 mrobinson 2013-03-05 07:30:47 -0800 Comment on attachment 191488 Patch Hrm. Isn't there a way to rework the tests so that they are order-independent? It seems like a bug that they are. 847669 5 mrobinson 2013-03-05 07:31:04 -0800 (In reply to comment #4) > (From update of attachment 191488 [details]) > Hrm. Isn't there a way to rework the tests so that they are order-independent? It seems like a bug that they are. Sorry. It seems like a bug that they are not order-independent. 847694 6 cgarcia 2013-03-05 08:08:36 -0800 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 191488 [details] [details]) > > Hrm. Isn't there a way to rework the tests so that they are order-independent? It seems like a bug that they are. > > Sorry. It seems like a bug that they are not order-independent. In this particular case it's not possible, webkit_web_context_set_favicon_database_directory() can only be called once, and it has to be called first. We could do it in beforeAll() but then, not-initialized test wouldn't work. We are using a temp favison database so that the tests don't affect the user favicon database, the test that clears the database has to run the last one, or we would need to fill it again. I think this is the only case and the patch is simple enough. 847697 7 mrobinson 2013-03-05 08:17:57 -0800 (In reply to comment #6) > In this particular case it's not possible, webkit_web_context_set_favicon_database_directory() can only be called once, and it has to be called first. We could do it in beforeAll() but then, not-initialized test wouldn't work. We are using a temp favison database so that the tests don't affect the user favicon database, the test that clears the database has to run the last one, or we would need to fill it again. I think this is the only case and the patch is simple enough. Perhaps put that test into an afterAll() section? 847708 8 cgarcia 2013-03-05 08:30:34 -0800 (In reply to comment #7) > (In reply to comment #6) > > > In this particular case it's not possible, webkit_web_context_set_favicon_database_directory() can only be called once, and it has to be called first. We could do it in beforeAll() but then, not-initialized test wouldn't work. We are using a temp favison database so that the tests don't affect the user favicon database, the test that clears the database has to run the last one, or we would need to fill it again. I think this is the only case and the patch is simple enough. > > Perhaps put that test into an afterAll() section? In afterAll() get_test_run() has finished, you can't add tests there. And that wouldn't make the other tests cases independent from each other so I don't see why that's better than just using the same test suite name. 847712 9 mrobinson 2013-03-05 08:41:16 -0800 (In reply to comment #8) > In afterAll() get_test_run() has finished, you can't add tests there. And that wouldn't make the other tests cases independent from each other so I don't see why that's better than just using the same test suite name. Oh, I wasn't suggesting adding a test there, but simply running the assertions. 847713 10 mrobinson 2013-03-05 08:41:33 -0800 (In reply to comment #9) > Oh, I wasn't suggesting adding a test there, but simply running the assertions. Basically we should have a way to validate cleanup. 847718 11 cgarcia 2013-03-05 08:55:49 -0800 (In reply to comment #9) > (In reply to comment #8) > > > In afterAll() get_test_run() has finished, you can't add tests there. And that wouldn't make the other tests cases independent from each other so I don't see why that's better than just using the same test suite name. > > Oh, I wasn't suggesting adding a test there, but simply running the assertions. We are already cleaning up the database there, but there's a test case to test database_clear that doesn't remove the file but just clears the database, we can make it independent, but the other tests would need to make fill the database first, I don't think it's worth it. What's wrong with the simple one line patch? 847722 12 mrobinson 2013-03-05 08:58:57 -0800 (In reply to comment #11) > We are already cleaning up the database there, but there's a test case to test database_clear that doesn't remove the file but just clears the database, we can make it independent, but the other tests would need to make fill the database first, I don't think it's worth it. What's wrong with the simple one line patch? It's very unusual for unit tests to be order-dependent and interferes with testing strategies that randomize test order. 847727 13 cgarcia 2013-03-05 09:02:28 -0800 (In reply to comment #12) > (In reply to comment #11) > > > We are already cleaning up the database there, but there's a test case to test database_clear that doesn't remove the file but just clears the database, we can make it independent, but the other tests would need to make fill the database first, I don't think it's worth it. What's wrong with the simple one line patch? > > It's very unusual for unit tests to be order-dependent and interferes with testing strategies that randomize test order. That's a different issue, although related, can we just fix the tests so that I can make a release tomorrow and then you can fix it to make it order independent if you want? 847791 14 mrobinson 2013-03-05 10:19:37 -0800 (In reply to comment #13) > That's a different issue, although related, can we just fix the tests so that I can make a release tomorrow and then you can fix it to make it order independent if you want? I'm not sure I understand the issue here. webkit_favicon_database_clear just calls removeAllIcons. It doesn't actually delete the database, does it? If so perhaps the API is broken, since the documentation doesn't mention that the favicon database does not work after calling it. 847801 15 cgarcia 2013-03-05 10:26:04 -0800 (In reply to comment #14) > (In reply to comment #13) > > > That's a different issue, although related, can we just fix the tests so that I can make a release tomorrow and then you can fix it to make it order independent if you want? > > > I'm not sure I understand the issue here. webkit_favicon_database_clear just calls removeAllIcons. It doesn't actually delete the database, does it? If so perhaps the API is broken, since the documentation doesn't mention that the favicon database does not work after calling it. WebView favicon test assumes the icon is already in the database, see the comment in the test: // The icon is known and hasn't changed in the database, so notify::favicon is emitted // but WebKitFaviconDatabase::icon-changed isn't. Maybe that's wrong and it shouldn't make any assumption, but it's *another* issue. 847809 16 mrobinson 2013-03-05 10:34:40 -0800 (In reply to comment #15) > Maybe that's wrong and it shouldn't make any assumption, but it's *another* issue. The issue is that the test isn't independent of execution order. The changes in GLib just exposed this. 847811 17 cgarcia 2013-03-05 10:37:53 -0800 (In reply to comment #16) > (In reply to comment #15) > > > Maybe that's wrong and it shouldn't make any assumption, but it's *another* issue. > > The issue is that the test isn't independent of execution order. The changes in GLib just exposed this. And I'm fine with it, but why can we land the workaround to make the test pass and then you can make the unit tests independent of execution order? 847813 18 mrobinson 2013-03-05 10:42:22 -0800 This will serve to make the test independent of order, right? diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp index d5f3076..5c24643 100644 --- a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp @@ -215,9 +215,6 @@ static void testWebViewFavicon(FaviconDatabaseTest* test, gconstpointer) test->loadURI(kServer->getURIForPath("/foo").data()); test->waitUntilFaviconChanged(); g_assert(test->m_faviconNotificationReceived); - // The icon is known and hasn't changed in the database, so notify::favicon is emitted - // but WebKitFaviconDatabase::icon-changed isn't. - g_assert(test->m_faviconURI.isNull()); iconFromWebView = webkit_web_view_get_favicon(test->m_webView); g_assert(iconFromWebView); 847815 19 cgarcia 2013-03-05 10:46:23 -0800 (In reply to comment #18) > This will serve to make the test independent of order, right? > > diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp > index d5f3076..5c24643 100644 > --- a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp > +++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp > @@ -215,9 +215,6 @@ static void testWebViewFavicon(FaviconDatabaseTest* test, gconstpointer) > test->loadURI(kServer->getURIForPath("/foo").data()); > test->waitUntilFaviconChanged(); > g_assert(test->m_faviconNotificationReceived); > - // The icon is known and hasn't changed in the database, so notify::favicon is emitted > - // but WebKitFaviconDatabase::icon-changed isn't. > - g_assert(test->m_faviconURI.isNull()); > > iconFromWebView = webkit_web_view_get_favicon(test->m_webView); > g_assert(iconFromWebView); I don't think so, not that the test doesn't fail, but times out I guess because favicon changed is not emitted, I don't know 847824 20 cgarcia 2013-03-05 11:03:00 -0800 (In reply to comment #19) > (In reply to comment #18) > > This will serve to make the test independent of order, right? > > > > diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp > > index d5f3076..5c24643 100644 > > --- a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp > > +++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp > > @@ -215,9 +215,6 @@ static void testWebViewFavicon(FaviconDatabaseTest* test, gconstpointer) > > test->loadURI(kServer->getURIForPath("/foo").data()); > > test->waitUntilFaviconChanged(); > > g_assert(test->m_faviconNotificationReceived); > > - // The icon is known and hasn't changed in the database, so notify::favicon is emitted > > - // but WebKitFaviconDatabase::icon-changed isn't. > > - g_assert(test->m_faviconURI.isNull()); > > > > iconFromWebView = webkit_web_view_get_favicon(test->m_webView); > > g_assert(iconFromWebView); > > I don't think so, not that the test doesn't fail, but times out I guess because favicon changed is not emitted, I don't know And that wouldn't make the other tests cases independent, so I still don't understant why we can't simply run the test in the order it was thought to be run and then make all tests independent if you think it's so important 901030 21 zan 2013-06-17 07:31:22 -0700 *** Bug 117690 has been marked as a duplicate of this bug. *** 901033 22 zan 2013-06-17 07:32:41 -0700 The unit test was skipped in r151633 because it was timing out. The patch fixes the problem, so the test should be unskipped when the patch lands. http://trac.webkit.org/changeset/151633 905589 23 calvaris 2013-07-02 15:04:47 -0700 (In reply to comment #12) > It's very unusual for unit tests to be order-dependent and interferes with testing strategies that randomize test order. 905590 24 calvaris 2013-07-02 15:09:46 -0700 (In reply to comment #12) > It's very unusual for unit tests to be order-dependent and interferes with testing strategies that randomize test order. As far as I could see all almost every test depends on the previous to function. It's highly difficult to create a proper setup an tear down for all tests so we can do two things to make them independent from each other: * Creating one big test with the whole functionatity * Replicating in the every test what is needed to get it working, what would create a cascade of duplicated code. What do you think it is best? 905634 25 mrobinson 2013-07-02 17:09:24 -0700 (In reply to comment #24) > * Creating one big test with the whole functionatity If the tests all really do depend on each other, then this is a simple fix that still allows for running other tests in a random order. I prefer this. Ideally we'd fix the tests, but it appears to be tricky and not worth the time. 905711 26 cgarcia 2013-07-03 00:07:39 -0700 (In reply to comment #24) > (In reply to comment #12) > > It's very unusual for unit tests to be order-dependent and interferes with testing strategies that randomize test order. > > As far as I could see all almost every test depends on the previous to function. It's highly difficult to create a proper setup an tear down for all tests so we can do two things to make them independent from each other: > > * Creating one big test with the whole functionatity > * Replicating in the every test what is needed to get it working, what would create a cascade of duplicated code. > > What do you think it is best? Let's move everything into a single test case, then. 906277 27 206116 calvaris 2013-07-04 17:53:27 -0700 Created attachment 206116 Patch Converted all tests in a single one. 906278 28 206116 mrobinson 2013-07-04 17:57:55 -0700 Comment on attachment 206116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206116&action=review Looks good in principle to me, but perhaps Carlos has further comments. > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:156 > + GOwnPtr<char> iconURI(webkit_favicon_database_get_favicon_uri(database, kServer->getURIForPath("/foo").data())); I'm not sure exactly why this change is necessary. > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:220 > + test->m_faviconURI = static_cast<char*>(0); Do you really need to cast 0 to a pointer? > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:242 > + // This tests depend on this order to run properly so we declare > + // them in a single one > + testNotInitialized(test, 0); English nit: "This tests" -> "These tests" It would probably be good to include a link to this bug. 906287 29 206119 calvaris 2013-07-04 19:33:37 -0700 Created attachment 206119 Fixing according to Martin's comments (In reply to comment #28) > > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:156 > > + GOwnPtr<char> iconURI(webkit_favicon_database_get_favicon_uri(database, kServer->getURIForPath("/foo").data())); > > I'm not sure exactly why this change is necessary. The problem with this is that the clear database test was phony because it is not actually testing for an already existing icon so it could never find it. > > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:220 > > + test->m_faviconURI = static_cast<char*>(0); > > Do you really need to cast 0 to a pointer? Changed. > > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:242 > > + // This tests depend on this order to run properly so we declare > > + // them in a single one > > + testNotInitialized(test, 0); > > English nit: "This tests" -> "These tests" It would probably be good to include a link to this bug. Changed. I also removed the code to slice the testGetFavicon in three as this could be a subject of improving the tests to make them actually independent from each other and not needing to run them sorted. 906288 30 calvaris 2013-07-04 19:35:21 -0700 (In reply to comment #29) > > > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:156 > > > + GOwnPtr<char> iconURI(webkit_favicon_database_get_favicon_uri(database, kServer->getURIForPath("/foo").data())); > > > > I'm not sure exactly why this change is necessary. > > The problem with this is that the clear database test was phony because it is not actually testing for an already existing icon so it could never find it. I forgot to say that I removed this part of the code and will fix it in another bug as agreed with Martin. 906289 31 206119 mrobinson 2013-07-04 19:36:11 -0700 Comment on attachment 206119 Fixing according to Martin's comments View in context: https://bugs.webkit.org/attachment.cgi?id=206119&action=review > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:234 > + // These tests depend on this order to run properly so we declare > + // them in a single one. See > + // https://bugs.webkit.org/show_bug.cgi?id=111434. Just a note for the future: comments in WebKit can be long lines (up to and past 120 characters), so feel free not to break them into more lines. 906297 32 206119 cgarcia 2013-07-04 22:45:15 -0700 Comment on attachment 206119 Fixing according to Martin's comments View in context: https://bugs.webkit.org/attachment.cgi?id=206119&action=review hehe, you had to move everything into a single test in the end :-) Thanks for fixing it! > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:240 > + testNotInitialized(test, 0); > + testSetDirectory(test, 0); > + testGetFavicon(test, 0); > + testGetFaviconURI(test, 0); > + testWebViewFavicon(test, 0); > + testClearDatabase(test, 0); These methods are no longer added in a Foo::add method, so it doesn't make sense to pass an unused NULL pointer, simply remove it. 906306 33 calvaris 2013-07-04 23:54:57 -0700 (In reply to comment #32) > > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:240 > > + testNotInitialized(test, 0); > > + testSetDirectory(test, 0); > > + testGetFavicon(test, 0); > > + testGetFaviconURI(test, 0); > > + testWebViewFavicon(test, 0); > > + testClearDatabase(test, 0); > > These methods are no longer added in a Foo::add method, so it doesn't make sense to pass an unused NULL pointer, simply remove it. I left it just in case somebody wanted to split them again, but I can remove it, no problem. 906338 34 206128 calvaris 2013-07-05 02:11:56 -0700 Created attachment 206128 Patch Changed according to Carlos' comments. 906346 35 206128 commit-queue 2013-07-05 03:14:34 -0700 Comment on attachment 206128 Patch Clearing flags on attachment: 206128 Committed r152412: <http://trac.webkit.org/changeset/152412> 906347 36 commit-queue 2013-07-05 03:14:39 -0700 All reviewed patches have been landed. Closing bug. 191488 2013-03-05 06:49:18 -0800 2013-07-04 17:53:21 -0700 Patch wk2-favicon-database-test.diff text/plain 2031 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwNWVkNDk2Li43YmMwYzAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDMtMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFdlYktpdDIgdGVzdCBUZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNl IHRpbWVzIG91dCB3aXRoIHJlY2VudCBnbGliCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgcHJvYmxlbSBpcyB0aGF0IG5vdyBnbGliIGdyb3VwcyB0 aGUgdGVzdHMgYnkgdGVzdCBzdWl0ZSwgc28KKyAgICAgICAgdGhleSBhcmUgbm90IGV4ZWN1dGVk IGluIHRoZSBzYW1lIG9yZGVyIHdoZW4gZGlmZmVyZW50IHRlc3Qgc3VpdGVzCisgICAgICAgIGFy ZSB1c2VkIGluIHRoZSBzYW1lIHRlc3QgZXhlY3V0YWJsZS4gVGhpcyBpcyBub3QgYSBwcm9ibGVt IGlmCisgICAgICAgIHRlc3RzIGRvbid0IGRlcGVuZCBvbiBlYWNoIG90aGVyLCBidXQgaW4gdGhl IGNhc2Ugb2YgdGhlIGZhdmljb24KKyAgICAgICAgZGF0YWJhc2UsIHRoZSB0ZXN0IHRoYXQgZGVs ZXRlcyB0aGUgZGF0YWJhc2Ugc2hvdWxkIGFsd2F5cyBiZSB0aGUKKyAgICAgICAgbGFzdCBvbmUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRh dGFiYXNlLmNwcDoKKyAgICAgICAgKGJlZm9yZUFsbCk6IFJlbmFtZSAvd2Via2l0Mi9XZWJLaXRX ZWJWaWV3L2Zhdmljb24gYXMKKyAgICAgICAgL3dlYmtpdDIvV2ViS2l0RmF2aWNvbkRhdGFiYXNl L3dlYnZpZXctZmF2aWNvbgorCiAyMDEzLTAzLTA0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBTb21lIFdlYktpdDIgR1RLKyB1bml0 IHRlc3RzIGFyZSBmYWlsaW5nIGluIDMyIGJpdHMgYm90CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRGYXZp Y29uRGF0YWJhc2UuY3BwCmluZGV4IGQ1ZjMwNzYuLjJjNDViZGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRGYXZpY29uRGF0YWJh c2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RX ZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwCkBAIC0yMzksNyArMjM5LDcgQEAgdm9pZCBiZWZvcmVB bGwoKQogICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNvbkRhdGFiYXNl IiwgInNldC1kaXJlY3RvcnkiLCB0ZXN0U2V0RGlyZWN0b3J5KTsKICAgICBGYXZpY29uRGF0YWJh c2VUZXN0OjphZGQoIldlYktpdEZhdmljb25EYXRhYmFzZSIsICJnZXQtZmF2aWNvbiIsIHRlc3RH ZXRGYXZpY29uKTsKICAgICBGYXZpY29uRGF0YWJhc2VUZXN0OjphZGQoIldlYktpdEZhdmljb25E YXRhYmFzZSIsICJnZXQtZmF2aWNvbi11cmkiLCB0ZXN0R2V0RmF2aWNvblVSSSk7Ci0gICAgRmF2 aWNvbkRhdGFiYXNlVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImZhdmljb24iLCB0ZXN0V2Vi Vmlld0Zhdmljb24pOworICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNv bkRhdGFiYXNlIiwgIndlYnZpZXctZmF2aWNvbiIsIHRlc3RXZWJWaWV3RmF2aWNvbik7CiAgICAg RmF2aWNvbkRhdGFiYXNlVGVzdDo6YWRkKCJXZWJLaXRGYXZpY29uRGF0YWJhc2UiLCAiY2xlYXIt ZGF0YWJhc2UiLCB0ZXN0Q2xlYXJEYXRhYmFzZSk7CiB9CiAK 206116 2013-07-04 17:53:27 -0700 2013-07-04 19:33:37 -0700 Patch bug-111434-20130705025118.patch text/plain 6829 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTkwOTVjZjEzMDExNDE3 ODNjNWE2MDE3OGFkNGI4MjA0Yjc5NjA4OC4uODM5NTk1ZTkxYjViNThjYTA5YTQ1Yjg2NTdiMTQ2 YzcwMDE2NGIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA3LTA0ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU S10gV2ViS2l0MiB0ZXN0IFRlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2UgdGltZXMgb3V0IHdpdGgg cmVjZW50IGdsaWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMTQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFzZS5j cHA6CisgICAgICAgICh0ZXN0Q2xlYXJEYXRhYmFzZSk6IEZpeGVkIHRvIHRlc3QgZm9yIGEgZm9y bWVybHkgZXhpc3RpbmcgaWNvbi4KKyAgICAgICAgKHRlc3RHZXRGYXZpY29uKToKKyAgICAgICAg KHRlc3RHZXRTYW1lRmF2aWNvbkZyb21EaWZmZXJlbnRQYWdlKToKKyAgICAgICAgKHRlc3RHZXRJ bnZhbGlkRmF2aWNvbik6IHRlc3RHZXRGYXZpY29uIHdhcyBzcGxpdCBpbiB0aGVzZSB0aHJlZS4K KyAgICAgICAgKHRlc3RXZWJWaWV3RmF2aWNvbik6IEZpeGVkIHRvIG1ha2UgaXQgd29yayB0b2dl dGhlciB3aXRoIHRoZQorICAgICAgICBvdGhlciB0ZXN0cy4KKyAgICAgICAgKHRlc3RGYXZpY29u RGF0YWJhc2UpOiBDcmVhdGVkIHRvIGNhbGwgYWxsIHRlc3RzIGluIHRoZSBwcm9wZXIKKyAgICAg ICAgb3JkZXIuCisgICAgICAgIChiZWZvcmVBbGwpOiBDaGFuZ2VkIHRvIGNhbGwgb25seSB0ZXN0 RmF2aWNvbkRhdGFiYXNlIGluc3RlYWQgb2YKKyAgICAgICAgdGhlIHNlcGFyYXRlIHRlc3RzLgor CiAyMDEzLTA3LTAzICBHb3Jkb24gU2hlcmlkYW4gIDxnb3Jkb25fc2hlcmlkYW5AYXBwbGUuY29t PgogCiAgICAgICAgIEltcGxlbWVudCBtZWNoYW5pc20gdG8gZGV0ZWN0IChwYXJ0aWFsbHkpIGhp ZGRlbiBibG9ja2VkIHBsdWdpbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2Uu Y3BwCmluZGV4IGQ1ZjMwNzY4YzgzOGE0M2FiZTRmNTYyNjcxMWFmZGRjZDk5NzJjMTkuLmJlMWNj Mjk4ZmFkYTRkYjdkYjliYTUzZTFiOTRkOWMzYzI2YjI5MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJL aXRGYXZpY29uRGF0YWJhc2UuY3BwCkBAIC0xNTMsNyArMTUzLDcgQEAgc3RhdGljIHZvaWQgdGVz dENsZWFyRGF0YWJhc2UoRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikK ICAgICBXZWJLaXRGYXZpY29uRGF0YWJhc2UqIGRhdGFiYXNlID0gd2Via2l0X3dlYl9jb250ZXh0 X2dldF9mYXZpY29uX2RhdGFiYXNlKHRlc3QtPm1fd2ViQ29udGV4dCk7CiAgICAgd2Via2l0X2Zh dmljb25fZGF0YWJhc2VfY2xlYXIoZGF0YWJhc2UpOwogCi0gICAgR093blB0cjxjaGFyPiBpY29u VVJJKHdlYmtpdF9mYXZpY29uX2RhdGFiYXNlX2dldF9mYXZpY29uX3VyaShkYXRhYmFzZSwga1Nl cnZlci0+Z2V0VVJJRm9yUGF0aCgiLyIpLmRhdGEoKSkpOworICAgIEdPd25QdHI8Y2hhcj4gaWNv blVSSSh3ZWJraXRfZmF2aWNvbl9kYXRhYmFzZV9nZXRfZmF2aWNvbl91cmkoZGF0YWJhc2UsIGtT ZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9mb28iKS5kYXRhKCkpKTsKICAgICBnX2Fzc2VydCghaWNv blVSSSk7CiB9CiAKQEAgLTE3NCw2ICsxNzQsMTEgQEAgc3RhdGljIHZvaWQgdGVzdEdldEZhdmlj b24oRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICAvLyBDaGVj ayB0aGF0IHdpZHRoIGFuZCBoZWlnaHQgbWF0Y2ggdGhvc2UgZnJvbSBibGFuay5pY28gKDE2eDE2 IGZhdmljb24pLgogICAgIGdfYXNzZXJ0X2NtcGludChjYWlyb19pbWFnZV9zdXJmYWNlX2dldF93 aWR0aCh0ZXN0LT5tX2Zhdmljb24pLCA9PSwgMTYpOwogICAgIGdfYXNzZXJ0X2NtcGludChjYWly b19pbWFnZV9zdXJmYWNlX2dldF9oZWlnaHQodGVzdC0+bV9mYXZpY29uKSwgPT0sIDE2KTsKK30K Kworc3RhdGljIHZvaWQgdGVzdEdldFNhbWVGYXZpY29uRnJvbURpZmZlcmVudFBhZ2UoRmF2aWNv bkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICBDU3RyaW5nIGZhdmlj b25VUkkgPSBrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvaWNvbi9mYXZpY29uLmljbyIpOwogCiAg ICAgLy8gQ2hlY2sgdGhhdCBhbm90aGVyIHBhZ2Ugd2l0aCB0aGUgc2FtZSBmYXZpY29uIHJldHVy biB0aGUgc2FtZSBpY29uLgogICAgIGNhaXJvX3N1cmZhY2VfdCogZmF2aWNvbiA9IGNhaXJvX3N1 cmZhY2VfcmVmZXJlbmNlKHRlc3QtPm1fZmF2aWNvbik7CkBAIC0xODgsNyArMTkzLDEwIEBAIHN0 YXRpYyB2b2lkIHRlc3RHZXRGYXZpY29uKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25z dHBvaW50ZXIpCiAgICAgZ19hc3NlcnQodGVzdC0+bV9mYXZpY29uID09IGZhdmljb24pOwogICAg IGdfYXNzZXJ0KCF0ZXN0LT5tX2Vycm9yKTsKICAgICBjYWlyb19zdXJmYWNlX2Rlc3Ryb3koZmF2 aWNvbik7Cit9CiAKK3N0YXRpYyB2b2lkIHRlc3RHZXRJbnZhbGlkRmF2aWNvbihGYXZpY29uRGF0 YWJhc2VUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQorewogICAgIC8vIENoZWNrIHRoZSBBUEkg cmV0cmlldmluZyBhbiBpbnZhbGlkIGZhdmljb24uCiAgICAgdGVzdC0+bG9hZFVSSShrU2VydmVy LT5nZXRVUklGb3JQYXRoKCIvbm9mYXZpY29uIikuZGF0YSgpKTsKICAgICB0ZXN0LT53YWl0VW50 aWxGYXZpY29uQ2hhbmdlZCgpOwpAQCAtMjA5LDYgKzIxNyw4IEBAIHN0YXRpYyB2b2lkIHRlc3RH ZXRGYXZpY29uVVJJKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAK IHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3RmF2aWNvbihGYXZpY29uRGF0YWJhc2VUZXN0KiB0ZXN0 LCBnY29uc3Rwb2ludGVyKQogeworICAgIHRlc3QtPm1fZmF2aWNvblVSSSA9IHN0YXRpY19jYXN0 PGNoYXIqPigwKTsKKwogICAgIGNhaXJvX3N1cmZhY2VfdCogaWNvbkZyb21XZWJWaWV3ID0gd2Vi a2l0X3dlYl92aWV3X2dldF9mYXZpY29uKHRlc3QtPm1fd2ViVmlldyk7CiAgICAgZ19hc3NlcnQo IWljb25Gcm9tV2ViVmlldyk7CiAKQEAgLTIyNSw2ICsyMzUsMjAgQEAgc3RhdGljIHZvaWQgdGVz dFdlYlZpZXdGYXZpY29uKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CiAgICAgZ19hc3NlcnRfY21wdWludChjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9oZWlnaHQoaWNv bkZyb21XZWJWaWV3KSwgPT0sIDE2KTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdEZhdmljb25EYXRh YmFzZShGYXZpY29uRGF0YWJhc2VUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIC8v IFRoaXMgdGVzdHMgZGVwZW5kIG9uIHRoaXMgb3JkZXIgdG8gcnVuIHByb3Blcmx5IHNvIHdlIGRl Y2xhcmUKKyAgICAvLyB0aGVtIGluIGEgc2luZ2xlIG9uZQorICAgIHRlc3ROb3RJbml0aWFsaXpl ZCh0ZXN0LCAwKTsKKyAgICB0ZXN0U2V0RGlyZWN0b3J5KHRlc3QsIDApOworICAgIHRlc3RHZXRG YXZpY29uKHRlc3QsIDApOworICAgIHRlc3RHZXRTYW1lRmF2aWNvbkZyb21EaWZmZXJlbnRQYWdl KHRlc3QsIDApOworICAgIHRlc3RHZXRJbnZhbGlkRmF2aWNvbih0ZXN0LCAwKTsKKyAgICB0ZXN0 R2V0RmF2aWNvblVSSSh0ZXN0LCAwKTsKKyAgICB0ZXN0V2ViVmlld0Zhdmljb24odGVzdCwgMCk7 CisgICAgdGVzdENsZWFyRGF0YWJhc2UodGVzdCwgMCk7Cit9CisKIHZvaWQgYmVmb3JlQWxsKCkK IHsKICAgICAvLyBTdGFydCBhIHNvdXAgc2VydmVyIGZvciB0ZXN0aW5nLgpAQCAtMjM1LDEyICsy NTksNyBAQCB2b2lkIGJlZm9yZUFsbCgpCiAgICAgZ19hc3NlcnQoa1RlbXBEaXJlY3RvcnkpOwog CiAgICAgLy8gQWRkIHRlc3RzIHRvIHRoZSBzdWl0ZS4KLSAgICBGYXZpY29uRGF0YWJhc2VUZXN0 OjphZGQoIldlYktpdEZhdmljb25EYXRhYmFzZSIsICJub3QtaW5pdGlhbGl6ZWQiLCB0ZXN0Tm90 SW5pdGlhbGl6ZWQpOwotICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNv bkRhdGFiYXNlIiwgInNldC1kaXJlY3RvcnkiLCB0ZXN0U2V0RGlyZWN0b3J5KTsKLSAgICBGYXZp Y29uRGF0YWJhc2VUZXN0OjphZGQoIldlYktpdEZhdmljb25EYXRhYmFzZSIsICJnZXQtZmF2aWNv biIsIHRlc3RHZXRGYXZpY29uKTsKLSAgICBGYXZpY29uRGF0YWJhc2VUZXN0OjphZGQoIldlYktp dEZhdmljb25EYXRhYmFzZSIsICJnZXQtZmF2aWNvbi11cmkiLCB0ZXN0R2V0RmF2aWNvblVSSSk7 Ci0gICAgRmF2aWNvbkRhdGFiYXNlVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImZhdmljb24i LCB0ZXN0V2ViVmlld0Zhdmljb24pOwotICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2Vi S2l0RmF2aWNvbkRhdGFiYXNlIiwgImNsZWFyLWRhdGFiYXNlIiwgdGVzdENsZWFyRGF0YWJhc2Up OworICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNvbkRhdGFiYXNlIiwg ImZhdmljb24tZGF0YWJhc2UtdGVzdCIsIHRlc3RGYXZpY29uRGF0YWJhc2UpOwogfQogCiBzdGF0 aWMgdm9pZCB3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6ZWRDYWxsYmFjayhncG9pbnRlciwg R09iamVjdCopCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggMGU0ZmQ1NGU5MmM3NmM0ZGMxZTZlNzYyMzhlMjQ3NzBiYzU1M2Y5Zi4uMWUyZTBlYWQy MzdlMWMxMWNkMzZlZGYwMjBmYzNhNzNhZjI1ODQ1NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA3LTA0ICBY YWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dUS10gV2ViS2l0MiB0ZXN0IFRlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2UgdGltZXMgb3V0IHdp dGggcmVjZW50IGdsaWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMTQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAgICAgICAoVGVzdFJ1bm5lcik6IFVu c2tpcHBlZCBUZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlIHRlc3RzLgorCiAyMDEzLTA3LTAzICBE YXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgTWFrZWZpbGUg dG8gV2ViS2l0TGF1bmNoZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0 cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRleCA4YWE5ZDAxMjJjMDVkNWZmOTdk NTk4NDJlYWU4NTQ1YjI2MDFhODhlLi5jM2MwNzEyODQxMjg2ZjNlY2ZiOGY2YTdmY2ExMjJkYWM3 NDdkNmRjIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9v bHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC03Miw3ICs3Miw2IEBAIGNsYXNzIFRlc3RSdW5u ZXI6CiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFdlYktpdEFjY2Vz c2liaWxpdHkiLCAiL3dlYmtpdDIvV2ViS2l0QWNjZXNzaWJpbGl0eS9hdHNwaS1iYXNpYy1oaWVy YXJjaHkiLCAiVGVzdCBmYWlscyIsIDEwMDQwOCksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJL aXQyQVBJVGVzdHMvVGVzdFdlYktpdFdlYlZpZXciLCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUs ICJUZXN0IHRpbWVzIG91dCBhZnRlciByMTUwODkwIiwgMTE3Njg5KSwKICAgICAgICAgU2tpcHBl ZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0Q29udGV4dE1lbnUiLCBTa2lwcGVkVGVzdC5FTlRJ UkVfU1VJVEUsICJUZXN0IHRpbWVzIG91dCBhZnRlciByMTUwODkwIiwgMTE3Njg5KSwKLSAgICAg ICAgU2tpcHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNl IiwgU2tpcHBlZFRlc3QuRU5USVJFX1NVSVRFLCAiVGVzdCB0aW1lcyBvdXQiLCAxMTc2OTApLAog ICAgICAgICBTa2lwcGVkVGVzdCgiVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0MiIsICJXZWJLaXQy LkNhbkhhbmRsZVJlcXVlc3QiLCAiVGVzdCBmYWlscyIsIDg4NDUzKSwKICAgICAgICAgU2tpcHBl ZFRlc3QoIlRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdDIiLCAiV2ViS2l0Mi5Nb3VzZU1vdmVBZnRl ckNyYXNoIiwgIlRlc3QgaXMgZmxha3kiLCA4NTA2NiksCiAgICAgICAgIFNraXBwZWRUZXN0KCJU ZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXQyIiwgIldlYktpdDIuTmV3Rmlyc3RWaXN1YWxseU5vbkVt cHR5TGF5b3V0Rm9ySW1hZ2VzIiwgIlRlc3QgaXMgZmxha3kiLCA4NTA2NiksCg== 206119 2013-07-04 19:33:37 -0700 2013-07-05 02:11:51 -0700 Fixing according to Martin's comments 111434-not-sliced.patch text/plain 4681 calvaris ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxOTA5NWNmLi44YjMyNTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMDctMDQgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBXZWJLaXQyIHRlc3QgVGVzdFdlYktpdEZhdmljb25EYXRh YmFzZSB0aW1lcyBvdXQgd2l0aCByZWNlbnQgZ2xpYgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNDM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2Vi S2l0RmF2aWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKHRlc3RXZWJWaWV3RmF2aWNvbik6IEZp eGVkIHRvIG1ha2UgaXQgd29yayB0b2dldGhlciB3aXRoIHRoZQorICAgICAgICBvdGhlciB0ZXN0 cy4KKyAgICAgICAgKHRlc3RGYXZpY29uRGF0YWJhc2UpOiBDcmVhdGVkIHRvIGNhbGwgYWxsIHRl c3RzIGluIHRoZSBwcm9wZXIKKyAgICAgICAgb3JkZXIuCisgICAgICAgIChiZWZvcmVBbGwpOiBD aGFuZ2VkIHRvIGNhbGwgb25seSB0ZXN0RmF2aWNvbkRhdGFiYXNlIGluc3RlYWQgb2YKKyAgICAg ICAgdGhlIHNlcGFyYXRlIHRlc3RzLgorCiAyMDEzLTA3LTAzICBHb3Jkb24gU2hlcmlkYW4gIDxn b3Jkb25fc2hlcmlkYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBtZWNoYW5pc20g dG8gZGV0ZWN0IChwYXJ0aWFsbHkpIGhpZGRlbiBibG9ja2VkIHBsdWdpbnMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNv bkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rl c3RXZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwCmluZGV4IGQ1ZjMwNzYuLjM0NTZiYjkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRG YXZpY29uRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L3Rlc3RzL1Rlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwCkBAIC0yMDksNiArMjA5LDggQEAg c3RhdGljIHZvaWQgdGVzdEdldEZhdmljb25VUkkoRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKIAogc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdGYXZpY29uKEZhdmljb25E YXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiB7CisgICAgdGVzdC0+bV9mYXZpY29u VVJJID0gQ1N0cmluZygpOworCiAgICAgY2Fpcm9fc3VyZmFjZV90KiBpY29uRnJvbVdlYlZpZXcg PSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2Zhdmljb24odGVzdC0+bV93ZWJWaWV3KTsKICAgICBnX2Fz c2VydCghaWNvbkZyb21XZWJWaWV3KTsKIApAQCAtMjI1LDYgKzIyNywxOSBAQCBzdGF0aWMgdm9p ZCB0ZXN0V2ViVmlld0Zhdmljb24oRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9p bnRlcikKICAgICBnX2Fzc2VydF9jbXB1aW50KGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdo dChpY29uRnJvbVdlYlZpZXcpLCA9PSwgMTYpOwogfQogCitzdGF0aWMgdm9pZCB0ZXN0RmF2aWNv bkRhdGFiYXNlKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7Cisg ICAgLy8gVGhlc2UgdGVzdHMgZGVwZW5kIG9uIHRoaXMgb3JkZXIgdG8gcnVuIHByb3Blcmx5IHNv IHdlIGRlY2xhcmUKKyAgICAvLyB0aGVtIGluIGEgc2luZ2xlIG9uZS4gU2VlCisgICAgLy8gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTQzNC4KKyAgICB0ZXN0Tm90 SW5pdGlhbGl6ZWQodGVzdCwgMCk7CisgICAgdGVzdFNldERpcmVjdG9yeSh0ZXN0LCAwKTsKKyAg ICB0ZXN0R2V0RmF2aWNvbih0ZXN0LCAwKTsKKyAgICB0ZXN0R2V0RmF2aWNvblVSSSh0ZXN0LCAw KTsKKyAgICB0ZXN0V2ViVmlld0Zhdmljb24odGVzdCwgMCk7CisgICAgdGVzdENsZWFyRGF0YWJh c2UodGVzdCwgMCk7Cit9CisKIHZvaWQgYmVmb3JlQWxsKCkKIHsKICAgICAvLyBTdGFydCBhIHNv dXAgc2VydmVyIGZvciB0ZXN0aW5nLgpAQCAtMjM1LDEyICsyNTAsNyBAQCB2b2lkIGJlZm9yZUFs bCgpCiAgICAgZ19hc3NlcnQoa1RlbXBEaXJlY3RvcnkpOwogCiAgICAgLy8gQWRkIHRlc3RzIHRv IHRoZSBzdWl0ZS4KLSAgICBGYXZpY29uRGF0YWJhc2VUZXN0OjphZGQoIldlYktpdEZhdmljb25E YXRhYmFzZSIsICJub3QtaW5pdGlhbGl6ZWQiLCB0ZXN0Tm90SW5pdGlhbGl6ZWQpOwotICAgIEZh dmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNvbkRhdGFiYXNlIiwgInNldC1kaXJl Y3RvcnkiLCB0ZXN0U2V0RGlyZWN0b3J5KTsKLSAgICBGYXZpY29uRGF0YWJhc2VUZXN0OjphZGQo IldlYktpdEZhdmljb25EYXRhYmFzZSIsICJnZXQtZmF2aWNvbiIsIHRlc3RHZXRGYXZpY29uKTsK LSAgICBGYXZpY29uRGF0YWJhc2VUZXN0OjphZGQoIldlYktpdEZhdmljb25EYXRhYmFzZSIsICJn ZXQtZmF2aWNvbi11cmkiLCB0ZXN0R2V0RmF2aWNvblVSSSk7Ci0gICAgRmF2aWNvbkRhdGFiYXNl VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImZhdmljb24iLCB0ZXN0V2ViVmlld0Zhdmljb24p OwotICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNvbkRhdGFiYXNlIiwg ImNsZWFyLWRhdGFiYXNlIiwgdGVzdENsZWFyRGF0YWJhc2UpOworICAgIEZhdmljb25EYXRhYmFz ZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNvbkRhdGFiYXNlIiwgImZhdmljb24tZGF0YWJhc2UtdGVz dCIsIHRlc3RGYXZpY29uRGF0YWJhc2UpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29u RGF0YWJhc2VGaW5hbGl6ZWRDYWxsYmFjayhncG9pbnRlciwgR09iamVjdCopCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGU0ZmQ1NC4uMWUyZTBl YSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDEzLTA3LTA0ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZh cmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gV2ViS2l0MiB0ZXN0IFRlc3RXZWJLaXRG YXZpY29uRGF0YWJhc2UgdGltZXMgb3V0IHdpdGggcmVjZW50IGdsaWIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTQzNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3Rz OgorICAgICAgICAoVGVzdFJ1bm5lcik6IFVuc2tpcHBlZCBUZXN0V2ViS2l0RmF2aWNvbkRhdGFi YXNlIHRlc3RzLgorCiAyMDEzLTA3LTAzICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNv bT4KIAogICAgICAgICBBZGQgTWFrZWZpbGUgdG8gV2ViS2l0TGF1bmNoZXIKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0 cwppbmRleCA4YWE5ZDAxLi5jM2MwNzEyIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1n dGstdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC03Miw3ICs3Miw2 IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVz dHMvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkiLCAiL3dlYmtpdDIvV2ViS2l0QWNjZXNzaWJpbGl0 eS9hdHNwaS1iYXNpYy1oaWVyYXJjaHkiLCAiVGVzdCBmYWlscyIsIDEwMDQwOCksCiAgICAgICAg IFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFdlYktpdFdlYlZpZXciLCBTa2lwcGVk VGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRpbWVzIG91dCBhZnRlciByMTUwODkwIiwgMTE3Njg5 KSwKICAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0Q29udGV4dE1lbnUi LCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRpbWVzIG91dCBhZnRlciByMTUwODkw IiwgMTE3Njg5KSwKLSAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0V2Vi S2l0RmF2aWNvbkRhdGFiYXNlIiwgU2tpcHBlZFRlc3QuRU5USVJFX1NVSVRFLCAiVGVzdCB0aW1l cyBvdXQiLCAxMTc2OTApLAogICAgICAgICBTa2lwcGVkVGVzdCgiVGVzdFdlYktpdEFQSS9UZXN0 V2ViS2l0MiIsICJXZWJLaXQyLkNhbkhhbmRsZVJlcXVlc3QiLCAiVGVzdCBmYWlscyIsIDg4NDUz KSwKICAgICAgICAgU2tpcHBlZFRlc3QoIlRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdDIiLCAiV2Vi S2l0Mi5Nb3VzZU1vdmVBZnRlckNyYXNoIiwgIlRlc3QgaXMgZmxha3kiLCA4NTA2NiksCiAgICAg ICAgIFNraXBwZWRUZXN0KCJUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXQyIiwgIldlYktpdDIuTmV3 Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9ySW1hZ2VzIiwgIlRlc3QgaXMgZmxha3kiLCA4 NTA2NiksCg== 206128 2013-07-05 02:11:56 -0700 2013-07-05 03:14:34 -0700 Patch bug-111434-20130705110946.patch text/plain 7336 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTkwOTVjZjEzMDExNDE3 ODNjNWE2MDE3OGFkNGI4MjA0Yjc5NjA4OC4uNTdiNTA2ZDQ5OTRmY2IyZjE3YjJkNmI0M2Y5NTA5 OTExNDk1YjExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA3LTA1ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU S10gV2ViS2l0MiB0ZXN0IFRlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2UgdGltZXMgb3V0IHdpdGgg cmVjZW50IGdsaWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMTQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFzZS5j cHA6CisgICAgICAgICh0ZXN0Tm90SW5pdGlhbGl6ZWQpOgorICAgICAgICAodGVzdFNldERpcmVj dG9yeSk6CisgICAgICAgICh0ZXN0Q2xlYXJEYXRhYmFzZSk6CisgICAgICAgICh0ZXN0R2V0RmF2 aWNvbik6CisgICAgICAgICh0ZXN0R2V0RmF2aWNvblVSSSk6IFJlbW92ZWQgZ2NvbnN0cG9pbnRl ciBwYXJhbWV0ZXIuCisgICAgICAgICh0ZXN0V2ViVmlld0Zhdmljb24pOiBGaXhlZCB0byBtYWtl IGl0IHdvcmsgdG9nZXRoZXIgd2l0aCB0aGUKKyAgICAgICAgb3RoZXIgdGVzdHMgYW5kIHJlbW92 ZWQgZ2NvbnN0cG9pbnRlciBwYXJhbWV0ZXIuCisgICAgICAgICh0ZXN0RmF2aWNvbkRhdGFiYXNl KTogQ3JlYXRlZCB0byBjYWxsIGFsbCB0ZXN0cyBpbiB0aGUgcHJvcGVyCisgICAgICAgIG9yZGVy LgorICAgICAgICAoYmVmb3JlQWxsKTogQ2hhbmdlZCB0byBjYWxsIG9ubHkgdGVzdEZhdmljb25E YXRhYmFzZSBpbnN0ZWFkIG9mCisgICAgICAgIHRoZSBzZXBhcmF0ZSB0ZXN0cy4KKwogMjAxMy0w Ny0wMyAgR29yZG9uIFNoZXJpZGFuICA8Z29yZG9uX3NoZXJpZGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBJbXBsZW1lbnQgbWVjaGFuaXNtIHRvIGRldGVjdCAocGFydGlhbGx5KSBoaWRkZW4gYmxv Y2tlZCBwbHVnaW5zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcAppbmRl eCBkNWYzMDc2OGM4MzhhNDNhYmU0ZjU2MjY3MTFhZmRkY2Q5OTcyYzE5Li4zZDc0YWRlYTM3YWEy NjhlNWYxYmU2MDg3ODIxMmMwYjA1NTM1MzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNv bkRhdGFiYXNlLmNwcApAQCAtMTMzLDcgKzEzMyw3IEBAIHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2 ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqIHBhdGgsIEdIYXNo CiAgICAgc291cF9tZXNzYWdlX2JvZHlfY29tcGxldGUobWVzc2FnZS0+cmVzcG9uc2VfYm9keSk7 CiB9CiAKLXN0YXRpYyB2b2lkIHRlc3ROb3RJbml0aWFsaXplZChGYXZpY29uRGF0YWJhc2VUZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQorc3RhdGljIHZvaWQgdGVzdE5vdEluaXRpYWxpemVkKEZh dmljb25EYXRhYmFzZVRlc3QqIHRlc3QpCiB7CiAgICAgLy8gVHJ5IHRvIHJldHJpZXZlIGEgdmFs aWQgZmF2aWNvbiBmcm9tIGEgbm90IGluaXRpYWxpemVkIGRhdGFiYXNlLgogICAgIHRlc3QtPmdl dEZhdmljb25Gb3JQYWdlVVJJQW5kV2FpdFVudGlsUmVhZHkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0 aCgiL2ZvbyIpLmRhdGEoKSk7CkBAIC0xNDIsMTMgKzE0MiwxMyBAQCBzdGF0aWMgdm9pZCB0ZXN0 Tm90SW5pdGlhbGl6ZWQoRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikK ICAgICBnX2Fzc2VydF9jbXBpbnQodGVzdC0+bV9lcnJvci0+Y29kZSwgPT0sIFdFQktJVF9GQVZJ Q09OX0RBVEFCQVNFX0VSUk9SX05PVF9JTklUSUFMSVpFRCk7CiB9CiAKLXN0YXRpYyB2b2lkIHRl c3RTZXREaXJlY3RvcnkoRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikK K3N0YXRpYyB2b2lkIHRlc3RTZXREaXJlY3RvcnkoRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCkK IHsKICAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X2Zhdmljb25fZGF0YWJhc2VfZGlyZWN0b3J5 KHRlc3QtPm1fd2ViQ29udGV4dCwga1RlbXBEaXJlY3RvcnkpOwogICAgIGdfYXNzZXJ0X2NtcHN0 cihrVGVtcERpcmVjdG9yeSwgPT0sIHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZmF2aWNvbl9kYXRh YmFzZV9kaXJlY3RvcnkodGVzdC0+bV93ZWJDb250ZXh0KSk7CiB9CiAKLXN0YXRpYyB2b2lkIHRl c3RDbGVhckRhdGFiYXNlKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CitzdGF0aWMgdm9pZCB0ZXN0Q2xlYXJEYXRhYmFzZShGYXZpY29uRGF0YWJhc2VUZXN0KiB0ZXN0 KQogewogICAgIFdlYktpdEZhdmljb25EYXRhYmFzZSogZGF0YWJhc2UgPSB3ZWJraXRfd2ViX2Nv bnRleHRfZ2V0X2Zhdmljb25fZGF0YWJhc2UodGVzdC0+bV93ZWJDb250ZXh0KTsKICAgICB3ZWJr aXRfZmF2aWNvbl9kYXRhYmFzZV9jbGVhcihkYXRhYmFzZSk7CkBAIC0xNTcsNyArMTU3LDcgQEAg c3RhdGljIHZvaWQgdGVzdENsZWFyRGF0YWJhc2UoRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2VydCghaWNvblVSSSk7CiB9CiAKLXN0YXRpYyB2b2lk IHRlc3RHZXRGYXZpY29uKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CitzdGF0aWMgdm9pZCB0ZXN0R2V0RmF2aWNvbihGYXZpY29uRGF0YWJhc2VUZXN0KiB0ZXN0KQog ewogICAgIC8vIFdlIG5lZWQgdG8gbG9hZCB0aGUgcGFnZSBmaXJzdCB0byBlbnN1cmUgdGhlIGlj b24gZGF0YSB3aWxsIGJlCiAgICAgLy8gaW4gdGhlIGRhdGFiYXNlIGluIGNhc2UgdGhlcmUncyBh biBhc3NvY2lhdGVkIGZhdmljb24uCkBAIC0xOTgsNyArMTk4LDcgQEAgc3RhdGljIHZvaWQgdGVz dEdldEZhdmljb24oRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAg ICBnX2Fzc2VydCh0ZXN0LT5tX2Vycm9yKTsKIH0KIAotc3RhdGljIHZvaWQgdGVzdEdldEZhdmlj b25VUkkoRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3N0YXRpYyB2 b2lkIHRlc3RHZXRGYXZpY29uVVJJKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QpCiB7CiAgICAg V2ViS2l0RmF2aWNvbkRhdGFiYXNlKiBkYXRhYmFzZSA9IHdlYmtpdF93ZWJfY29udGV4dF9nZXRf ZmF2aWNvbl9kYXRhYmFzZSh0ZXN0LT5tX3dlYkNvbnRleHQpOwogCkBAIC0yMDcsOCArMjA3LDEw IEBAIHN0YXRpYyB2b2lkIHRlc3RHZXRGYXZpY29uVVJJKEZhdmljb25EYXRhYmFzZVRlc3QqIHRl c3QsIGdjb25zdHBvaW50ZXIpCiAgICAgQVNTRVJUX0NNUF9DU1RSSU5HKGljb25VUkkuZ2V0KCks ID09LCBrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvaWNvbi9mYXZpY29uLmljbyIpKTsKIH0KIAot c3RhdGljIHZvaWQgdGVzdFdlYlZpZXdGYXZpY29uKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3Qs IGdjb25zdHBvaW50ZXIpCitzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld0Zhdmljb24oRmF2aWNvbkRh dGFiYXNlVGVzdCogdGVzdCkKIHsKKyAgICB0ZXN0LT5tX2Zhdmljb25VUkkgPSBDU3RyaW5nKCk7 CisKICAgICBjYWlyb19zdXJmYWNlX3QqIGljb25Gcm9tV2ViVmlldyA9IHdlYmtpdF93ZWJfdmll d19nZXRfZmF2aWNvbih0ZXN0LT5tX3dlYlZpZXcpOwogICAgIGdfYXNzZXJ0KCFpY29uRnJvbVdl YlZpZXcpOwogCkBAIC0yMjUsNiArMjI3LDE4IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3RmF2 aWNvbihGYXZpY29uRGF0YWJhc2VUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIGdfYXNz ZXJ0X2NtcHVpbnQoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KGljb25Gcm9tV2ViVmll dyksID09LCAxNik7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RGYXZpY29uRGF0YWJhc2UoRmF2aWNv bkRhdGFiYXNlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICAvLyBUaGVzZSB0ZXN0 cyBkZXBlbmQgb24gdGhpcyBvcmRlciB0byBydW4gcHJvcGVybHkgc28gd2UgZGVjbGFyZSB0aGVt IGluIGEgc2luZ2xlIG9uZS4KKyAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMTQzNC4KKyAgICB0ZXN0Tm90SW5pdGlhbGl6ZWQodGVzdCk7CisgICAg dGVzdFNldERpcmVjdG9yeSh0ZXN0KTsKKyAgICB0ZXN0R2V0RmF2aWNvbih0ZXN0KTsKKyAgICB0 ZXN0R2V0RmF2aWNvblVSSSh0ZXN0KTsKKyAgICB0ZXN0V2ViVmlld0Zhdmljb24odGVzdCk7Cisg ICAgdGVzdENsZWFyRGF0YWJhc2UodGVzdCk7Cit9CisKIHZvaWQgYmVmb3JlQWxsKCkKIHsKICAg ICAvLyBTdGFydCBhIHNvdXAgc2VydmVyIGZvciB0ZXN0aW5nLgpAQCAtMjM1LDEyICsyNDksNyBA QCB2b2lkIGJlZm9yZUFsbCgpCiAgICAgZ19hc3NlcnQoa1RlbXBEaXJlY3RvcnkpOwogCiAgICAg Ly8gQWRkIHRlc3RzIHRvIHRoZSBzdWl0ZS4KLSAgICBGYXZpY29uRGF0YWJhc2VUZXN0OjphZGQo IldlYktpdEZhdmljb25EYXRhYmFzZSIsICJub3QtaW5pdGlhbGl6ZWQiLCB0ZXN0Tm90SW5pdGlh bGl6ZWQpOwotICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNvbkRhdGFi YXNlIiwgInNldC1kaXJlY3RvcnkiLCB0ZXN0U2V0RGlyZWN0b3J5KTsKLSAgICBGYXZpY29uRGF0 YWJhc2VUZXN0OjphZGQoIldlYktpdEZhdmljb25EYXRhYmFzZSIsICJnZXQtZmF2aWNvbiIsIHRl c3RHZXRGYXZpY29uKTsKLSAgICBGYXZpY29uRGF0YWJhc2VUZXN0OjphZGQoIldlYktpdEZhdmlj b25EYXRhYmFzZSIsICJnZXQtZmF2aWNvbi11cmkiLCB0ZXN0R2V0RmF2aWNvblVSSSk7Ci0gICAg RmF2aWNvbkRhdGFiYXNlVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImZhdmljb24iLCB0ZXN0 V2ViVmlld0Zhdmljb24pOwotICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2 aWNvbkRhdGFiYXNlIiwgImNsZWFyLWRhdGFiYXNlIiwgdGVzdENsZWFyRGF0YWJhc2UpOworICAg IEZhdmljb25EYXRhYmFzZVRlc3Q6OmFkZCgiV2ViS2l0RmF2aWNvbkRhdGFiYXNlIiwgImZhdmlj b24tZGF0YWJhc2UtdGVzdCIsIHRlc3RGYXZpY29uRGF0YWJhc2UpOwogfQogCiBzdGF0aWMgdm9p ZCB3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6ZWRDYWxsYmFjayhncG9pbnRlciwgR09iamVj dCopCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg MGU0ZmQ1NGU5MmM3NmM0ZGMxZTZlNzYyMzhlMjQ3NzBiYzU1M2Y5Zi4uYTJiZGRhNTdlNmRhMWNl N2RiNTMxNjdhMjFlMmQ0YTZjZmMyNDAxOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA3LTA1ICBYYWJpZXIg Um9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g V2ViS2l0MiB0ZXN0IFRlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2UgdGltZXMgb3V0IHdpdGggcmVj ZW50IGdsaWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExMTQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAgICAgICAoVGVzdFJ1bm5lcik6IFVuc2tpcHBl ZCBUZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlIHRlc3RzLgorCiAyMDEzLTA3LTAzICBEYXZpZCBG YXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgTWFrZWZpbGUgdG8gV2Vi S2l0TGF1bmNoZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rv b2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRleCA4YWE5ZDAxMjJjMDVkNWZmOTdkNTk4NDJl YWU4NTQ1YjI2MDFhODhlLi5jM2MwNzEyODQxMjg2ZjNlY2ZiOGY2YTdmY2ExMjJkYWM3NDdkNmRj IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC03Miw3ICs3Miw2IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAg ICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFdlYktpdEFjY2Vzc2liaWxp dHkiLCAiL3dlYmtpdDIvV2ViS2l0QWNjZXNzaWJpbGl0eS9hdHNwaS1iYXNpYy1oaWVyYXJjaHki LCAiVGVzdCBmYWlscyIsIDEwMDQwOCksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJ VGVzdHMvVGVzdFdlYktpdFdlYlZpZXciLCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0 IHRpbWVzIG91dCBhZnRlciByMTUwODkwIiwgMTE3Njg5KSwKICAgICAgICAgU2tpcHBlZFRlc3Qo IldlYktpdDJBUElUZXN0cy9UZXN0Q29udGV4dE1lbnUiLCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJ VEUsICJUZXN0IHRpbWVzIG91dCBhZnRlciByMTUwODkwIiwgMTE3Njg5KSwKLSAgICAgICAgU2tp cHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlIiwgU2tp cHBlZFRlc3QuRU5USVJFX1NVSVRFLCAiVGVzdCB0aW1lcyBvdXQiLCAxMTc2OTApLAogICAgICAg ICBTa2lwcGVkVGVzdCgiVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0MiIsICJXZWJLaXQyLkNhbkhh bmRsZVJlcXVlc3QiLCAiVGVzdCBmYWlscyIsIDg4NDUzKSwKICAgICAgICAgU2tpcHBlZFRlc3Qo IlRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdDIiLCAiV2ViS2l0Mi5Nb3VzZU1vdmVBZnRlckNyYXNo IiwgIlRlc3QgaXMgZmxha3kiLCA4NTA2NiksCiAgICAgICAgIFNraXBwZWRUZXN0KCJUZXN0V2Vi S2l0QVBJL1Rlc3RXZWJLaXQyIiwgIldlYktpdDIuTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5 b3V0Rm9ySW1hZ2VzIiwgIlRlc3QgaXMgZmxha3kiLCA4NTA2NiksCg==