61951 2011-06-02 12:08:46 -0700 [GTK] autogen.sh is run twice for each buld on the bots 2011-06-02 16:32:02 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson mrobinson gustavo pnormand xan.lopez oldest_to_newest 414328 0 mrobinson 2011-06-02 12:08:46 -0700 When build-jsc and build-webkit are run sequentially, code in webkitdirs.pm detects the arguments to autogen.sh changing. This is a false positive though, since the autogen.sh arguments for build-jsc and build-webkit are always different. For JavaScriptCore using build-webkit, the arguments should never change, so we can avoid looking at the previous arguments altogether. 414339 1 95785 mrobinson 2011-06-02 12:23:33 -0700 Created attachment 95785 Patch 414389 2 95785 gustavo 2011-06-02 13:28:15 -0700 Comment on attachment 95785 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95785&action=review This change seems OK to me, except for the fact that in the edge case of no GNUmakefile and a file with old arguments being still around it will run autogen twice. I'll say r=me since it seems reasonably easy to fix it with the suggestion I made. > Tools/Scripts/webkitdirs.pm:1526 > + # If GNUmakefile exists, don't run autogen.sh unless its arguments > + # have changed. The makefile should be smart enough to track autotools > + # dependencies and re-run autogen.sh when build files change. > + if (!(-e "GNUmakefile")) { > + runAutogenForAutotoolsProject($dir, $prefix, $sourceDir, @buildArgs); > + } > > + my $autogenArgumentsFile = "previous-autogen-arguments-for-$project.txt"; > + if ($project eq "WebKit" and autogenArgumentsHaveChanged($autogenArgumentsFile, @buildArgs)) { Hmm. Won't this cause autogen to be run twice if there is no GNUmakefile and a file with arguments that are different from the current ones? Why not add the !(-e "GNUmakefile") check to the same if that checks for project and arguments having changed with an or? 414471 3 mrobinson 2011-06-02 14:50:40 -0700 Committed r87957: <http://trac.webkit.org/changeset/87957> 95785 2011-06-02 12:23:33 -0700 2011-06-02 16:32:02 -0700 Patch bug-61951-20110602122326.patch text/plain 3921 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODc4MTkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhZWM4MDZmZWFjMmM3ZmJlYzIwNTZmYTkzNjlkZGZhOWQw OTYwMTEzLi5jN2Y2YWVjNjRlN2ExNjM1NDI0N2M2YmE1YTQ2MTNjMjliMGFhNmEyIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDYtMDIgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIGF1 dG9nZW4uc2ggaXMgcnVuIHR3aWNlIGZvciBlYWNoIGJ1bGQgb24gdGhlIGJvdHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxOTUxCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06IE9ubHkgY2hlY2sgdGhlIHByZXZpb3VzIGF1dG90b29s cyBhcmd1bWVudHMKKyAgICAgICAgZm9yIHRoZSBXZWJLaXQgcHJvamVjdC4gVGhpcyBwcmV2ZW50 cyBidWlsZC1qc2MgcnVucyBmcm9tIGZvcmNpbmcgc3Vic2VxdWVudAorICAgICAgICBidWlsZC13 ZWJraXQgcnVucyB0byByZS1yZXJ1biBhdXRvZ2VuLnNoLgorCiAyMDExLTA2LTAxICBNYXJ0aW4g Um9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBY YW4gTG9wZXouCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZGI1YWJiZjU3YjczZDlkN2VjMDdlNWIzNTY4 NjAyOGU2MmFlYjMyMC4uODMwYTdmZGFmNjY0NjhiNTFiNzgwZThjOGMyZjY3NDM5NjdkYjZkMCAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQpAQCAtMTQyMSw2ICsxNDIxLDIxIEBAIHN1YiBhdXRvdG9vbHNGbGFn KCQkKQogICAgIHJldHVybiAkcHJlZml4IC4gJy0nIC4gJGZlYXR1cmU7CiB9CiAKK3N1YiBydW5B dXRvZ2VuRm9yQXV0b3Rvb2xzUHJvamVjdCgkQCkKK3sKKyAgICBteSAoJGRpciwgJHByZWZpeCwg JHNvdXJjZURpciwgQGJ1aWxkQXJncykgPSBAXzsKKworICAgIHByaW50ICJDYWxsaW5nIGF1dG9n ZW4uc2ggaW4gIiAuICRkaXIgLiAiXG5cbiI7CisgICAgcHJpbnQgIkluc3RhbGxhdGlvbiBwcmVm aXggZGlyZWN0b3J5OiAkcHJlZml4XG4iIGlmKGRlZmluZWQoJHByZWZpeCkpOworCisgICAgIyBN YWtlIHRoZSBwYXRoIHJlbGF0aXZlIHNpbmNlIGl0IHdpbGwgYXBwZWFyIGluIGFsbCAtSSBjb21w aWxlciBmbGFncy4KKyAgICAjIExvbmcgYXJndW1lbnQgbGlzdHMgY2F1c2UgYml6YXJyZSBzbG93 ZG93bnMgaW4gbGlidG9vbC4KKyAgICBteSAkcmVsU291cmNlRGlyID0gRmlsZTo6U3BlYy0+YWJz MnJlbCgkc291cmNlRGlyKSB8fCAiLiI7CisgICAgaWYgKHN5c3RlbSgiJHJlbFNvdXJjZURpci9h dXRvZ2VuLnNoIiwgQGJ1aWxkQXJncykgbmUgMCkgeworICAgICAgICBkaWUgIkNhbGxpbmcgYXV0 b2dlbi5zaCBmYWlsZWQhXG4iOworICAgIH0KK30KKwogc3ViIGF1dG9nZW5Bcmd1bWVudHNIYXZl Q2hhbmdlZCgkQCkKIHsKICAgICBteSAoJGZpbGVuYW1lLCBAY3VycmVudEFyZ3VtZW50cykgPSBA XzsKQEAgLTE1MDAsMzggKzE1MTUsMjkgQEAgc3ViIGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCgkQCkK ICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCi0gICAgIyBJZiBHTlVtYWtlZmlsZSBleGlzdHMs IGRvbid0IHJ1biBhdXRvZ2VuLnNoLiBUaGUgbWFrZWZpbGUgc2hvdWxkIGJlCi0gICAgIyBzbWFy dCBlbm91Z2ggdG8gdHJhY2sgYXV0b3Rvb2xzIGRlcGVuZGVuY2llcyBhbmQgcmUtcnVuIGF1dG9n ZW4uc2gKLSAgICAjIHdoZW4gYnVpbGQgZmlsZXMgY2hhbmdlLgotICAgIG15ICRhdXRvZ2VuQXJn dW1lbnRzRmlsZSA9ICJwcmV2aW91cy1hdXRvZ2VuLWFyZ3VtZW50cy50eHQiOwotICAgIG15ICRy ZXN1bHQ7Ci0gICAgaWYgKCEoLWUgIkdOVW1ha2VmaWxlIikgb3IgYXV0b2dlbkFyZ3VtZW50c0hh dmVDaGFuZ2VkKCRhdXRvZ2VuQXJndW1lbnRzRmlsZSwgQGJ1aWxkQXJncykpIHsKKyAgICAjIElm IEdOVW1ha2VmaWxlIGV4aXN0cywgZG9uJ3QgcnVuIGF1dG9nZW4uc2ggdW5sZXNzIGl0cyBhcmd1 bWVudHMKKyAgICAjIGhhdmUgY2hhbmdlZC4gVGhlIG1ha2VmaWxlIHNob3VsZCBiZSBzbWFydCBl bm91Z2ggdG8gdHJhY2sgYXV0b3Rvb2xzCisgICAgIyBkZXBlbmRlbmNpZXMgYW5kIHJlLXJ1biBh dXRvZ2VuLnNoIHdoZW4gYnVpbGQgZmlsZXMgY2hhbmdlLgorICAgIGlmICghKC1lICJHTlVtYWtl ZmlsZSIpKSB7CisgICAgICAgIHJ1bkF1dG9nZW5Gb3JBdXRvdG9vbHNQcm9qZWN0KCRkaXIsICRw cmVmaXgsICRzb3VyY2VEaXIsIEBidWlsZEFyZ3MpOworICAgIH0KIAorICAgIG15ICRhdXRvZ2Vu QXJndW1lbnRzRmlsZSA9ICJwcmV2aW91cy1hdXRvZ2VuLWFyZ3VtZW50cy1mb3ItJHByb2plY3Qu dHh0IjsKKyAgICBpZiAoJHByb2plY3QgZXEgIldlYktpdCIgYW5kIGF1dG9nZW5Bcmd1bWVudHNI YXZlQ2hhbmdlZCgkYXV0b2dlbkFyZ3VtZW50c0ZpbGUsIEBidWlsZEFyZ3MpKSB7CiAgICAgICAg ICMgV3JpdGUgYXV0b2dlbi5zaCBhcmd1bWVudHMgdG8gYSBmaWxlIHNvIHRoYXQgd2UgY2FuIGRl dGVjdAogICAgICAgICAjIHdoZW4gdGhleSBjaGFuZ2UgYW5kIGF1dG9tYXRpY2FsbHkgcmUtcnVu IGl0LgogICAgICAgICBvcGVuKEFVVE9UT09MU19BUkdVTUVOVFMsICI+JGF1dG9nZW5Bcmd1bWVu dHNGaWxlIik7Ci0gICAgICAgIHByaW50IEFVVE9UT09MU19BUkdVTUVOVFMgIGpvaW4oIiAiLCBA YnVpbGRBcmdzKTsKKyAgICAgICAgcHJpbnQgQVVUT1RPT0xTX0FSR1VNRU5UUyBqb2luKCIgIiwg QGJ1aWxkQXJncyk7CiAgICAgICAgIGNsb3NlKEFVVE9UT09MU19BUkdVTUVOVFMpOwotCi0gICAg ICAgIHByaW50ICJDYWxsaW5nIGNvbmZpZ3VyZSBpbiAiIC4gJGRpciAuICJcblxuIjsKLSAgICAg ICAgcHJpbnQgIkluc3RhbGxhdGlvbiBwcmVmaXggZGlyZWN0b3J5OiAkcHJlZml4XG4iIGlmKGRl ZmluZWQoJHByZWZpeCkpOwotCi0gICAgICAgICMgTWFrZSB0aGUgcGF0aCByZWxhdGl2ZSBzaW5j ZSBpdCB3aWxsIGFwcGVhciBpbiBhbGwgLUkgY29tcGlsZXIgZmxhZ3MuCi0gICAgICAgICMgTG9u ZyBhcmd1bWVudCBsaXN0cyBjYXVzZSBiaXphcnJlIHNsb3dkb3ducyBpbiBsaWJ0b29sLgotICAg ICAgICBteSAkcmVsU291cmNlRGlyID0gRmlsZTo6U3BlYy0+YWJzMnJlbCgkc291cmNlRGlyKSB8 fCAiLiI7Ci0gICAgICAgICRyZXN1bHQgPSBzeXN0ZW0gIiRyZWxTb3VyY2VEaXIvYXV0b2dlbi5z aCIsIEBidWlsZEFyZ3M7Ci0gICAgICAgIGlmICgkcmVzdWx0IG5lIDApIHsKLSAgICAgICAgICAg IGRpZSAiRmFpbGVkIHRvIHNldHVwIGJ1aWxkIGVudmlyb25tZW50IHVzaW5nICdhdXRvdG9vbHMn IVxuIjsKLSAgICAgICAgfQorICAgICAgICBydW5BdXRvZ2VuRm9yQXV0b3Rvb2xzUHJvamVjdCgk ZGlyLCAkcHJlZml4LCAkc291cmNlRGlyLCBAYnVpbGRBcmdzKTsKICAgICB9CiAKLSAgICAkcmVz dWx0ID0gc3lzdGVtICIkbWFrZSAkbWFrZUFyZ3MiOwotICAgIGlmICgkcmVzdWx0IG5lIDApIHsK KyAgICBpZiAoc3lzdGVtKCIkbWFrZSAkbWFrZUFyZ3MiKSBuZSAwKSB7CiAgICAgICAgIGRpZSAi XG5GYWlsZWQgdG8gYnVpbGQgV2ViS2l0IHVzaW5nICckbWFrZSchXG4iOwogICAgIH0KIAogICAg IGNoZGlyICIuLiIgb3IgZGllOwotICAgIHJldHVybiAkcmVzdWx0OworICAgIHJldHVybiAwOwog fQogCiBzdWIgZ2VuZXJhdGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QK