36227 2010-03-17 10:21:24 -0700 [GTK] Failing tests http/tests/misc/image-blocked-src-change.html & http/tests/misc/image-blocked-src-no-change.html 2010-03-18 06:32:10 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 svillar webkit-unassigned commit-queue mrobinson xan.lopez oldest_to_newest 200844 0 svillar 2010-03-17 10:21:24 -0700 Both tests are failing because we are printing full URLs while tests only expect filenames 200852 1 50922 svillar 2010-03-17 10:35:35 -0700 Created attachment 50922 Patch that modifies the way we print local URIs in DRT Tests expect only the file name for the local URIs. This patch makes DRT print the local URIs as expected by tests 200894 2 50922 xan.lopez 2010-03-17 12:08:50 -0700 Comment on attachment 50922 Patch that modifies the way we print local URIs in DRT >+ gchar* testMessage = NULL; Let's try to use 0 instead of NULL, since it's what the style guide says (yes, I realize this file in particular has a mix of NULLs and 0s...) >+ const gchar* uriScheme; >+ >+ // Tests expect only the filename part of local URIs >+ uriScheme = g_strstr_len(message, -1, "file://"); >+ if (uriScheme) { >+ GString* tempString = g_string_sized_new(strlen(message)); >+ gchar* filename = g_strrstr(uriScheme, G_DIR_SEPARATOR_S); >+ >+ if (filename) { >+ filename++; >+ tempString = g_string_append_len(tempString, message, (uriScheme - message)); >+ tempString = g_string_append_len(tempString, filename, strlen(filename)); >+ testMessage = g_string_free(tempString, FALSE); >+ } You are assuming that there's only one file:// and that it will be the last thing in the string, right? The first assumption seems to be shared by all DRTs, but not the second one, so perhaps you should find the last separator going forward from file:// ? You could just jump to the first whitespace and then either do it manually or use g_path_get_basename, I guess. >+ } >+ >+ fprintf(stdout, "CONSOLE MESSAGE: line %d: %s\n", line, (testMessage) ? testMessage : message); The parenthesis around testMessage are not really needed. >+ g_free(testMessage); >+ > return TRUE; > } > >-- >1.7.0 > 201232 3 svillar 2010-03-18 03:12:53 -0700 (In reply to comment #2) > (From update of attachment 50922 [details]) > >+ const gchar* uriScheme; > >+ > >+ // Tests expect only the filename part of local URIs > >+ uriScheme = g_strstr_len(message, -1, "file://"); > >+ if (uriScheme) { > >+ GString* tempString = g_string_sized_new(strlen(message)); > >+ gchar* filename = g_strrstr(uriScheme, G_DIR_SEPARATOR_S); > >+ > >+ if (filename) { > >+ filename++; > >+ tempString = g_string_append_len(tempString, message, (uriScheme - message)); > >+ tempString = g_string_append_len(tempString, filename, strlen(filename)); > >+ testMessage = g_string_free(tempString, FALSE); > >+ } > > You are assuming that there's only one file:// and that it will be the last > thing in the string, right? The first assumption seems to be shared by all > DRTs, but not the second one, so perhaps you should find the last separator > going forward from file:// ? You could just jump to the first whitespace and > then either do it manually or use g_path_get_basename, I guess. I'm indeed assuming that there is only one "file://" but nothing more IMHO. In tempString = g_string_append_len(tempString, filename, strlen(filename)); I'm appending everything starting from the filename, so if there is anything more after the filename it will be copied as strlen(filename) will not stop until the end of the "message" string is found. Or maybe I'm not getting your point... 201236 4 51017 svillar 2010-03-18 03:46:17 -0700 Created attachment 51017 Patch that modifies the way we print local URIs in DRT New version of the patch with Xan's requests I have also removed another 7 extra tests from the Skipped file that were failing for the same reason 201245 5 51017 xan.lopez 2010-03-18 03:57:40 -0700 Comment on attachment 51017 Patch that modifies the way we print local URIs in DRT r=me 201265 6 51017 commit-queue 2010-03-18 06:32:06 -0700 Comment on attachment 51017 Patch that modifies the way we print local URIs in DRT Clearing flags on attachment: 51017 Committed r56157: <http://trac.webkit.org/changeset/56157> 201266 7 commit-queue 2010-03-18 06:32:10 -0700 All reviewed patches have been landed. Closing bug. 50922 2010-03-17 10:35:35 -0700 2010-03-18 03:46:17 -0700 Patch that modifies the way we print local URIs in DRT 0001-Print-file-name-for-local-URIs-instead-of-whole-URI.patch text/plain 3973 svillar RnJvbSA0ZTUwMjcxMjRiMjEwODY1ZTUxMzAzOWRlYmY5N2FiOTY4MzdhZDQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTZXJnaW8gVmlsbGFyIFNlbmluIDxzdmlsbGFyQGlnYWxpYS5j b20+CkRhdGU6IFdlZCwgMTcgTWFyIDIwMTAgMTg6MzI6NDAgKzAxMDAKU3ViamVjdDogW1BBVENI XSBQcmludCBmaWxlIG5hbWUgZm9yIGxvY2FsIFVSSXMgaW5zdGVhZCBvZiB3aG9sZSBVUkkKCi0t LQogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTIgKysrKysrKysrKysrCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCAgICAgICAg ICAgICAgICAgIHwgICAgMiAtLQogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysrKysrCiBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwIHwgICAyMSArKysrKysrKysrKysrKysrKysrKy0K IDQgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggZTMxYTBjMy4uNGVmNjU3NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTAzLTE3ICBT ZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEZhaWxpbmcgdGVzdHMgaHR0 cC90ZXN0cy9taXNjL2ltYWdlLWJsb2NrZWQtc3JjLWNoYW5nZS5odG1sCisgICAgICAgICYgaHR0 cC90ZXN0cy9taXNjL2ltYWdlLWJsb2NrZWQtc3JjLW5vLWNoYW5nZS5odG1sCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjIyNworCisgICAgICAgIFJl bW92ZWQgYm90aCB0ZXN0cyBmcm9tIHRoZSBsaXN0IG9mIFNraXBwZWQKKworICAgICAgICAqIHBs YXRmb3JtL2d0ay9Ta2lwcGVkOgorCiAyMDEwLTAzLTE1ICBNT1JJVEEgSGFqaW1lICA8bW9ycml0 YUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3Yu CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmluZGV4IDFmMDIxZWEuLmIxNmE1ZjcgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC0zNDI4LDggKzM0MjgsNiBAQCBodHRwL3Rlc3RzL21lZGlh L3ZpZGVvLXNlZWthYmxlLXN0YWxsLmh0bWwKIGh0dHAvdGVzdHMvbWltZS9zdGFuZGFyZC1tb2Rl LWxvYWRzLXN0eWxlc2hlZXQtd2l0aC1lbXB0eS1jb250ZW50LXR5cGUuaHRtbAogaHR0cC90ZXN0 cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVldC13aXRoLXRleHQtY3NzLWFuZC1p bnZhbGlkLXR5cGUuaHRtbAogaHR0cC90ZXN0cy9taXNjL2FjaWQzLmh0bWwKLWh0dHAvdGVzdHMv bWlzYy9pbWFnZS1ibG9ja2VkLXNyYy1jaGFuZ2UuaHRtbAotaHR0cC90ZXN0cy9taXNjL2ltYWdl LWJsb2NrZWQtc3JjLW5vLWNoYW5nZS5odG1sCiBodHRwL3Rlc3RzL21pc2MvaXNpbmRleC1mb3Jt ZGF0YS5odG1sCiBodHRwL3Rlc3RzL21pc2MvcG9saWN5LWRlbGVnYXRlLWNhbGxlZC10d2ljZS5o dG1sCiBodHRwL3Rlc3RzL21pc2MvcmVkaXJlY3QtdG8tZXh0ZXJuYWwtdXJsLmh0bWwKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRl eCA0MTIwYWVmLi5kNmQyY2NjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMtMTcgIFNl cmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRmFpbGluZyB0ZXN0cyBodHRw L3Rlc3RzL21pc2MvaW1hZ2UtYmxvY2tlZC1zcmMtY2hhbmdlLmh0bWwKKyAgICAgICAgJiBodHRw L3Rlc3RzL21pc2MvaW1hZ2UtYmxvY2tlZC1zcmMtbm8tY2hhbmdlLmh0bWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MjI3CisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAod2ViVmlld0Nv bnNvbGVNZXNzYWdlKTogcHJpbnQgb25seSB0aGUgZmlsZSBuYW1lIGluc3RlYWQgb2YgdGhlCisg ICAgICAgIHdob2xlIFVSSSB3aGVuIHByaW50aW5nIG1lc3NhZ2VzIHdpdGggbG9jYWwgVVJJJ3MK KwogMjAxMC0wMy0xNSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKaW5kZXggNmFhNGMzZS4uNTY3ZjQwMyAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAor KysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCkBA IC02MzMsNyArNjMzLDI2IEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdXaW5kb3dPYmplY3RDbGVhcmVk KFdlYktpdFdlYlZpZXcqIHZpZXcsIFdlYktpdFdlYkZyYW1lKiBmcmFtCiAKIHN0YXRpYyBnYm9v bGVhbiB3ZWJWaWV3Q29uc29sZU1lc3NhZ2UoV2ViS2l0V2ViVmlldyogdmlldywgY29uc3QgZ2No YXIqIG1lc3NhZ2UsIHVuc2lnbmVkIGludCBsaW5lLCBjb25zdCBnY2hhciogc291cmNlSWQsIGdw b2ludGVyIGRhdGEpCiB7Ci0gICAgZnByaW50ZihzdGRvdXQsICJDT05TT0xFIE1FU1NBR0U6IGxp bmUgJWQ6ICVzXG4iLCBsaW5lLCBtZXNzYWdlKTsKKyAgICBnY2hhciogdGVzdE1lc3NhZ2UgPSBO VUxMOworICAgIGNvbnN0IGdjaGFyKiB1cmlTY2hlbWU7CisKKyAgICAvLyBUZXN0cyBleHBlY3Qg b25seSB0aGUgZmlsZW5hbWUgcGFydCBvZiBsb2NhbCBVUklzCisgICAgdXJpU2NoZW1lID0gZ19z dHJzdHJfbGVuKG1lc3NhZ2UsIC0xLCAiZmlsZTovLyIpOworICAgIGlmICh1cmlTY2hlbWUpIHsK KyAgICAgICAgR1N0cmluZyogdGVtcFN0cmluZyA9IGdfc3RyaW5nX3NpemVkX25ldyhzdHJsZW4o bWVzc2FnZSkpOworICAgICAgICBnY2hhciogZmlsZW5hbWUgPSBnX3N0cnJzdHIodXJpU2NoZW1l LCBHX0RJUl9TRVBBUkFUT1JfUyk7CisKKyAgICAgICAgaWYgKGZpbGVuYW1lKSB7CisgICAgICAg ICAgICBmaWxlbmFtZSsrOworICAgICAgICAgICAgdGVtcFN0cmluZyA9IGdfc3RyaW5nX2FwcGVu ZF9sZW4odGVtcFN0cmluZywgbWVzc2FnZSwgKHVyaVNjaGVtZSAtIG1lc3NhZ2UpKTsKKyAgICAg ICAgICAgIHRlbXBTdHJpbmcgPSBnX3N0cmluZ19hcHBlbmRfbGVuKHRlbXBTdHJpbmcsIGZpbGVu YW1lLCBzdHJsZW4oZmlsZW5hbWUpKTsKKyAgICAgICAgICAgIHRlc3RNZXNzYWdlID0gZ19zdHJp bmdfZnJlZSh0ZW1wU3RyaW5nLCBGQUxTRSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBmcHJp bnRmKHN0ZG91dCwgIkNPTlNPTEUgTUVTU0FHRTogbGluZSAlZDogJXNcbiIsIGxpbmUsICh0ZXN0 TWVzc2FnZSkgPyB0ZXN0TWVzc2FnZSA6IG1lc3NhZ2UpOworICAgIGdfZnJlZSh0ZXN0TWVzc2Fn ZSk7CisKICAgICByZXR1cm4gVFJVRTsKIH0KIAotLSAKMS43LjAKCg== 51017 2010-03-18 03:46:17 -0700 2010-03-18 06:32:06 -0700 Patch that modifies the way we print local URIs in DRT 0001-Print-file-name-for-local-URIs-instead-of-whole-URI.patch text/plain 5413 svillar RnJvbSBlMTVkYmVmZGVhYTc0Yjc0MGE3ZTJmNTA5ZWI4NGRiMGJjZjM5NmUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTZXJnaW8gVmlsbGFyIFNlbmluIDxzdmlsbGFyQGlnYWxpYS5j b20+CkRhdGU6IFdlZCwgMTcgTWFyIDIwMTAgMTg6MzI6NDAgKzAxMDAKU3ViamVjdDogW1BBVENI XSBQcmludCBmaWxlIG5hbWUgZm9yIGxvY2FsIFVSSXMgaW5zdGVhZCBvZiB3aG9sZSBVUkkKCi0t LQogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MjEgKysrKysrKysrKysrKysrKysrKysrCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBl ZCAgICAgICAgICAgICAgICAgIHwgICAgOSAtLS0tLS0tLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysrKwogV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcCB8ICAgMjEgKysrKysr KysrKysrKysrKysrKystCiA0IGZpbGVzIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDEwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCBlMzFhMGMzLi5hMzY0MDhlIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTAtMDMtMTcgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10g RmFpbGluZyB0ZXN0cyBodHRwL3Rlc3RzL21pc2MvaW1hZ2UtYmxvY2tlZC1zcmMtY2hhbmdlLmh0 bWwKKyAgICAgICAgJiBodHRwL3Rlc3RzL21pc2MvaW1hZ2UtYmxvY2tlZC1zcmMtbm8tY2hhbmdl Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2 MjI3CisKKyAgICAgICAgUmVtb3ZlZCB0ZXN0cyBmcm9tIHRoZSBsaXN0IG9mIFNraXBwZWQ6Cisg ICAgICAgIGh0dHAvdGVzdHMvbWlzYy9pbWFnZS1ibG9ja2VkLXNyYy1uby1jaGFuZ2UuaHRtbAor ICAgICAgICBodHRwL3Rlc3RzL21pc2MvaW1hZ2UtYmxvY2tlZC1zcmMtY2hhbmdlLmh0bWwKKyAg ICAgICAgaHR0cC90ZXN0cy9zZWN1cml0eS9sb2NhbC1DU1MtZnJvbS1yZW1vdGUuaHRtbAorICAg ICAgICBodHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLXZpZGVvLXBvc3Rlci1mcm9tLXJlbW90ZS5o dG1sCisgICAgICAgIGh0dHAvdGVzdHMvc2VjdXJpdHkvZnJhbWUtbG9hZGluZy12aWEtZG9jdW1l bnQtd3JpdGUuaHRtbAorICAgICAgICBodHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLWlGcmFtZS1m cm9tLXJlbW90ZS5odG1sCisgICAgICAgIGh0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwtdmlkZW8t c3JjLWZyb20tcmVtb3RlLmh0bWwKKyAgICAgICAgaHR0cC90ZXN0cy9zZWN1cml0eS9sb2NhbC1p bWFnZS1mcm9tLXJlbW90ZS5odG1sCisgICAgICAgIGh0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwt SmF2YVNjcmlwdC1mcm9tLXJlbW90ZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tp cHBlZDoKKwogMjAxMC0wMy0xNSAgTU9SSVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvU2tpcHBlZAppbmRleCAxZjAyMWVhLi40YTc5YzZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tp cHBlZApAQCAtMzQyOCw4ICszNDI4LDYgQEAgaHR0cC90ZXN0cy9tZWRpYS92aWRlby1zZWVrYWJs ZS1zdGFsbC5odG1sCiBodHRwL3Rlc3RzL21pbWUvc3RhbmRhcmQtbW9kZS1sb2Fkcy1zdHlsZXNo ZWV0LXdpdGgtZW1wdHktY29udGVudC10eXBlLmh0bWwKIGh0dHAvdGVzdHMvbWltZS9zdGFuZGFy ZC1tb2RlLWxvYWRzLXN0eWxlc2hlZXQtd2l0aC10ZXh0LWNzcy1hbmQtaW52YWxpZC10eXBlLmh0 bWwKIGh0dHAvdGVzdHMvbWlzYy9hY2lkMy5odG1sCi1odHRwL3Rlc3RzL21pc2MvaW1hZ2UtYmxv Y2tlZC1zcmMtY2hhbmdlLmh0bWwKLWh0dHAvdGVzdHMvbWlzYy9pbWFnZS1ibG9ja2VkLXNyYy1u by1jaGFuZ2UuaHRtbAogaHR0cC90ZXN0cy9taXNjL2lzaW5kZXgtZm9ybWRhdGEuaHRtbAogaHR0 cC90ZXN0cy9taXNjL3BvbGljeS1kZWxlZ2F0ZS1jYWxsZWQtdHdpY2UuaHRtbAogaHR0cC90ZXN0 cy9taXNjL3JlZGlyZWN0LXRvLWV4dGVybmFsLXVybC5odG1sCkBAIC0zNDQyLDE0ICszNDQwLDcg QEAgaHR0cC90ZXN0cy9zZWN1cml0eS9jcmVkZW50aWFscy1pbi1yZWZlcmVyLmh0bWwKIGh0dHAv dGVzdHMvc2VjdXJpdHkvY3Jvc3MtZnJhbWUtYWNjZXNzLXB1dC5odG1sCiBodHRwL3Rlc3RzL3Nl Y3VyaXR5L2RhdGFUcmFuc2Zlci1zZXQtZGF0YS1maWxlLXVybC5odG1sCiBodHRwL3Rlc3RzL3Nl Y3VyaXR5L2ZlZWQtdXJscy1mcm9tLXJlbW90ZS5odG1sCi1odHRwL3Rlc3RzL3NlY3VyaXR5L2Zy YW1lLWxvYWRpbmctdmlhLWRvY3VtZW50LXdyaXRlLmh0bWwKLWh0dHAvdGVzdHMvc2VjdXJpdHkv bG9jYWwtQ1NTLWZyb20tcmVtb3RlLmh0bWwKLWh0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwtSmF2 YVNjcmlwdC1mcm9tLXJlbW90ZS5odG1sCi1odHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLWlGcmFt ZS1mcm9tLXJlbW90ZS5odG1sCi1odHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLWltYWdlLWZyb20t cmVtb3RlLmh0bWwKLWh0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwtdmlkZW8tcG9zdGVyLWZyb20t cmVtb3RlLmh0bWwKIGh0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwtdmlkZW8tc291cmNlLWZyb20t cmVtb3RlLmh0bWwKLWh0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwtdmlkZW8tc3JjLWZyb20tcmVt b3RlLmh0bWwKIGh0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L2Fib3V0LWJsYW5rLWlm cmFtZS1pbi1tYWluLWZyYW1lLmh0bWwKIGh0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50 L2RhdGEtdXJsLWlmcmFtZS1pbi1tYWluLWZyYW1lLmh0bWwKIGh0dHAvdGVzdHMvc2VjdXJpdHkv bWl4ZWRDb250ZW50L2RhdGEtdXJsLXNjcmlwdC1pbi1pZnJhbWUuaHRtbApkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQxMjBh ZWYuLmQ2ZDJjY2MgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJL aXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMy0xNyAgU2VyZ2lvIFZp bGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBGYWlsaW5nIHRlc3RzIGh0dHAvdGVzdHMv bWlzYy9pbWFnZS1ibG9ja2VkLXNyYy1jaGFuZ2UuaHRtbAorICAgICAgICAmIGh0dHAvdGVzdHMv bWlzYy9pbWFnZS1ibG9ja2VkLXNyYy1uby1jaGFuZ2UuaHRtbAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyMjcKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgICh3ZWJWaWV3Q29uc29sZU1l c3NhZ2UpOiBwcmludCBvbmx5IHRoZSBmaWxlIG5hbWUgaW5zdGVhZCBvZiB0aGUKKyAgICAgICAg d2hvbGUgVVJJIHdoZW4gcHJpbnRpbmcgbWVzc2FnZXMgd2l0aCBsb2NhbCBVUkkncworCiAyMDEw LTAzLTE1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3Rr L0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCA2YWE0YzNlLi45ZjcxMzg3IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTYzMyw3 ICs2MzMsMjYgQEAgc3RhdGljIHZvaWQgd2ViVmlld1dpbmRvd09iamVjdENsZWFyZWQoV2ViS2l0 V2ViVmlldyogdmlldywgV2ViS2l0V2ViRnJhbWUqIGZyYW0KIAogc3RhdGljIGdib29sZWFuIHdl YlZpZXdDb25zb2xlTWVzc2FnZShXZWJLaXRXZWJWaWV3KiB2aWV3LCBjb25zdCBnY2hhciogbWVz c2FnZSwgdW5zaWduZWQgaW50IGxpbmUsIGNvbnN0IGdjaGFyKiBzb3VyY2VJZCwgZ3BvaW50ZXIg ZGF0YSkKIHsKLSAgICBmcHJpbnRmKHN0ZG91dCwgIkNPTlNPTEUgTUVTU0FHRTogbGluZSAlZDog JXNcbiIsIGxpbmUsIG1lc3NhZ2UpOworICAgIGdjaGFyKiB0ZXN0TWVzc2FnZSA9IDA7CisgICAg Y29uc3QgZ2NoYXIqIHVyaVNjaGVtZTsKKworICAgIC8vIFRlc3RzIGV4cGVjdCBvbmx5IHRoZSBm aWxlbmFtZSBwYXJ0IG9mIGxvY2FsIFVSSXMKKyAgICB1cmlTY2hlbWUgPSBnX3N0cnN0cl9sZW4o bWVzc2FnZSwgLTEsICJmaWxlOi8vIik7CisgICAgaWYgKHVyaVNjaGVtZSkgeworICAgICAgICBH U3RyaW5nKiB0ZW1wU3RyaW5nID0gZ19zdHJpbmdfc2l6ZWRfbmV3KHN0cmxlbihtZXNzYWdlKSk7 CisgICAgICAgIGdjaGFyKiBmaWxlbmFtZSA9IGdfc3RycnN0cih1cmlTY2hlbWUsIEdfRElSX1NF UEFSQVRPUl9TKTsKKworICAgICAgICBpZiAoZmlsZW5hbWUpIHsKKyAgICAgICAgICAgIGZpbGVu YW1lICs9IHN0cmxlbihHX0RJUl9TRVBBUkFUT1JfUyk7CisgICAgICAgICAgICB0ZW1wU3RyaW5n ID0gZ19zdHJpbmdfYXBwZW5kX2xlbih0ZW1wU3RyaW5nLCBtZXNzYWdlLCAodXJpU2NoZW1lIC0g bWVzc2FnZSkpOworICAgICAgICAgICAgdGVtcFN0cmluZyA9IGdfc3RyaW5nX2FwcGVuZF9sZW4o dGVtcFN0cmluZywgZmlsZW5hbWUsIHN0cmxlbihmaWxlbmFtZSkpOworICAgICAgICAgICAgdGVz dE1lc3NhZ2UgPSBnX3N0cmluZ19mcmVlKHRlbXBTdHJpbmcsIEZBTFNFKTsKKyAgICAgICAgfQor ICAgIH0KKworICAgIGZwcmludGYoc3Rkb3V0LCAiQ09OU09MRSBNRVNTQUdFOiBsaW5lICVkOiAl c1xuIiwgbGluZSwgdGVzdE1lc3NhZ2UgPyB0ZXN0TWVzc2FnZSA6IG1lc3NhZ2UpOworICAgIGdf ZnJlZSh0ZXN0TWVzc2FnZSk7CisKICAgICByZXR1cm4gVFJVRTsKIH0KIAotLSAKMS43LjAKCg==