36440 2010-03-22 04:50:17 -0700 Make build_webkit_command() pass MAKEFLAGS environment variable to make 2010-03-22 18:13:35 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ossy webkit-unassigned abarth commit-queue oldest_to_newest 202442 0 ossy 2010-03-22 04:50:17 -0700 Now build_webkit_command() doesn't pass MAKEFLAGS environtment variable to make. I propose this kind of modification: - command.append('--makeargs="-j%s"' % Executive.cpu_count()) + command.append(WebKitPort.makeArgs()) It is a useful feature if you would like to use more jobs than number of CPU cores. (for distcc jobs) I tested this patch, and works correctly on our Qt-EWS. 202443 1 51275 ossy 2010-03-22 04:51:41 -0700 Created attachment 51275 proposed patch 202592 2 51275 abarth 2010-03-22 10:41:10 -0700 Comment on attachment 51275 proposed patch Ideally we would test that the environment var was respected, but this looks good. 202861 3 51275 commit-queue 2010-03-22 18:13:30 -0700 Comment on attachment 51275 proposed patch Clearing flags on attachment: 51275 Committed r56372: <http://trac.webkit.org/changeset/56372> 202862 4 commit-queue 2010-03-22 18:13:35 -0700 All reviewed patches have been landed. Closing bug. 51275 2010-03-22 04:51:41 -0700 2010-03-22 18:13:30 -0700 proposed patch makeargs.patch text/plain 4168 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzMzI5NTBmLi5iODc4Y2Q1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMt MjIgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIGJ1aWxkX3dlYmtpdF9jb21t YW5kKCkgcGFzcyBNQUtFRkxBR1MgZW52aXJvbm1lbnQgdmFyaWFibGUgdG8gbWFrZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDQwCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3dlYmtpdHBvcnQucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS93ZWJraXRwb3J0X3VuaXR0ZXN0LnB5OgorCiAyMDEwLTAzLTIwICBNYXJ0aW4gUm9i aW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4g TG9wZXouCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmtpdHBv cnQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmtpdHBvcnQucHkKaW5kZXgg Y2Q2MGE1NC4uNTk0NjgzOSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS93ZWJraXRwb3J0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2Via2l0 cG9ydC5weQpAQCAtNTIsNiArNTIsMTMgQEAgY2xhc3MgV2ViS2l0UG9ydChvYmplY3QpOgogICAg ICAgICAjIEZJWE1FOiBXZSBzaG91bGQgZGVmYXVsdCB0byBXaW5Qb3J0IG9uIFdpbmRvd3MuCiAg ICAgICAgIHJldHVybiBwb3J0cy5nZXQocG9ydF9uYW1lLCBNYWNQb3J0KQogCisgICAgQHN0YXRp Y21ldGhvZAorICAgIGRlZiBtYWtlQXJncygpOgorICAgICAgICBhcmdzID0gJy0tbWFrZWFyZ3M9 Ii1qJXMiJyAlIEV4ZWN1dGl2ZS5jcHVfY291bnQoKQorICAgICAgICBpZiBvcy5lbnZpcm9uLmhh c19rZXkoJ01BS0VGTEFHUycpOgorICAgICAgICAgICAgYXJncyA9ICctLW1ha2VhcmdzPSIlcyIn ICUgb3MuZW52aXJvblsnTUFLRUZMQUdTJ10KKyAgICAgICAgcmV0dXJuIGFyZ3MKKwogICAgIEBj bGFzc21ldGhvZAogICAgIGRlZiBuYW1lKGNscyk6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVu dGVkRXJyb3IoInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiKQpAQCAtMTE1LDcgKzEyMiw3IEBA IGNsYXNzIEd0a1BvcnQoV2ViS2l0UG9ydCk6CiAgICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21tYW5k KGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6CiAgICAgICAgIGNvbW1hbmQgPSBXZWJLaXRQb3J0LmJ1 aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxkX3N0eWxlKQogICAgICAgICBjb21t YW5kLmFwcGVuZCgiLS1ndGsiKQotICAgICAgICBjb21tYW5kLmFwcGVuZCgnLS1tYWtlYXJncz0i LWolcyInICUgRXhlY3V0aXZlLmNwdV9jb3VudCgpKQorICAgICAgICBjb21tYW5kLmFwcGVuZChX ZWJLaXRQb3J0Lm1ha2VBcmdzKCkpCiAgICAgICAgIHJldHVybiBjb21tYW5kCiAKICAgICBAY2xh c3NtZXRob2QKQEAgLTEzOSw3ICsxNDYsNyBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAg ICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21tYW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6CiAgICAg ICAgIGNvbW1hbmQgPSBXZWJLaXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxl PWJ1aWxkX3N0eWxlKQogICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1xdCIpCi0gICAgICAgIGNv bW1hbmQuYXBwZW5kKCctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2NvdW50KCkp CisgICAgICAgIGNvbW1hbmQuYXBwZW5kKFdlYktpdFBvcnQubWFrZUFyZ3MoKSkKICAgICAgICAg cmV0dXJuIGNvbW1hbmQKIAogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3dlYmtpdHBvcnRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3dlYmtpdHBvcnRfdW5pdHRlc3QucHkKaW5kZXggMjAyMjM0Zi4uOTFiMzc3ZSAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS93ZWJraXRwb3J0X3VuaXR0ZXN0LnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2Via2l0cG9ydF91bml0dGVzdC5weQpA QCAtNDYsMTUgKzQ2LDE1IEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5uYW1lKCksICJHdGsiKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhHdGtQb3J0LmZsYWcoKSwgIi0tcG9ydD1ndGsiKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhHdGtQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgp LCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpLCAiLS1ndGsiXSkK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgp LCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWd0ayIsICctLW1h a2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2NvdW50KCldKQotICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhHdGtQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1 ZyIpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRlYnVnIiwg Ii0tZ3RrIiwgJy0tbWFrZWFyZ3M9Ii1qJXMiJyAlIEV4ZWN1dGl2ZS5jcHVfY291bnQoKV0pCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoKSwg W1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1ndGsiLCBXZWJLaXRQ b3J0Lm1ha2VBcmdzKCldKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhHdGtQb3J0LmJ1aWxk X3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBbV2ViS2l0UG9ydC5zY3JpcHRf cGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRlYnVnIiwgIi0tZ3RrIiwgV2ViS2l0UG9ydC5tYWtl QXJncygpXSkKIAogICAgIGRlZiB0ZXN0X3F0X3BvcnQoc2VsZik6CiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKFF0UG9ydC5uYW1lKCksICJRdCIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KFF0UG9ydC5mbGFnKCksICItLXBvcnQ9cXQiKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhR dFBvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRo KCJydW4td2Via2l0LXRlc3RzIildKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQu YnVpbGRfd2Via2l0X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdl YmtpdCIpLCAiLS1xdCIsICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2NvdW50 KCldKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQuYnVpbGRfd2Via2l0X2NvbW1h bmQoYnVpbGRfc3R5bGU9ImRlYnVnIiksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13 ZWJraXQiKSwgIi0tZGVidWciLCAiLS1xdCIsICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRp dmUuY3B1X2NvdW50KCldKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQuYnVpbGRf d2Via2l0X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIp LCAiLS1xdCIsIFdlYktpdFBvcnQubWFrZUFyZ3MoKV0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKFF0UG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgW1dl YktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1kZWJ1ZyIsICItLXF0Iiwg V2ViS2l0UG9ydC5tYWtlQXJncygpXSkKIAogICAgIGRlZiB0ZXN0X2Nocm9taXVtX3BvcnQoc2Vs Zik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydC5uYW1lKCksICJDaHJv bWl1bSIpCg==