126503 2014-01-05 14:02:40 -0800 [GTK] [CMake] run-webkit-tests should support the CMake build 2014-01-22 19:45:47 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 126212 115966 1 mrobinson mrobinson commit-queue dbates glenn gustavo oldest_to_newest 964515 0 mrobinson 2014-01-05 14:02:40 -0800 We need run-webkit-tests to be smart enough to detect a CMake build and find the harnesses and libraries. 964526 1 220406 mrobinson 2014-01-05 15:17:06 -0800 Created attachment 220406 Patch 970847 2 220406 dbates 2014-01-22 13:19:52 -0800 Comment on attachment 220406 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220406&action=review > Tools/ChangeLog:20 > + (GtkPort._path_to_image_diff): Use the new Helper. Nit: Helper => helper 970994 3 mrobinson 2014-01-22 19:45:47 -0800 Committed r162585: <http://trac.webkit.org/changeset/162585> 220406 2014-01-05 15:17:06 -0800 2014-01-22 13:19:52 -0800 Patch bug-126503-20140105151706.patch text/plain 6590 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMzExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2Q2ODRkOGI0NTA2YWQzNmNmNzJjMjA0OGU4OWIxOTkx N2Y4Njg4NS4uOGY5ODY3MDA2YTk2MGIwM2VmNDA1ZmQyMjAxMjAxZTUxM2ZlMDMzMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4 IEBACiAyMDE0LTAxLTA1ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K IAorICAgICAgICBbR1RLXSBbQ01ha2VdIHJ1bi13ZWJraXQtdGVzdHMgc2hvdWxkIHN1cHBvcnQg dGhlIENNYWtlIGJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjY1MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVcGRhdGUgcnVuLWxhdW5jaGVyIGFuZCBndGsucHkgdG8gd29yayBwcm9wZXJseSB3 aGVuIGRlYWxpbmcgd2l0aCB0aGUgQ01ha2UgcG9ydC4KKyAgICAgICAgcnVuLXdlYmtpdC10ZXN0 cyBkb2VzIG5vdCBuZWVkIHRoZSAtLWd0a2NtYWtlIGZsYWcsIGJ1dCBydW4tbGF1bmNoZXIgZG9l cy4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWxhdW5jaGVyOiBXb3JrIHByb3Blcmx5IHdpdGgg dGhlIGd0a2NtYWtlIGZsYWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5w eToKKyAgICAgICAgKEd0a1BvcnQuX2lzX2NtYWtlX2J1aWxkKTogQWRkZWQgdGhpcyBoZWxwZXIg d2hpY2ggbG9va3MgZm9yIHRoZSBDTWFrZUNhY2hlCisgICAgICAgIGZpbGUgdG8gZGV0ZWN0IGEg Q01ha2UgYnVpbGQuCisgICAgICAgIChHdGtQb3J0Ll9idWlsdF9leGVjdXRhYmxlc19wYXRoKTog QWRkZWQgdGhpcyBoZWxwZXIgdG8gbG9jYXRlIHRoZSBidWlsdCBleGVjdXRhYmxlIHBhdGguCisg ICAgICAgIChHdGtQb3J0Ll9idWlsdF9saWJyYXJpZXNfcGF0aCk6IEFkZGVkIHRoaXMgaGVscGVy IHRvIGxvY2F0ZSB0aGUgYnVpbHQgbGlicmFyeSBwYXRoLgorICAgICAgICAoR3RrUG9ydC5fcG9y dF9mbGFnX2Zvcl9zY3JpcHRzKTogVXNlIC0tZ3RrY21ha2Ugd2hlbiBhcHByb3ByaWF0ZS4KKyAg ICAgICAgKEd0a1BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKTogVGhlIHdheSBDTWFrZSBi dWlsZHMgbGlicmFyaWVzIGRpZmZlcnMgZnJvbSBHVEsrLgorICAgICAgICAoR3RrUG9ydC5fcGF0 aF90b19kcml2ZXIpOiBVc2UgdGhlIG5ldyBoZWxwZXIuCisgICAgICAgIChHdGtQb3J0Ll9wYXRo X3RvX2ltYWdlX2RpZmYpOiBVc2UgdGhlIG5ldyBIZWxwZXIuCisgICAgICAgIChHdGtQb3J0Ll9w YXRoX3RvX3dlYmNvcmVfbGlicmFyeSk6IFVzZSB0aGUgbmV3IGhlbHBlci4KKyAgICAgICAgKEd0 a1BvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQpOiBVc2UgLS1ndGtjbWFrZSB3aGVuIGFwcHJvcHJp YXRlLgorCisyMDE0LTAxLTA1ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNv bT4KKwogICAgICAgICBbR1RLXVtDTWFrZV0gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHRoZSBH VEsrIHBvcnQgd2l0aCBjbWFrZSB0byBidWlsZC13ZWJraXQKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjIxMgogCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3J1bi1sYXVuY2hlciBiL1Rvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyCmluZGV4IGI4 OTYxMWZjN2MwZmZlNzc1YThjODc2OTVkNTg4ZDA2NGQ4YjUxZjIuLjk2ZWEyMTFmYjJkZTU2YTBi NmM2ZWM4ZDU2MDEwYzM1NWQwNmQ1ZDUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWxh dW5jaGVyCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyCkBAIC00NSwxMCArNDUsMTYg QEAgY2hlY2tGcmFtZXdvcmtzKCk7CiAKICMgU2V0IHBhdGhzIGFjY29yZGluZyB0byB0aGUgYnVp bGQgc3lzdGVtIHVzZWQKIGlmIChpc0d0aygpKSB7CisgICAgaWYgKGlzR3RrQXV0b3Rvb2xzKCkp IHsKKyAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiUHJvZ3Jh bXMiKTsKKyAgICB9IGVsc2UgeworICAgICAgICAkbGF1bmNoZXJQYXRoID0gY2F0ZGlyKCRsYXVu Y2hlclBhdGgsICJiaW4iKTsKKyAgICB9CisKICAgICBpZiAoaXNXSzIoKSkgewotICAgICAgICB1 bnNoaWZ0KEBBUkdWLCBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgIlByb2dyYW1zIiwgIk1pbmlCcm93 c2VyIikpOworICAgICAgICB1bnNoaWZ0KEBBUkdWLCBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgIk1p bmlCcm93c2VyIikpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRp cigkbGF1bmNoZXJQYXRoLCAiUHJvZ3JhbXMiLCAiR3RrTGF1bmNoZXIiKSk7CisgICAgICAgIHVu c2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiR3RrTGF1bmNoZXIiKSk7CiAgICAg fQogICAgICRsYXVuY2hlclBhdGggPSBjYXRkaXIoc291cmNlRGlyKCksICJUb29scyIsICJqaGJ1 aWxkIiwgImpoYnVpbGQtd3JhcHBlciIpOwogICAgIHVuc2hpZnQoQEFSR1YsICgiLS1ndGsiLCAi cnVuIikpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKaW5kZXggMmI4ZTI3ODBkZmViODIz MTc5ZDNiNmQyZGU5ZDY5MDAyOTFjNTY5Yy4uNTIxMWUyODEwM2JjYTQ4Y2Q3OTIxZGJmMTI2NWU4 NzQzYjVjZTE0ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5CkBAIC01MSwxMSArNTEs MjkgQEAgY2xhc3MgR3RrUG9ydChQb3J0KToKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLmdldF9v cHRpb24oIndyYXBwZXIiKToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCd1c2Ug LS13cmFwcGVyPVwidmFsZ3JpbmRcIiBmb3IgbWVtb3J5IGxlYWsgZGV0ZWN0aW9uIG9uIEdUSycp CiAKKyAgICBkZWYgX2lzX2NtYWtlX2J1aWxkKHNlbGYpOgorICAgICAgICByZXR1cm4gb3MucGF0 aC5leGlzdHMoc2VsZi5fYnVpbGRfcGF0aCgnQ01ha2VDYWNoZS50eHQnKSkKKworICAgIGRlZiBf YnVpbHRfZXhlY3V0YWJsZXNfcGF0aChzZWxmLCAqcGF0aCk6CisgICAgICAgIGlmIHNlbGYuX2lz X2NtYWtlX2J1aWxkKCk6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aCgqKCgn YmluJywpICsgcGF0aCkpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5f YnVpbGRfcGF0aCgqKCgnUHJvZ3JhbXMnLCkgKyBwYXRoKSkKKworICAgIGRlZiBfYnVpbHRfbGli cmFyaWVzX3BhdGgoc2VsZiwgKnBhdGgpOgorICAgICAgICBpZiBzZWxmLl9pc19jbWFrZV9idWls ZCgpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoKigoJ2xpYicsKSArIHBh dGgpKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgo KigoJy5saWJzJywpICsgcGF0aCkpCisKICAgICBkZWYgd2Fybl9pZl9idWdfbWlzc2luZ19pbl90 ZXN0X2V4cGVjdGF0aW9ucyhzZWxmKToKICAgICAgICAgcmV0dXJuIG5vdCBzZWxmLmdldF9vcHRp b24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpCiAKICAgICBkZWYgX3BvcnRfZmxhZ19mb3Jfc2NyaXB0 cyhzZWxmKToKLSAgICAgICAgcmV0dXJuICItLWd0ayIKKyAgICAgICAgaWYgc2VsZi5faXNfY21h a2VfYnVpbGQoKToKKyAgICAgICAgICAgIHJldHVybiAiLS1ndGtjbWFrZSIKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIHJldHVybiAiLS1ndGsiCiAKICAgICBAbWVtb2l6ZWQKICAgICBkZWYg X2RyaXZlcl9jbGFzcyhzZWxmKToKQEAgLTg5LDggKzEwNywxMiBAQCBjbGFzcyBHdGtQb3J0KFBv cnQpOgogICAgICAgICBlbnZpcm9ubWVudCA9IHN1cGVyKEd0a1BvcnQsIHNlbGYpLnNldHVwX2Vu dmlyb25fZm9yX3NlcnZlcihzZXJ2ZXJfbmFtZSkKICAgICAgICAgZW52aXJvbm1lbnRbJ0dTRVRU SU5HU19CQUNLRU5EJ10gPSAnbWVtb3J5JwogICAgICAgICBlbnZpcm9ubWVudFsnTElCT1ZFUkxB WV9TQ1JPTExCQVInXSA9ICcwJwotICAgICAgICBlbnZpcm9ubWVudFsnVEVTVF9SVU5ORVJfSU5K RUNURURfQlVORExFX0ZJTEVOQU1FJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdMaWJyYXJpZXMnLCAn bGliVGVzdFJ1bm5lckluamVjdGVkQnVuZGxlLmxhJykKLSAgICAgICAgZW52aXJvbm1lbnRbJ1RF U1RfUlVOTkVSX1RFU1RfUExVR0lOX1BBVEgnXSA9IHNlbGYuX2J1aWxkX3BhdGgoJ1Rlc3ROZXRz Y2FwZVBsdWdpbicsICcubGlicycpCisgICAgICAgIGlmIHNlbGYuX2lzX2NtYWtlX2J1aWxkKCk6 CisgICAgICAgICAgICBlbnZpcm9ubWVudFsnVEVTVF9SVU5ORVJfSU5KRUNURURfQlVORExFX0ZJ TEVOQU1FJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdsaWInLCAnbGliVGVzdFJ1bm5lckluamVjdGVk QnVuZGxlLnNvJykKKyAgICAgICAgICAgIGVudmlyb25tZW50WydURVNUX1JVTk5FUl9URVNUX1BM VUdJTl9QQVRIJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdsaWInKQorICAgICAgICBlbHNlOgorICAg ICAgICAgICAgZW52aXJvbm1lbnRbJ1RFU1RfUlVOTkVSX0lOSkVDVEVEX0JVTkRMRV9GSUxFTkFN RSddID0gc2VsZi5fYnVpbGRfcGF0aCgnTGlicmFyaWVzJywgJ2xpYlRlc3RSdW5uZXJJbmplY3Rl ZEJ1bmRsZS5sYScpCisgICAgICAgICAgICBlbnZpcm9ubWVudFsnVEVTVF9SVU5ORVJfVEVTVF9Q TFVHSU5fUEFUSCddID0gc2VsZi5fYnVpbGRfcGF0aCgnVGVzdE5ldHNjYXBlUGx1Z2luJywgJy5s aWJzJykKICAgICAgICAgZW52aXJvbm1lbnRbJ0FVRElPX1JFU09VUkNFU19QQVRIJ10gPSBzZWxm LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnU291cmNlJywgJ1dlYkNvcmUnLCAncGxhdGZvcm0nLCAn YXVkaW8nLCAncmVzb3VyY2VzJykKICAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmly b25faWZfc2V0KGVudmlyb25tZW50LCAnV0VCS0lUX09VVFBVVERJUicpCiAgICAgICAgIGlmIHNl bGYuZ2V0X29wdGlvbigibGVha3MiKToKQEAgLTEyNSwxMCArMTQ3LDEwIEBAIGNsYXNzIEd0a1Bv cnQoUG9ydCk6CiAgICAgICAgIHJldHVybiBjb25maWd1cmF0aW9ucwogCiAgICAgZGVmIF9wYXRo X3RvX2RyaXZlcihzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoJ1Byb2dy YW1zJywgc2VsZi5kcml2ZXJfbmFtZSgpKQorICAgICAgICByZXR1cm4gc2VsZi5fYnVpbHRfZXhl Y3V0YWJsZXNfcGF0aChzZWxmLmRyaXZlcl9uYW1lKCkpCiAKICAgICBkZWYgX3BhdGhfdG9faW1h Z2VfZGlmZihzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoJ1Byb2dyYW1z JywgJ0ltYWdlRGlmZicpCisgICAgICAgIHJldHVybiBzZWxmLl9idWlsdF9leGVjdXRhYmxlc19w YXRoKCdJbWFnZURpZmYnKQogCiAgICAgZGVmIF9wYXRoX3RvX3dlYmNvcmVfbGlicmFyeShzZWxm KToKICAgICAgICAgZ3RrX2xpYnJhcnlfbmFtZXMgPSBbCkBAIC0xMzgsNyArMTYwLDcgQEAgY2xh c3MgR3RrUG9ydChQb3J0KToKICAgICAgICAgXQogCiAgICAgICAgIGZvciBsaWJyYXJ5IGluIGd0 a19saWJyYXJ5X25hbWVzOgotICAgICAgICAgICAgZnVsbF9saWJyYXJ5ID0gc2VsZi5fYnVpbGRf cGF0aCgiLmxpYnMiLCBsaWJyYXJ5KQorICAgICAgICAgICAgZnVsbF9saWJyYXJ5ID0gc2VsZi5f YnVpbHRfbGlicmFyaWVzX3BhdGgobGlicmFyeSkKICAgICAgICAgICAgIGlmIHNlbGYuX2ZpbGVz eXN0ZW0uaXNmaWxlKGZ1bGxfbGlicmFyeSk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZ1bGxf bGlicmFyeQogICAgICAgICByZXR1cm4gTm9uZQpAQCAtMTc3LDExICsxOTksMTYgQEAgY2xhc3Mg R3RrUG9ydChQb3J0KToKIAogICAgIGRlZiBidWlsZF93ZWJraXRfY29tbWFuZChzZWxmLCBidWls ZF9zdHlsZT1Ob25lKToKICAgICAgICAgY29tbWFuZCA9IHN1cGVyKEd0a1BvcnQsIHNlbGYpLmJ1 aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlKQotICAgICAgICBjb21tYW5kLmV4dGVuZChb Ii0tZ3RrIiwgIi0tdXBkYXRlLWd0ayJdKQorICAgICAgICBpZiBzZWxmLl9pc19jbWFrZV9idWls ZCgpOgorICAgICAgICAgICAgY29tbWFuZC5leHRlbmQoWyItLWd0a2NtYWtlIiwgIi0tdXBkYXRl LWd0ayJdKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgY29tbWFuZC5leHRlbmQoWyItLWd0 ayIsICItLXVwZGF0ZS1ndGsiXSkKKwogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtp dF90ZXN0X3J1bm5lcicpOgogICAgICAgICAgICAgY29tbWFuZC5hcHBlbmQoIi0tbm8td2Via2l0 MSIpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1uby13ZWJr aXQyIikKKwogICAgICAgICBjb21tYW5kLmFwcGVuZChzdXBlcihHdGtQb3J0LCBzZWxmKS5tYWtl X2FyZ3MoKSkKICAgICAgICAgcmV0dXJuIGNvbW1hbmQKIAo=