84276 2012-04-18 14:02:46 -0700 [GTK] NRWT bails out if more than one X server runs on the machine 2012-04-18 16:30:02 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand pnormand abarth dpranke ojan webkit.review.bot oldest_to_newest 605070 0 pnormand 2012-04-18 14:02:46 -0700 in GtkDriver we should determine the display id to use for Xvfb based on the current last display id + 1. 605208 1 137799 pnormand 2012-04-18 16:20:36 -0700 Created attachment 137799 Patch 605213 2 pnormand 2012-04-18 16:30:02 -0700 Committed r114579: <http://trac.webkit.org/changeset/114579> 137799 2012-04-18 16:20:36 -0700 2012-04-18 16:26:16 -0700 Patch bug-84276-20120418162035.patch text/plain 2410 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NTcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjZjMDM1MzY4NjRiYTNjNDE1NmE4YmVjMzViOWI5N2Fl NzA4Yzg4YS4uODI0MGE0NzBmMzdkYzJlM2Q0NDUzNGFiODY0YmU2ZmQ0ZmEwNWM1MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTA0LTE4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXSBOUldUIGJhaWxzIG91dCBpZiBtb3JlIHRoYW4gb25lIFggc2VydmVy IHJ1bnMgb24gdGhlIG1hY2hpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg0Mjc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU2V0IHVwIEdUSyBkcml2ZXIncyBYdmZiIGRpc3BsYXkgbnVtYmVyIGJhc2Vk IG9uIFhvcmcgc2VydmVycworICAgICAgICBjdXJyZW50bHkgcnVubmluZy4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5OgorICAgICAgICAoR3Rr RHJpdmVyLl9zdGFydCk6CisgICAgICAgIChHdGtEcml2ZXIuX3N0YXJ0LnhfZmlsdGVyKToKKwog MjAxMi0wNC0xOCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBucnd0OiBzdXBwb3J0IGFkZGl0aW9uYWwgdGVzdCBleHBlY3RhdGlvbnMgZmlsZXMKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKaW5kZXggNzFl NWEzYjc5MjA3MWM2Yzk1MzUzM2NjODgwODQzYTA2NGMyZGYzOC4uZWE4MTJiNzk5N2FiNTlkOGM5 ZGQ5NjE3YTczNzMwNDg5ZjFhZjVmOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKQEAgLTM0LDE3ICszNCwyNSBAQCBpbXBvcnQgc3VicHJv Y2VzcwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfY29uZmlndXJhdGlv biBpbXBvcnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBv cnQuc2VydmVyX3Byb2Nlc3MgaW1wb3J0IFNlcnZlclByb2Nlc3MKIGZyb20gd2Via2l0cHkubGF5 b3V0X3Rlc3RzLnBvcnQud2Via2l0IGltcG9ydCBXZWJLaXREcml2ZXIsIFdlYktpdFBvcnQKLQor ZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgRXhlY3V0aXZlCiAK IF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBjbGFzcyBHdGtEcml2ZXIo V2ViS2l0RHJpdmVyKToKICAgICBkZWYgX3N0YXJ0KHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVz dF9hcmdzKToKKworICAgICAgICAjIENvbGxlY3QgdGhlIG51bWJlciBvZiBYIHNlcnZlcnMgcnVu bmluZyBhbHJlYWR5IGFuZCBtYWtlCisgICAgICAgICMgc3VyZSBvdXIgWHZmYiBwcm9jZXNzIGRv ZXNuJ3QgY2xhc2ggd2l0aCBhbnkgb2YgdGhlbS4KKyAgICAgICAgZGVmIHhfZmlsdGVyKHByb2Nl c3NfbmFtZSk6CisgICAgICAgICAgICByZXR1cm4gcHJvY2Vzc19uYW1lLmZpbmQoIlhvcmciKSA+ IC0xCisKKyAgICAgICAgcnVubmluZ19kaXNwbGF5cyA9IGxlbihFeGVjdXRpdmUoKS5ydW5uaW5n X3BpZHMoeF9maWx0ZXIpKQorCiAgICAgICAgICMgVXNlIGV2ZW4gZGlzcGxheXMgZm9yIHBpeGVs IHRlc3RzIGFuZCBvZGQgb25lcyBvdGhlcndpc2UuIFdoZW4gcGl4ZWwgdGVzdHMgYXJlIGRpc2Fi bGVkLAogICAgICAgICAjIERyaXZlclByb3h5IGNyZWF0ZXMgdHdvIGRyaXZlcnMsIG9uZSBmb3Ig bm9ybWFsIGFuZCB0aGUgb3RoZXIgZm9yIHJlZiB0ZXN0cy4gQm90aCBoYXZlCiAgICAgICAgICMg dGhlIHNhbWUgd29ya2VyIG51bWJlciwgc28gdGhpcyBwcmV2ZW50cyB0aGVtIGZyb20gdXNpbmcg dGhlIHNhbWUgWHZmYiBpbnN0YW5jZS4KLSAgICAgICAgZGlzcGxheV9pZCA9IHNlbGYuX3dvcmtl cl9udW1iZXIgKiAyICsgMQorICAgICAgICBkaXNwbGF5X2lkID0gc2VsZi5fd29ya2VyX251bWJl ciAqIDIgKyBydW5uaW5nX2Rpc3BsYXlzCiAgICAgICAgIGlmIHNlbGYuX3BpeGVsX3Rlc3RzOgog ICAgICAgICAgICAgZGlzcGxheV9pZCArPSAxCiAgICAgICAgIHJ1bl94dmZiID0gWyJYdmZiIiwg IjolZCIgJSAoZGlzcGxheV9pZCksICItc2NyZWVuIiwgICIwIiwgIjgwMHg2MDB4MjQiLCAiLW5v bGlzdGVuIiwgInRjcCJdCg==