120298 2013-08-26 04:01:00 -0700 [GTK] Allow to run tests without Xvfb in run-gtk-tests 2013-08-26 06:09:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned pnormand oldest_to_newest 920955 0 cgarcia 2013-08-26 04:01:00 -0700 Add --no-xvfb command line option to run tests in the current display. This is useful to test the cases where tests fail under Xvfb. 920956 1 209635 cgarcia 2013-08-26 04:04:10 -0700 Created attachment 209635 Patch 920985 2 cgarcia 2013-08-26 06:09:03 -0700 Committed r154600: <http://trac.webkit.org/changeset/154600> 209635 2013-08-26 04:04:10 -0700 2013-08-26 06:03:45 -0700 Patch run-gtk-tests-no-xvfb.diff text/plain 4092 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjNDdh OGIxLi5iMWIwODg3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTMtMDgtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFsbG93IHRvIHJ1biB0ZXN0 cyB3aXRob3V0IFh2ZmIgaW4gcnVuLWd0ay10ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwMjk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC0tbm8teHZmYiBjb21tYW5kIGxpbmUgb3B0aW9u IHRvIHJ1biB0ZXN0cyBpbiB0aGUgY3VycmVudAorICAgICAgICBkaXNwbGF5LgorCisgICAgICAg ICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAgICAgICAoVGVzdFJ1bm5lci5fcnVuX3h2ZmIp OiBSZXR1cm4gZWFybHkgaWYgb3B0aW9uIC0tbm8teHZmYiBoYXMgYmVlbgorICAgICAgICBwYXNz ZWQuCisgICAgICAgIChUZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmlyb25tZW50KTogVXNl IGhlbHBlciBmdW5jdGlvbgorICAgICAgICBfcnVuX3h2ZmIgdG8gc3RhcnQgWHZmYiBpZiBuZWVk ZWQuCisgICAgICAgIChUZXN0UnVubmVyLl90ZWFyX2Rvd25fdGVzdGluZ19lbnZpcm9ubWVudCk6 IENoZWNrIFh2ZmIgaXMKKyAgICAgICAgYWN0dWFsbHkgcnVubmluZyBiZWZvcmUgdHJ5aW5nIHRv IHRlcm1pbmF0ZSBpdC4KKworMjAxMy0wOC0yNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gQWRkIHN1cHBvcnQgZm9yIHBhc3Npbmcg dGVzdCBkaXJlY3RvcmllcyB0byBydW4tZ3RrLXRlc3RzCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjAyOTYKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCmluZGV4IDE4 YjUyNGYuLmUzZTBlMDggMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwor KysgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKQEAgLTE2NiwxNCArMTY2LDEyIEBAIGNs YXNzIFRlc3RSdW5uZXI6CiAKICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgIGRlZiBfc2V0dXBf dGVzdGluZ19lbnZpcm9ubWVudChzZWxmKToKLSAgICAgICAgc2VsZi5fdGVzdF9lbnYgPSBvcy5l bnZpcm9uCisgICAgZGVmIF9ydW5feHZmYihzZWxmKToKKyAgICAgICAgc2VsZi5feHZmYiA9IE5v bmUKKyAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMudXNlX3h2ZmI6CisgICAgICAgICAgICBy ZXR1cm4gVHJ1ZQorCiAgICAgICAgIHNlbGYuX3Rlc3RfZW52WyJESVNQTEFZIl0gPSBzZWxmLl9v cHRpb25zLmRpc3BsYXkKLSAgICAgICAgc2VsZi5fdGVzdF9lbnZbIldFQktJVF9JTlNQRUNUT1Jf UEFUSCJdID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihzZWxmLl9wcm9ncmFtc19wYXRo LCAncmVzb3VyY2VzJywgJ2luc3BlY3RvcicpKQotICAgICAgICBzZWxmLl90ZXN0X2VudlsnR1NF VFRJTkdTX0JBQ0tFTkQnXSA9ICdtZW1vcnknCi0gICAgICAgIHNlbGYuX3Rlc3RfZW52WyJURVNU X1dFQktJVF9BUElfV0VCS0lUMl9SRVNPVVJDRVNfUEFUSCJdID0gY29tbW9uLnRvcF9sZXZlbF9w YXRoKCJUb29scyIsICJUZXN0V2ViS2l0QVBJIiwgIlRlc3RzIiwgIldlYktpdDIiKQotICAgICAg ICBzZWxmLl90ZXN0X2VudlsiVEVTVF9XRUJLSVRfQVBJX1dFQktJVDJfSU5KRUNURURfQlVORExF X1BBVEgiXSA9IGNvbW1vbi5idWlsZF9wYXRoX2Zvcl9idWlsZF90eXBlcygoc2VsZi5fYnVpbGRf dHlwZSwpLCAiTGlicmFyaWVzIikKLSAgICAgICAgc2VsZi5fdGVzdF9lbnZbIldFQktJVF9FWEVD X1BBVEgiXSA9IHNlbGYuX3Byb2dyYW1zX3BhdGgKIAogICAgICAgICB0cnk6CiAgICAgICAgICAg ICBzZWxmLl94dmZiID0gc3VicHJvY2Vzcy5Qb3BlbihbIlh2ZmIiLCBzZWxmLl9vcHRpb25zLmRp c3BsYXksICItc2NyZWVuIiwgIjAiLCAiODAweDYwMHgyNCIsICItbm9saXN0ZW4iLCAidGNwIl0s CkBAIC0xODMsNiArMTgxLDE5IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAgICBzeXMu c3RkZXJyLmZsdXNoKCkKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCisgICAgICAgIHJldHVy biBUcnVlCisKKyAgICBkZWYgX3NldHVwX3Rlc3RpbmdfZW52aXJvbm1lbnQoc2VsZik6CisgICAg ICAgIHNlbGYuX3Rlc3RfZW52ID0gb3MuZW52aXJvbgorICAgICAgICBzZWxmLl90ZXN0X2Vudlsi V0VCS0lUX0lOU1BFQ1RPUl9QQVRIIl0gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKHNl bGYuX3Byb2dyYW1zX3BhdGgsICdyZXNvdXJjZXMnLCAnaW5zcGVjdG9yJykpCisgICAgICAgIHNl bGYuX3Rlc3RfZW52WydHU0VUVElOR1NfQkFDS0VORCddID0gJ21lbW9yeScKKyAgICAgICAgc2Vs Zi5fdGVzdF9lbnZbIlRFU1RfV0VCS0lUX0FQSV9XRUJLSVQyX1JFU09VUkNFU19QQVRIIl0gPSBj b21tb24udG9wX2xldmVsX3BhdGgoIlRvb2xzIiwgIlRlc3RXZWJLaXRBUEkiLCAiVGVzdHMiLCAi V2ViS2l0MiIpCisgICAgICAgIHNlbGYuX3Rlc3RfZW52WyJURVNUX1dFQktJVF9BUElfV0VCS0lU Ml9JTkpFQ1RFRF9CVU5ETEVfUEFUSCJdID0gY29tbW9uLmJ1aWxkX3BhdGhfZm9yX2J1aWxkX3R5 cGVzKChzZWxmLl9idWlsZF90eXBlLCksICJMaWJyYXJpZXMiKQorICAgICAgICBzZWxmLl90ZXN0 X2VudlsiV0VCS0lUX0VYRUNfUEFUSCJdID0gc2VsZi5fcHJvZ3JhbXNfcGF0aAorCisgICAgICAg IGlmIG5vdCBzZWxmLl9ydW5feHZmYigpOgorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKICAg ICAgICAgIyBJZiB3ZSBjYW5ub3Qgc3RhcnQgdGhlIGFjY2Vzc2liaWxpdHkgZGFlbW9ucywgd2Ug Y2FuIGp1c3Qgc2tpcCB0aGUgYWNjZXNzaWJpbGl0eSB0ZXN0cy4KICAgICAgICAgaWYgbm90IHNl bGYuX3N0YXJ0X2FjY2Vzc2liaWxpdHlfZGFlbW9ucygpOgogICAgICAgICAgICAgcHJpbnQgIkNv dWxkIG5vdCBzdGFydCBhY2Nlc3NpYmlsaXR5IGJ1cywgc28gc2tpcHBpbmcgVGVzdFdlYktpdEFj Y2Vzc2liaWxpdHkiCkBAIC0xOTQsNyArMjA1LDggQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAg ICAgICAgIHNlbGYuX3NwaV9yZWdpc3RyeWQudGVybWluYXRlKCkKICAgICAgICAgaWYgc2VsZi5f c3BpX2J1c19sYXVuY2hlcjoKICAgICAgICAgICAgIHNlbGYuX3NwaV9idXNfbGF1bmNoZXIudGVy bWluYXRlKCkKLSAgICAgICAgc2VsZi5feHZmYi50ZXJtaW5hdGUoKQorICAgICAgICBpZiBzZWxm Ll94dmZiOgorICAgICAgICAgICAgc2VsZi5feHZmYi50ZXJtaW5hdGUoKQogCiAgICAgZGVmIF90 ZXN0X2Nhc2VzX3RvX3NraXAoc2VsZiwgdGVzdF9wcm9ncmFtKToKICAgICAgICAgaWYgc2VsZi5f b3B0aW9ucy5za2lwcGVkX2FjdGlvbiAhPSAnc2tpcCc6CkBAIC0zOTIsNiArNDA0LDggQEAgaWYg X19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICBvcHRpb25fcGFyc2VyLmFkZF9vcHRpb24oJy10 JywgJy0tdGltZW91dCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0nc3Rv cmUnLCB0eXBlPSdpbnQnLCBkZXN0PSd0aW1lb3V0JywgZGVmYXVsdD0xMCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaGVscD0nVGltZSBpbiBzZWNvbmRzIHVudGlsIGEgdGVzdCB0aW1l cyBvdXQnKQorICAgIG9wdGlvbl9wYXJzZXIuYWRkX29wdGlvbignLS1uby14dmZiJywgYWN0aW9u PSdzdG9yZV9mYWxzZScsIGRlc3Q9J3VzZV94dmZiJywgZGVmYXVsdD1UcnVlLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBoZWxwPSdEbyBub3QgcnVuIHRlc3RzIHVuZGVyIFh2ZmInKQog ICAgIG9wdGlvbnMsIGFyZ3MgPSBvcHRpb25fcGFyc2VyLnBhcnNlX2FyZ3MoKQogCiAgICAgc3lz LmV4aXQoVGVzdFJ1bm5lcihvcHRpb25zLCBhcmdzKS5ydW5fdGVzdHMoKSkK