138160 2014-10-28 17:13:44 -0700 Unify logic in RunTests.run() to run the Python unit tests 2014-10-28 18:28:31 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 137667 1 dbates dbates ap cjerdonek commit-queue ddkilzer glenn jake.nielsen.webkit rniwa oldest_to_newest 1044646 0 dbates 2014-10-28 17:13:44 -0700 Currently we duplicate logic when running the RunTest step interactively and non-interacrtively for determining the path to the test-webkitpy application and printing a log message to the console to inform a person that we are running the Python unit tests. We should unify these code paths. 1044658 1 240583 dbates 2014-10-28 17:34:11 -0700 Created attachment 240583 Patch 1044669 2 240584 dbates 2014-10-28 18:03:04 -0700 Created attachment 240584 Patch Rebased patch following the landing of the patch for bug #137667. 1044676 3 dbates 2014-10-28 18:28:31 -0700 Committed r175295: <http://trac.webkit.org/changeset/175295> 240583 2014-10-28 17:34:11 -0700 2014-10-28 18:03:02 -0700 Patch bug-138160-20141028173420.patch text/plain 3476 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1Mjg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTdhMjM1ODVhYzFmZTM4NmUwMGQ0NTBhZTg5N2U5NWQw YzAzNGU5Zi4uMjBkNzU3Yzc5NWI2YTcwYWM4NzBiYjBkNzAwY2ZjNTk2NDIxMzI1NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE0LTEwLTI4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBVbmlmeSBsb2dpYyBpbiBSdW5UZXN0cy5ydW4oKSB0byBydW4gdGhlIFB5dGhvbiB1bml0 IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzgxNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV bmlmeSB0aGUgaW50ZXJhY3RpdmUgYW5kIG5vbi1pbnRlcmFjdGl2ZSBjb2RlIHBhdGggZm9yIHJ1 bm5pbmcgdGhlIFB5dGhvbiB1bml0IHRlc3RzCisgICAgICAgIGluIHN0ZXAgUnVuVGVzdHMgc28g YXMgdG8gcmVtb3ZlIGR1cGxpY2F0ZSBjb2RlIHRvIGNvbXB1dGUgdGhlIHRoZSBwYXRoIHRvIHRo ZSBzY3JpcHQKKyAgICAgICAgdGVzdC13ZWJraXRweSBhbmQgbG9nIGFuIGluZm9ybWF0aXZlIG1l c3NhZ2UgKCJSdW5uaW5nIFB5dGhvbiB1bml0IHRlc3RzIikgdG8gdGhlIGNvbnNvbGUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIG5vIGZ1bmN0aW9uYWxpdHkgd2FzIGNoYW5nZWQuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQu cHl0aG9uX3VuaXR0ZXN0X3Jlc3VsdHNfZGlyZWN0b3J5KToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHk6CisgICAgICAgIChSdW5UZXN0cy5ydW4pOgor CiAyMDE0LTEwLTI4ICBKYWtlIE5pZWxzZW4gIDxqYWNvYl9uaWVsc2VuQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIHJ1bnRlc3QucHkgY2FsbCB0ZXN0LXdlYmtpdHB5IHdpdGggdGhlIC0tanNv biBmbGFnIHdoZW4gaW4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9ydW50ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50 ZXN0cy5weQppbmRleCBhMmQ3OTVhY2ZlMzM2NmViY2ZiNmM1NmE1MDE0NWFkMDBjMzgwZTZmLi5l Y2Q2MzUxNzczMWMwMDI5OWFjYzVlMTk5ODY5MDhlNzM1ZjY0NDgzIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzLnB5CkBAIC01MywyNyArNTMsMjMgQEAg Y2xhc3MgUnVuVGVzdHMoQWJzdHJhY3RTdGVwKToKICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlv bnMudGVzdDoKICAgICAgICAgICAgIHJldHVybgogCi0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMu bm9uX2ludGVyYWN0aXZlOgotICAgICAgICAgICAgcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kID0g c2VsZi5fdG9vbC5kZXByZWNhdGVkX3BvcnQoKS5ydW5fcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5k KCkKLQotICAgICAgICAgICAgaWYgcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kOgotICAgICAgICAg ICAgICAgIHB5dGhvbl91bml0dGVzdHNfY29tbWFuZC5hcHBlbmQoJy0tanNvbicpCi0gICAgICAg ICAgICAgICAgX2xvZy5pbmZvKCJSdW5uaW5nIFB5dGhvbiB1bml0IHRlc3RzIikKLQorICAgICAg ICBweXRob25fdW5pdHRlc3RzX2NvbW1hbmQgPSBzZWxmLl90b29sLmRlcHJlY2F0ZWRfcG9ydCgp LnJ1bl9weXRob25fdW5pdHRlc3RzX2NvbW1hbmQoKQorICAgICAgICBpZiBweXRob25fdW5pdHRl c3RzX2NvbW1hbmQ6CisgICAgICAgICAgICBfbG9nLmluZm8oIlJ1bm5pbmcgUHl0aG9uIHVuaXQg dGVzdHMiKQorICAgICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5ub25faW50ZXJhY3RpdmU6CiAg ICAgICAgICAgICAgICAgZmlsZXN5c3RlbSA9IHNlbGYuX3Rvb2wuZmlsZXN5c3RlbQogICAgICAg ICAgICAgICAgIHB5dGhvbl91bml0dGVzdF9yZXN1bHRzX2RpcmVjdG9yeSA9IHNlbGYuX3Rvb2wu cG9ydF9mYWN0b3J5LmdldCgpLnB5dGhvbl91bml0dGVzdF9yZXN1bHRzX2RpcmVjdG9yeSgpCiAg ICAgICAgICAgICAgICAgZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShweXRob25fdW5p dHRlc3RfcmVzdWx0c19kaXJlY3RvcnkpCisKKyAgICAgICAgICAgICAgICBweXRob25fdW5pdHRl c3RzX2NvbW1hbmQuYXBwZW5kKCctLWpzb24nKQogICAgICAgICAgICAgICAgIG91dHB1dCA9IHNl bGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKHB5dGhvbl91bml0dGVzdHNfY29tbWFuZCwg Y3dkPXNlbGYuX3Rvb2wuc2NtKCkuY2hlY2tvdXRfcm9vdCwgZXJyb3JfaGFuZGxlcj1FeGVjdXRp dmUuaWdub3JlX2Vycm9yLCByZXR1cm5fc3RkZXJyPUZhbHNlKQogICAgICAgICAgICAgICAgIGZp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKGZpbGVzeXN0ZW0uam9pbihweXRob25fdW5pdHRlc3Rf cmVzdWx0c19kaXJlY3RvcnksICJyZXN1bHRzLmpzb24iKSwgb3V0cHV0KQorICAgICAgICAgICAg ZWxzZToKKyAgICAgICAgICAgICAgICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93 X2lmX2ZhaWwocHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kLCBjd2Q9c2VsZi5fdG9vbC5zY20oKS5j aGVja291dF9yb290KQogCi0gICAgICAgIGVsc2U6CisgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRp b25zLm5vbl9pbnRlcmFjdGl2ZToKICAgICAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCB0ZWFj aCB0aGUgY29tbWl0LXF1ZXVlIGFuZCB0aGUgRVdTIGhvdyB0byBydW4gdGhlc2UgdGVzdHMuCiAK LSAgICAgICAgICAgIHB5dGhvbl91bml0dGVzdHNfY29tbWFuZCA9IHNlbGYuX3Rvb2wuZGVwcmVj YXRlZF9wb3J0KCkucnVuX3B5dGhvbl91bml0dGVzdHNfY29tbWFuZCgpCi0gICAgICAgICAgICBp ZiBweXRob25fdW5pdHRlc3RzX2NvbW1hbmQ6Ci0gICAgICAgICAgICAgICAgX2xvZy5pbmZvKCJS dW5uaW5nIFB5dGhvbiB1bml0IHRlc3RzIikKLSAgICAgICAgICAgICAgICBzZWxmLl90b29sLmV4 ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwocHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kLCBj d2Q9c2VsZi5fdG9vbC5zY20oKS5jaGVja291dF9yb290KQotCiAgICAgICAgICAgICBwZXJsX3Vu aXR0ZXN0c19jb21tYW5kID0gc2VsZi5fdG9vbC5kZXByZWNhdGVkX3BvcnQoKS5ydW5fcGVybF91 bml0dGVzdHNfY29tbWFuZCgpCiAgICAgICAgICAgICBpZiBwZXJsX3VuaXR0ZXN0c19jb21tYW5k OgogICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiUnVubmluZyBQZXJsIHVuaXQgdGVzdHMiKQo= 240584 2014-10-28 18:03:04 -0700 2014-10-28 18:25:22 -0700 Patch bug-138160-20141028180313.patch text/plain 3476 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1Mjk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTdhMjM1ODVhYzFmZTM4NmUwMGQ0NTBhZTg5N2U5NWQw YzAzNGU5Zi4uMjBkNzU3Yzc5NWI2YTcwYWM4NzBiYjBkNzAwY2ZjNTk2NDIxMzI1NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE0LTEwLTI4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBVbmlmeSBsb2dpYyBpbiBSdW5UZXN0cy5ydW4oKSB0byBydW4gdGhlIFB5dGhvbiB1bml0 IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzgxNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV bmlmeSB0aGUgaW50ZXJhY3RpdmUgYW5kIG5vbi1pbnRlcmFjdGl2ZSBjb2RlIHBhdGggZm9yIHJ1 bm5pbmcgdGhlIFB5dGhvbiB1bml0IHRlc3RzCisgICAgICAgIGluIHN0ZXAgUnVuVGVzdHMgc28g YXMgdG8gcmVtb3ZlIGR1cGxpY2F0ZSBjb2RlIHRvIGNvbXB1dGUgdGhlIHRoZSBwYXRoIHRvIHRo ZSBzY3JpcHQKKyAgICAgICAgdGVzdC13ZWJraXRweSBhbmQgbG9nIGFuIGluZm9ybWF0aXZlIG1l c3NhZ2UgKCJSdW5uaW5nIFB5dGhvbiB1bml0IHRlc3RzIikgdG8gdGhlIGNvbnNvbGUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIG5vIGZ1bmN0aW9uYWxpdHkgd2FzIGNoYW5nZWQuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQu cHl0aG9uX3VuaXR0ZXN0X3Jlc3VsdHNfZGlyZWN0b3J5KToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHk6CisgICAgICAgIChSdW5UZXN0cy5ydW4pOgor CiAyMDE0LTEwLTI4ICBKYWtlIE5pZWxzZW4gIDxqYWNvYl9uaWVsc2VuQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIHJ1bnRlc3QucHkgY2FsbCB0ZXN0LXdlYmtpdHB5IHdpdGggdGhlIC0tanNv biBmbGFnIHdoZW4gaW4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9ydW50ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50 ZXN0cy5weQppbmRleCBhMmQ3OTVhY2ZlMzM2NmViY2ZiNmM1NmE1MDE0NWFkMDBjMzgwZTZmLi5l Y2Q2MzUxNzczMWMwMDI5OWFjYzVlMTk5ODY5MDhlNzM1ZjY0NDgzIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzLnB5CkBAIC01MywyNyArNTMsMjMgQEAg Y2xhc3MgUnVuVGVzdHMoQWJzdHJhY3RTdGVwKToKICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlv bnMudGVzdDoKICAgICAgICAgICAgIHJldHVybgogCi0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMu bm9uX2ludGVyYWN0aXZlOgotICAgICAgICAgICAgcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kID0g c2VsZi5fdG9vbC5kZXByZWNhdGVkX3BvcnQoKS5ydW5fcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5k KCkKLQotICAgICAgICAgICAgaWYgcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kOgotICAgICAgICAg ICAgICAgIHB5dGhvbl91bml0dGVzdHNfY29tbWFuZC5hcHBlbmQoJy0tanNvbicpCi0gICAgICAg ICAgICAgICAgX2xvZy5pbmZvKCJSdW5uaW5nIFB5dGhvbiB1bml0IHRlc3RzIikKLQorICAgICAg ICBweXRob25fdW5pdHRlc3RzX2NvbW1hbmQgPSBzZWxmLl90b29sLmRlcHJlY2F0ZWRfcG9ydCgp LnJ1bl9weXRob25fdW5pdHRlc3RzX2NvbW1hbmQoKQorICAgICAgICBpZiBweXRob25fdW5pdHRl c3RzX2NvbW1hbmQ6CisgICAgICAgICAgICBfbG9nLmluZm8oIlJ1bm5pbmcgUHl0aG9uIHVuaXQg dGVzdHMiKQorICAgICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5ub25faW50ZXJhY3RpdmU6CiAg ICAgICAgICAgICAgICAgZmlsZXN5c3RlbSA9IHNlbGYuX3Rvb2wuZmlsZXN5c3RlbQogICAgICAg ICAgICAgICAgIHB5dGhvbl91bml0dGVzdF9yZXN1bHRzX2RpcmVjdG9yeSA9IHNlbGYuX3Rvb2wu cG9ydF9mYWN0b3J5LmdldCgpLnB5dGhvbl91bml0dGVzdF9yZXN1bHRzX2RpcmVjdG9yeSgpCiAg ICAgICAgICAgICAgICAgZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShweXRob25fdW5p dHRlc3RfcmVzdWx0c19kaXJlY3RvcnkpCisKKyAgICAgICAgICAgICAgICBweXRob25fdW5pdHRl c3RzX2NvbW1hbmQuYXBwZW5kKCctLWpzb24nKQogICAgICAgICAgICAgICAgIG91dHB1dCA9IHNl bGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKHB5dGhvbl91bml0dGVzdHNfY29tbWFuZCwg Y3dkPXNlbGYuX3Rvb2wuc2NtKCkuY2hlY2tvdXRfcm9vdCwgZXJyb3JfaGFuZGxlcj1FeGVjdXRp dmUuaWdub3JlX2Vycm9yLCByZXR1cm5fc3RkZXJyPUZhbHNlKQogICAgICAgICAgICAgICAgIGZp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKGZpbGVzeXN0ZW0uam9pbihweXRob25fdW5pdHRlc3Rf cmVzdWx0c19kaXJlY3RvcnksICJyZXN1bHRzLmpzb24iKSwgb3V0cHV0KQorICAgICAgICAgICAg ZWxzZToKKyAgICAgICAgICAgICAgICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93 X2lmX2ZhaWwocHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kLCBjd2Q9c2VsZi5fdG9vbC5zY20oKS5j aGVja291dF9yb290KQogCi0gICAgICAgIGVsc2U6CisgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRp b25zLm5vbl9pbnRlcmFjdGl2ZToKICAgICAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCB0ZWFj aCB0aGUgY29tbWl0LXF1ZXVlIGFuZCB0aGUgRVdTIGhvdyB0byBydW4gdGhlc2UgdGVzdHMuCiAK LSAgICAgICAgICAgIHB5dGhvbl91bml0dGVzdHNfY29tbWFuZCA9IHNlbGYuX3Rvb2wuZGVwcmVj YXRlZF9wb3J0KCkucnVuX3B5dGhvbl91bml0dGVzdHNfY29tbWFuZCgpCi0gICAgICAgICAgICBp ZiBweXRob25fdW5pdHRlc3RzX2NvbW1hbmQ6Ci0gICAgICAgICAgICAgICAgX2xvZy5pbmZvKCJS dW5uaW5nIFB5dGhvbiB1bml0IHRlc3RzIikKLSAgICAgICAgICAgICAgICBzZWxmLl90b29sLmV4 ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwocHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kLCBj d2Q9c2VsZi5fdG9vbC5zY20oKS5jaGVja291dF9yb290KQotCiAgICAgICAgICAgICBwZXJsX3Vu aXR0ZXN0c19jb21tYW5kID0gc2VsZi5fdG9vbC5kZXByZWNhdGVkX3BvcnQoKS5ydW5fcGVybF91 bml0dGVzdHNfY29tbWFuZCgpCiAgICAgICAgICAgICBpZiBwZXJsX3VuaXR0ZXN0c19jb21tYW5k OgogICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiUnVubmluZyBQZXJsIHVuaXQgdGVzdHMiKQo=