81234 2012-03-15 10:29:57 -0700 [GTK] Actually use --release and --debug command line options in run-gtk-test 2012-03-15 11:31:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned pnormand oldest_to_newest 579488 0 cgarcia 2012-03-15 10:29:57 -0700 Bots pass --release/--debug, and the options are now in the script, but they are not used at all, we have a hack to detect whether it's a Release or Debug build. 579493 1 132075 cgarcia 2012-03-15 10:33:41 -0700 Created attachment 132075 Patch 579570 2 cgarcia 2012-03-15 11:31:54 -0700 Committed r110866: <http://trac.webkit.org/changeset/110866> 132075 2012-03-15 10:33:41 -0700 2012-03-15 10:41:21 -0700 Patch gtk-tests-buildir-options.diff text/plain 5226 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2NGMw YTBjLi5iZjk1MzhjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTItMDMtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEFjdHVhbGx5IHVzZSAtLXJl bGVhc2UgYW5kIC0tZGVidWcgY29tbWFuZCBsaW5lIG9wdGlvbnMgaW4gcnVuLWd0ay10ZXN0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTIzNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjdHVhbGx5IGhh bmRsZSAtLXJlbGVhc2UgYW5kIC0tZGVidWcgY29tbWFuZCBsaW5lIG9wdGlvbnMgdG8KKyAgICAg ICAgY3JlYXRlIHRoZSBidWlsZCBkaXJlY3RvcnksIGZhbGxpbmcgYmFjayB0byBjdXJyZW50IGhh Y2sgdG8gZGV0ZWN0CisgICAgICAgIHdoZXRoZXIgaXQncyBhIFJlbGVhc2Ugb3IgRGVidWcgYnVp bGQgd2hlbiBib3RoIG9wdGlvbnMgYXJlIG1pc3NlZC4KKworICAgICAgICAqIFNjcmlwdHMvcnVu LWd0ay10ZXN0czoKKyAgICAgICAgKFRlc3RSdW5uZXIuX19pbml0X18pOiBSZWNlaXZlIG9wdGlv bnMgdG9vLgorICAgICAgICAoVGVzdFJ1bm5lci5fZ2V0X3RvcF9sZXZlbF9kaXJlY3RvcnkpOiBI ZWxwZXIgZnVuY3Rpb24gdG8gZ2V0IHRoZQorICAgICAgICB0b3AgbGV2ZWwgZGlyZWN0b3J5Lgor ICAgICAgICAoVGVzdFJ1bm5lci5fZ2V0X2J1aWxkX2RpcmVjdG9yeSk6IEhlbHBlciBmdW5jdGlv biB0byBnZXQgdGhlCisgICAgICAgIGJ1aWxkIGRpcmVjdG9yeSBkZXBlbmRpbmcgb24gLS1yZWxl YXNlLy0tZGVidWcgY29tbWFuZCBsaW5lCisgICAgICAgIG9wdGlvbnMgb3IgZ2Vzc2luZyBpdCBp ZiBib3RoIG9wdGlvbnMgYXJlIG1pc3NpbmcuCisgICAgICAgIChUZXN0UnVubmVyLl9lbnN1cmVf YWNjZXNzaWJpbGl0eV9kYWVtb25faXNfcnVubmluZyk6IFVzZQorICAgICAgICBzZWxmLW9wdGlv bnMgbm93LgorICAgICAgICAoVGVzdFJ1bm5lci5ydW4pOiBEaXR0by4KKyAgICAgICAgKFRlc3RS dW5uZXIucnVuLnJ1bl90ZXN0cyk6IFBhc3Mgb3B0aW9ucyB0byB0aGUgY29uc3RydWN0b3IKKyAg ICAgICAgaW5zdGVhZCBvZiBydW4oKS4KKwogMjAxMi0wMy0xNSAgUGhpbGlwcGUgTm9ybWFuZCAg PHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIGJ1aWxkIGZp eCBhdHRlbXB0IGFmdGVyIHIxMTA4NDUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1n dGstdGVzdHMgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKaW5kZXggYmQxYjcyNy4uODQz NDM1MCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCisrKyBiL1Rvb2xz L1NjcmlwdHMvcnVuLWd0ay10ZXN0cwpAQCAtMzYsMjggKzM2LDM5IEBAIGNsYXNzIFRlc3RSdW5u ZXI6CiAgICAgICAgICAgICAgICAgIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzY5MTAKICAgICAgICAgICAgICAgICAiV2ViS2l0MkFQSVRlc3RzL1Rlc3REb3dubG9h ZHMiIF0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0cz1bXSk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIG9wdGlvbnMsIHRlc3RzPVtdKToKIAogICAgICAgICAjIEZJWE1FOiB3ZWJraXQt YnVpbGQtZGlyZWN0b3J5IC0tY29uZmlndXJhdGlvbiBhbHdheXMgcmV0dXJucwogICAgICAgICAj IFJlbGVhc2UgYmVjYXVzZSB3ZSBuZXZlciBjYWxsIHNldC13ZWJraXQtY29uZmlndXJhdGlvbi4K ICAgICAgICAgI2J1aWxkX2RpcmVjdG9yeV9zY3JpcHQgPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5k aXJuYW1lKF9fZmlsZV9fKSwgIndlYmtpdC1idWlsZC1kaXJlY3RvcnkiKQogICAgICAgICAjYnVp bGRfZGlyZWN0b3J5ID0gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFtidWlsZF9kaXJlY3Rv cnlfc2NyaXB0LCAiLS1jb25maWd1cmF0aW9uIl0pLnJzdHJpcCgpCiAKLSAgICAgICAgZGVmIGlz X3ZhbGlkX2J1aWxkX2RpcmVjdG9yeShidWlsZF9kaXIpOgotICAgICAgICAgICAgcmV0dXJuIG9z LnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihidWlsZF9kaXIsICIubGlicyIpKQotCi0gICAgICAg IHNjcmlwdF9kaXIgPSBvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pCi0gICAgICAgIHRvcF9sZXZl bCA9IG9zLnBhdGgubm9ybXBhdGgob3MucGF0aC5qb2luKHNjcmlwdF9kaXIsICIuLiIsICIuLiIp KQotICAgICAgICBidWlsZF9kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4odG9wX2xldmVsLCAnV2Vi S2l0QnVpbGQnLCAnUmVsZWFzZScpCi0gICAgICAgIGlmIG5vdCBpc192YWxpZF9idWlsZF9kaXJl Y3RvcnkoYnVpbGRfZGlyZWN0b3J5KToKLSAgICAgICAgICAgIGJ1aWxkX2RpcmVjdG9yeSA9IG9z LnBhdGguam9pbih0b3BfbGV2ZWwsICdXZWJLaXRCdWlsZCcsICdEZWJ1ZycpCi0KKyAgICAgICAg c2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMKICAgICAgICAgc2VsZi5fYTExeV9yZWdpc3RyeWQgPSBO b25lCiAgICAgICAgIHNlbGYuX3RpbWVkX291dCA9IEZhbHNlCi0gICAgICAgIHNlbGYuX2d0a190 b29sc19kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4odG9wX2xldmVsLCAiVG9vbHMiLCAiZ3RrIikK LSAgICAgICAgc2VsZi5fcHJvZ3JhbXNfcGF0aCA9IG9zLnBhdGguam9pbihidWlsZF9kaXJlY3Rv cnksICJQcm9ncmFtcyIpCisgICAgICAgIHNlbGYuX2d0a190b29sc19kaXJlY3RvcnkgPSBvcy5w YXRoLmpvaW4oc2VsZi5fZ2V0X3RvcF9sZXZlbF9kaXJlY3RvcnkoKSwgIlRvb2xzIiwgImd0ayIp CisgICAgICAgIHNlbGYuX3Byb2dyYW1zX3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5fZ2V0X2J1 aWxkX2RpcmVjdG9yeSgpLCAiUHJvZ3JhbXMiKQogICAgICAgICBzZWxmLl90ZXN0cyA9IHNlbGYu X2dldF90ZXN0cyh0ZXN0cykKIAorICAgIGRlZiBfZ2V0X3RvcF9sZXZlbF9kaXJlY3Rvcnkoc2Vs Zik6CisgICAgICAgIHJldHVybiBvcy5wYXRoLm5vcm1wYXRoKG9zLnBhdGguam9pbihvcy5wYXRo LmRpcm5hbWUoX19maWxlX18pLCAiLi4iLCAiLi4iKSkKKworICAgIGRlZiBfZ2V0X2J1aWxkX2Rp cmVjdG9yeShzZWxmKToKKyAgICAgICAgdG9wX2xldmVsID0gc2VsZi5fZ2V0X3RvcF9sZXZlbF9k aXJlY3RvcnkoKQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlbGVhc2U6CisgICAgICAgICAg ICByZXR1cm4gb3MucGF0aC5qb2luKHRvcF9sZXZlbCwgJ1dlYktpdEJ1aWxkJywgJ1JlbGVhc2Un KQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmRlYnVnOgorICAgICAgICAgICAgcmV0dXJuIG9z LnBhdGguam9pbih0b3BfbGV2ZWwsICdXZWJLaXRCdWlsZCcsICdEZWJ1ZycpCisKKyAgICAgICAg YnVpbGRfZGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKHRvcF9sZXZlbCwgJ1dlYktpdEJ1aWxkJywg J1JlbGVhc2UnKQorICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYnVpbGRf ZGlyZWN0b3J5LCAnLmxpYnMnKSk6CisgICAgICAgICAgICByZXR1cm4gYnVpbGRfZGlyZWN0b3J5 CisgICAgICAgIGJ1aWxkX2RpcmVjdG9yeSA9IG9zLnBhdGguam9pbih0b3BfbGV2ZWwsICdXZWJL aXRCdWlsZCcsICdEZWJ1ZycpCisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9p bihidWlsZF9kaXJlY3RvcnksICcubGlicycpKToKKyAgICAgICAgICAgIHJldHVybiBidWlsZF9k aXJlY3RvcnkKKworICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHRvcF9sZXZlbCwgJ1dlYktp dEJ1aWxkJykKKwogICAgIGRlZiBfZ2V0X3Rlc3RzKHNlbGYsIHRlc3RzKToKICAgICAgICAgaWYg dGVzdHM6CiAgICAgICAgICAgICByZXR1cm4gdGVzdHMKQEAgLTEyNSwxNCArMTM2LDE0IEBAIGNs YXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCiAgICAg ICAgICAgICAgICAgc2VsZi5fYTExeV9yZWdpc3RyeWQgPSBOb25lCiAKLSAgICBkZWYgcnVuKHNl bGYsIG9wdGlvbnMpOgorICAgIGRlZiBydW4oc2VsZik6CiAgICAgICAgIGlmIG5vdCBzZWxmLl90 ZXN0czoKICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkVSUk9SOiB0ZXN0cyBub3QgZm91 bmQgaW4gJXMuXG4iICUgKHNlbGYuX3Byb2dyYW1zX3BhdGgpKQogICAgICAgICAgICAgc3lzLnN0 ZGVyci5mbHVzaCgpCiAgICAgICAgICAgICByZXR1cm4gMQogCiAgICAgICAgIHRlc3RfZW52ID0g b3MuZW52aXJvbgotICAgICAgICB0ZXN0X2VudlsiRElTUExBWSJdID0gb3B0aW9ucy5kaXNwbGF5 CisgICAgICAgIHRlc3RfZW52WyJESVNQTEFZIl0gPSBzZWxmLl9vcHRpb25zLmRpc3BsYXkKICAg ICAgICAgdGVzdF9lbnZbIldFQktJVF9JTlNQRUNUT1JfUEFUSCJdID0gb3MucGF0aC5hYnNwYXRo KG9zLnBhdGguam9pbihzZWxmLl9wcm9ncmFtc19wYXRoLCAncmVzb3VyY2VzJywgJ2luc3BlY3Rv cicpKQogICAgICAgICB0ZXN0X2VudlsnR1NFVFRJTkdTX0JBQ0tFTkQnXSA9ICdtZW1vcnknCiAK QEAgLTE1OCw3ICsxNjksNyBAQCBjbGFzcyBUZXN0UnVubmVyOgogCiAgICAgICAgICAgICBmb3Ig dGVzdCBpbiBzZWxmLl90ZXN0czoKICAgICAgICAgICAgICAgICB0ZXN0ZXJfY29tbWFuZCA9IFtq aGJ1aWxkX3BhdGggLCAnZ3Rlc3RlciddCi0gICAgICAgICAgICAgICAgaWYgb3B0aW9ucy52ZXJi b3NlOgorICAgICAgICAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMudmVyYm9zZToKICAgICAgICAg ICAgICAgICAgICAgdGVzdGVyX2NvbW1hbmQuYXBwZW5kKCctLXZlcmJvc2UnKQogICAgICAgICAg ICAgICAgIHRlc3Rlcl9jb21tYW5kLmFwcGVuZCh0ZXN0KQogICAgICAgICAgICAgICAgIHByb2Nl c3MgPSBzdWJwcm9jZXNzLlBvcGVuKHRlc3Rlcl9jb21tYW5kLCBlbnY9dGVzdF9lbnYpCkBAIC0y MDksNiArMjIwLDYgQEAgaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICAgICAgc3lzLmV4 aXQoMSkKIAogICAgIHRyeToKLSAgICAgICAgc3lzLmV4aXQoVGVzdFJ1bm5lcihhcmdzKS5ydW4o b3B0aW9ucykpCisgICAgICAgIHN5cy5leGl0KFRlc3RSdW5uZXIob3B0aW9ucywgYXJncykucnVu KCkpCiAgICAgZmluYWxseToKICAgICAgICAgeHZmYi5raWxsKCkK