91514 2012-07-17 10:07:25 -0700 [Qt] feature detection in orwt/nrwt does not work with force_static_libs_as_shared 2012-07-18 14:36:46 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED LayoutTestFailure, Qt, QtTriaged P2 Normal --- 1 kbalazs kbalazs abarth dpranke hausmann ojan vestbo webkit.review.bot oldest_to_newest 671346 0 kbalazs 2012-07-17 10:07:25 -0700 The test harnesses analyze the webcore lib with nm to find out what is enabled and what is not. With force_static_libs_as_shared the libQtWebKit.so actually not contains much, we need to do it better. 671361 1 152780 kbalazs 2012-07-17 10:25:03 -0700 Created attachment 152780 Patch 671479 2 152780 dpranke 2012-07-17 12:05:46 -0700 Comment on attachment 152780 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152780&action=review mostly looks fine ... one question: > Tools/Scripts/webkitdirs.pm:743 > + if ($isSearchingForWebCore) { isn't $isSearchingForWebCore only true if WebCore is in the name? If so, does your s/// actually do anything? 672173 3 kbalazs 2012-07-18 02:49:54 -0700 (In reply to comment #2) > (From update of attachment 152780 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152780&action=review > > mostly looks fine ... one question: > > > Tools/Scripts/webkitdirs.pm:743 > > + if ($isSearchingForWebCore) { > > isn't $isSearchingForWebCore only true if WebCore is in the name? If so, does your s/// actually do anything? Yes, because at the very first we overwrite the parameter: if (isQt()) { $libraryName = "QtWebKit"; because normally libQtWebKit contains every symbol (and it seems like only features.pm use this function anyway). I know it's not really correct, but I have to keep this hacked logic to make it work with a default build and also with force_static_libs_as_shared. 672175 4 kbalazs 2012-07-18 02:51:55 -0700 Forgot to mention the motivation of fixing this: I could not run some tests without the patch. For example compositing tets are skipped, because the test harness believes AC is disabled. 672636 5 dpranke 2012-07-18 12:44:15 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 152780 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=152780&action=review > > > > mostly looks fine ... one question: > > > > > Tools/Scripts/webkitdirs.pm:743 > > > + if ($isSearchingForWebCore) { > > > > isn't $isSearchingForWebCore only true if WebCore is in the name? If so, does your s/// actually do anything? > > Yes, because at the very first we overwrite the parameter: > if (isQt()) { > $libraryName = "QtWebKit"; > because normally libQtWebKit contains every symbol (and it seems like only features.pm use this function anyway). I know it's not really correct, but I have to keep this hacked logic to make it work with a default build and also with force_static_libs_as_shared. Oh, right. Okay. 672769 6 152780 kbalazs 2012-07-18 14:36:39 -0700 Comment on attachment 152780 Patch Clearing flags on attachment: 152780 Committed r123021: <http://trac.webkit.org/changeset/123021> 672770 7 kbalazs 2012-07-18 14:36:46 -0700 All reviewed patches have been landed. Closing bug. 152780 2012-07-17 10:25:03 -0700 2012-07-18 14:36:39 -0700 Patch bug-91514-20120717192500.patch text/plain 4980 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyODQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGM1NmM2YzY0YzkyYTM1YWFmMGY5ZWRkMTJhNmE2Y2My MDMxNzk4MS4uMDA2ZDQ5YWZiN2M2OWE4MWY1Y2YyYjRiZDgxMmNkOTBlZTgyNmYxMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEyLTA3LTE3ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKwor ICAgICAgICBbUXRdIGZlYXR1cmUgZGV0ZWN0aW9uIGluIG9yd3QvbnJ3dCBkb2VzIG5vdCB3b3Jr IHdpdGggZm9yY2Vfc3RhdGljX2xpYnNfYXNfc2hhcmVkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTUxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFuYWx5emluZyBsaWJRdFdlYktpdC5zbyBpcyBub3Qg ZW5vdWdoIGluIHRoZSBjYXNlIG9mIGZvcmNlX3N0YXRpY19saWJzX2FzX3NoYXJlZC4KKyAgICAg ICAgV2UgbmVlZCB0byBhbmFseXplIGFsbCB0aGUgc2hhcmVkIGxpYnJhcnkgb3IgYXQgbGVhc3Qg dGhlIFdlYkNvcmUgb25lLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoYnVpbHREeWxpYlBhdGhGb3JOYW1lKToKKyAgICAgICAgSW4gb3J3dCBpdCBpcyBoYXJk IGNvZGVkIHRvIHNlYXJjaCBmb3Igc3ltYm9scyBpbiB0aGUgV2ViQ29yZSBsaWJyYXJ5LgorICAg ICAgICBXaGlsZSBpbiB0aGVvcnkgaXQgaXMgcG9zc2libGUgdGhhdCBzeW1ib2xzIGZvciBhIGdp dmVuIGZlYXR1cmUgYXJlIG5vdAorICAgICAgICBsb2NhdGVkIGluIHRoYXQsIGl0IGRvZXNuJ3Qg aGFwcGVuIGluIHByYWN0aWNlLCBzbyByZXR1cm5pbmcgdGhlIHBhdGggb2YKKyAgICAgICAgdGhl IFdlYkNvcmUgbGlicmFyeSBmb3IgYSBmb3JjZV9zdGF0aWNfbGlic19hc19zaGFyZWQgYnVpbGQg aXMgZW5vdWdoIHRvCisgICAgICAgIGZpeCB0aGUgYnVnIGFuZCBpdCBkb2Vzbid0IHJlcXVpcmUg YSBiaWdnZXIgcmVmYWN0b3JpbmcuIEZvciBhIGRlZmF1bHQKKyAgICAgICAgYnVpbGQgd2Ugc3Rp bGwgcmV0dXJuIHRoZSBwYXRoIG9mIHRoZSBRdFdlYktpdCBsaWIuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weToKKyAgICAgICAgKFF0UG9ydC5fbW9k dWxlc190b19zZWFyY2hfZm9yX3N5bWJvbHMpOgorICAgICAgICBFbnVtZXJhdGUgYWxsIGR5bmFt aWMgbGlicmFyaWVzLCBub3QganVzdCB0aGUgUXRXZWJLaXQgb25lLgorCiAyMDEyLTA3LTE3ICBT aGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByMTIyODM0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDFkYTA5NDcx YmE3OGQ4MzFhMWIzODE5ZTc4YjQxMTQ4Y2Q0ZTFhZjguLmMwMjU5YzU5ZDg0NDNlNTYwZjQ2ZmNl ZDY0OGE4Yjc0MWFlODNlZGEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTcxNSwxMSArNzE1LDEzIEBA IHN1YiBidWlsdER5bGliUGF0aEZvck5hbWUKICAgICAgICAgcmV0dXJuICIkY29uZmlndXJhdGlv blByb2R1Y3REaXIvJGxpYnJhcnlOYW1lL2xpYiIgLiBsYygkbGlicmFyeU5hbWUpIC4gJGxpYnJh cnlFeHRlbnNpb247CiAgICAgfQogICAgIGlmIChpc1F0KCkpIHsKKyAgICAgICAgbXkgJGlzU2Vh cmNoaW5nRm9yV2ViQ29yZSA9ICRsaWJyYXJ5TmFtZSA9fiAiV2ViQ29yZSI7CiAgICAgICAgICRs aWJyYXJ5TmFtZSA9ICJRdFdlYktpdCI7CisgICAgICAgIG15ICRyZXN1bHQ7CiAgICAgICAgIGlm IChpc0RhcndpbigpIGFuZCAtZCAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL2xpYi8kbGlicmFy eU5hbWUuZnJhbWV3b3JrIikgewotICAgICAgICAgICAgcmV0dXJuICIkY29uZmlndXJhdGlvblBy b2R1Y3REaXIvbGliLyRsaWJyYXJ5TmFtZS5mcmFtZXdvcmsvJGxpYnJhcnlOYW1lIjsKKyAgICAg ICAgICAgICRyZXN1bHQgPSAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL2xpYi8kbGlicmFyeU5h bWUuZnJhbWV3b3JrLyRsaWJyYXJ5TmFtZSI7CiAgICAgICAgIH0gZWxzaWYgKGlzRGFyd2luKCkg YW5kIC1kICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvbGliIikgewotICAgICAgICAgICAgcmV0 dXJuICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvbGliL2xpYiRsaWJyYXJ5TmFtZS5keWxpYiI7 CisgICAgICAgICAgICAkcmVzdWx0ID0gIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci9saWIvbGli JGxpYnJhcnlOYW1lLmR5bGliIjsKICAgICAgICAgfSBlbHNpZiAoaXNXaW5kb3dzKCkpIHsKICAg ICAgICAgICAgIGlmIChjb25maWd1cmF0aW9uKCkgZXEgIkRlYnVnIikgewogICAgICAgICAgICAg ICAgICMgT24gV2luZG93cywgdGhlcmUgaXMgYSAiZCIgc3VmZml4IHRvIHRoZSBsaWJyYXJ5IG5h bWUuIFNlZSA8aHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNTM5MjQvPi4KQEAgLTcz MiwxMCArNzM0LDIzIEBAIHN1YiBidWlsdER5bGliUGF0aEZvck5hbWUKICAgICAgICAgICAgIGlm IChub3QgJHF0TWFqb3JWZXJzaW9uKSB7CiAgICAgICAgICAgICAgICAgJHF0TWFqb3JWZXJzaW9u ID0gIiI7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gIiRjb25maWd1cmF0aW9u UHJvZHVjdERpci9saWIvJGxpYnJhcnlOYW1lJHF0TWFqb3JWZXJzaW9uLmRsbCI7CisKKyAgICAg ICAgICAgICRyZXN1bHQgPSAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL2xpYi8kbGlicmFyeU5h bWUkcXRNYWpvclZlcnNpb24uZGxsIjsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHJl dHVybiAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL2xpYi9saWIkbGlicmFyeU5hbWUuc28iOwor ICAgICAgICAgICAgJHJlc3VsdCA9ICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvbGliL2xpYiRs aWJyYXJ5TmFtZS5zbyI7CisgICAgICAgIH0KKworICAgICAgICBpZiAoJGlzU2VhcmNoaW5nRm9y V2ViQ29yZSkgeworICAgICAgICAgICAgIyBXaXRoIENPTkZJRys9Zm9yY2Vfc3RhdGljX2xpYnNf YXNfc2hhcmVkIHdlIGhhdmUgYSBzaGFyZWQgbGlicmFyeSBmb3IgZWFjaCBzdWJkaXIuCisgICAg ICAgICAgICAjIEZvciBmZWF0dXJlIGRldGVjdGlvbiB0byB3b3JrIGl0IGlzIG5lY2Vzc2FyeSB0 byByZXR1cm4gdGhlIHBhdGggb2YgdGhlIFdlYkNvcmUgbGlicmFyeSBoZXJlLgorICAgICAgICAg ICAgbXkgJHJlcGxhY2VkV2l0aFdlYkNvcmUgPSAkcmVzdWx0OworICAgICAgICAgICAgJHJlcGxh Y2VkV2l0aFdlYkNvcmUgPX4gcy8kbGlicmFyeU5hbWUvV2ViQ29yZS9nOworICAgICAgICAgICAg aWYgKC1lICRyZXBsYWNlZFdpdGhXZWJDb3JlKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuICRy ZXBsYWNlZFdpdGhXZWJDb3JlOworICAgICAgICAgICAgfQogICAgICAgICB9CisKKyAgICAgICAg cmV0dXJuICRyZXN1bHQ7CiAgICAgfQogICAgIGlmIChpc1d4KCkpIHsKICAgICAgICAgcmV0dXJu ICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvbGlid3h3ZWJraXQuZHlsaWIiOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggMTU0Y2ZkYWI4 NGQ3OGFmZjNlODRmN2Q4OTYwYmY4NTEwYzM3MDJlYy4uYWFhYWZhYzVkMzY0Y2NhZTQ3ZTkxMTNl Mzg1NWFkNjFmMWE1YzM4ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3F0LnB5CkBAIC0yOCw2ICsyOCw3IEBACiAKICIiIlF0V2ViS2l0IGltcGxlbWVu dGF0aW9uIG9mIHRoZSBQb3J0IGludGVyZmFjZS4iIiIKIAoraW1wb3J0IGdsb2IKIGltcG9ydCBs b2dnaW5nCiBpbXBvcnQgcmUKIGltcG9ydCBzeXMKQEAgLTkzLDYgKzk0LDE1IEBAIGNsYXNzIFF0 UG9ydChXZWJLaXRQb3J0KToKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHJldHVybiBzZWxm Ll9idWlsZF9wYXRoKCdsaWIvbGliUXRXZWJLaXQuc28nKQogCisgICAgZGVmIF9tb2R1bGVzX3Rv X3NlYXJjaF9mb3Jfc3ltYm9scyhzZWxmKToKKyAgICAgICAgIyBXZSBzZWFyY2ggaW4gZXZlcnkg bGlicmFyeSB0byBiZSByZWxpYWJsZSBpbiB0aGUgY2FzZSBvZiBidWlsZGluZyB3aXRoIENPTkZJ Rys9Zm9yY2Vfc3RhdGljX2xpYnNfYXNfc2hhcmVkLgorICAgICAgICBpZiBzZWxmLm9wZXJhdGlu Z19zeXN0ZW0oKSA9PSAnbWFjJzoKKyAgICAgICAgICAgIGZyYW1ld29ya3MgPSBnbG9iLmdsb2Io b3MucGF0aC5qb2luKHNlbGYuX2J1aWxkX3BhdGgoJ2xpYicpLCAnKi5mcmFtZXdvcmsnKSkKKyAg ICAgICAgICAgIHJldHVybiBbb3MucGF0aC5qb2luKGZyYW1ld29yaywgb3MucGF0aC5zcGxpdGV4 dChvcy5wYXRoLmJhc2VuYW1lKGZyYW1ld29yaykpWzBdKSBmb3IgZnJhbWV3b3JrIGluIGZyYW1l d29ya3NdCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzdWZmaXggPSAnZGxsJyBpZiBzZWxm Lm9wZXJhdGluZ19zeXN0ZW0oKSA9PSAnd2luJyBlbHNlICdzbycKKyAgICAgICAgICAgIHJldHVy biBnbG9iLmdsb2Iob3MucGF0aC5qb2luKHNlbGYuX2J1aWxkX3BhdGgoJ2xpYicpLCAnbGliKi4n ICsgc3VmZml4KSkKKwogICAgIEBtZW1vaXplZAogICAgIGRlZiBxdF92ZXJzaW9uKHNlbGYpOgog ICAgICAgICB2ZXJzaW9uID0gJycK