116016 2013-05-13 01:57:55 -0700 [webkitpy] Make FileInfo.repository_name support SVN version > 1.6 2013-05-13 12:22:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 115567 1 ossy ossy benjamin commit-queue dpranke glenn hamaji jberlin kadam levin ossy rniwa zarvai oldest_to_newest 888148 0 ossy 2013-05-13 01:57:55 -0700 New webkitpy test introduced in r149635 fails on the buildbots. It fails only in SVN repositories, but passes in GIT repositories. :) I started digging it, and it seems the problem is somewhere near class FileInfo implementation in cpp.py. from SVN repository: --------------------- $ Tools/Scripts/test-webkitpy Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py Suppressing most webkitpy logging while running unit tests. [1/1] webkitpy.style.checkers.cpp_unittest.CppStyleTest.test_webcore_platform_layering_violation failed: Traceback (most recent call last): File "/home/oszi/WebKit-svn/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py", line 251, in test_webcore_platform_layering_violation self.assertEqual(1, error_collector.result_list().count(errmsg)) AssertionError: 1 != 0 Ran 1 test in 0.023s FAILED (failures=1, errors=0) from GIT repository: --------------------- $ Tools/Scripts/test-webkitpy Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py Suppressing most webkitpy logging while running unit tests. Skipping tests in the following modules or packages because they are really, really, slow: webkitpy.common.checkout.scm.scm_unittest (https://bugs.webkit.org/show_bug.cgi?id=31818; use --all to include) Ran 1276 tests in 3.063s OK 888150 1 ossy 2013-05-13 02:09:20 -0700 cpp.py: ---------- def check_for_webcore_platform_layering_violation(filename, clean_lines, line_number, error): """Checks for platform-specific code inside WebCore outside of the platform layer.""" directory = FileInfo(filename).split()[0] if not match(r'Source/WebCore', directory): return if match(r'Source/WebCore/platform', directory): return I got the root of the bug. FileInfo(filename).split() returns absolute path inside SVN repository and relative path inside GIT repository: - SVN: ('/home/webkitbuildbot/oszi/WebKit-svn/Source/WebCore/loader', 'NavigationAction', '.cpp') - GIT: ('Source/WebCore/loader', 'NavigationAction', '.cpp') 888154 2 ossy 2013-05-13 02:21:26 -0700 The problem is bigger than I thought before. :-/ The implementation of FileInfo.repository_name is incorrect for SVN 1.7, because there isn't .svn directories everywhere, only in the root directory. 888157 3 ossy 2013-05-13 02:28:19 -0700 The original implemantation introduced in http://trac.webkit.org/changeset/45857 long long time ago. It seems this bug was fixed in the upstream - http://google-styleguide.googlecode.com/svn/trunk/cpplint/cpplint.py 888160 4 201540 ossy 2013-05-13 02:47:54 -0700 Created attachment 201540 Patch 888459 5 201540 commit-queue 2013-05-13 12:22:38 -0700 Comment on attachment 201540 Patch Clearing flags on attachment: 201540 Committed r150028: <http://trac.webkit.org/changeset/150028> 888460 6 commit-queue 2013-05-13 12:22:41 -0700 All reviewed patches have been landed. Closing bug. 201540 2013-05-13 02:47:54 -0700 2013-05-13 12:22:38 -0700 Patch bug-116016-20130513114740.patch text/plain 2201 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTUzYzFkOGNjNmI2ZjVjN2FkMDIyNDk2Yzg3ODA2YTE0 OWMyMjRhZS4uODFjZDU1ODExNzA5NTk3MDBkNDk4OWY1MDdjYzc1MWIwNWM1ZGZiNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEzLTA1LTEzICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgW3dlYmtpdHB5XSBNYWtlIEZpbGVJbmZvLnJlcG9zaXRvcnlfbmFtZSBzdXBwb3J0 IFNWTiB2ZXJzaW9uID4gMS42CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTYwMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBTYW1lIGZpeCBhcyBpbiB0aGUgdXBzdHJlYW0gc3R5bGUgY2hlY2tlciwgYnV0 IHdpdGhvdXQgaGcgc3VwcG9ydC4KKyAgICAgICAgKCBodHRwOi8vZ29vZ2xlLXN0eWxlZ3VpZGUu Z29vZ2xlY29kZS5jb20vc3ZuL3RydW5rL2NwcGxpbnQvY3BwbGludC5weSApCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weToKKyAgICAgICAgKEZpbGVJ bmZvLnJlcG9zaXRvcnlfbmFtZSk6CisKIDIwMTMtMDUtMTIgIENvbW1pdCBRdWV1ZSAgPGNvbW1p dC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx NDk5NTUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5Cmlu ZGV4IGU2Y2JkMTE4MTI3MzdkMzYxZDQyZjIzNTdjNjRlNzFlMzkyOWIwODMuLmQyZDJiY2IyZjM4 MDMwYzlmZjUyMmZlMTk4YWYzZTkxMjYzNGY5NWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBAIC02NDgsMTMgKzY0OCwxNiBAQCBjbGFzcyBGaWxl SW5mbzoKICAgICAgICAgICAgICAgICBwcmVmaXggPSBvcy5wYXRoLmNvbW1vbnByZWZpeChbcm9v dF9kaXIsIHByb2plY3RfZGlyXSkKICAgICAgICAgICAgICAgICByZXR1cm4gZnVsbG5hbWVbbGVu KHByZWZpeCkgKyAxOl0KIAotICAgICAgICAgICAgIyBOb3QgU1ZOPyBUcnkgdG8gZmluZCBhIGdp dCB0b3AgbGV2ZWwgZGlyZWN0b3J5IGJ5CisKKyAgICAgICAgICAgICMgTm90IFNWTiA8PSAxLjY/ IFRyeSB0byBmaW5kIGEgZ2l0LCBvciBzdm4gdG9wIGxldmVsIGRpcmVjdG9yeSBieQogICAgICAg ICAgICAgIyBzZWFyY2hpbmcgdXAgZnJvbSB0aGUgY3VycmVudCBwYXRoLgogICAgICAgICAgICAg cm9vdF9kaXIgPSBvcy5wYXRoLmRpcm5hbWUoZnVsbG5hbWUpCiAgICAgICAgICAgICB3aGlsZSAo cm9vdF9kaXIgIT0gb3MucGF0aC5kaXJuYW1lKHJvb3RfZGlyKQotICAgICAgICAgICAgICAgICAg IGFuZCBub3Qgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKHJvb3RfZGlyLCAiLmdpdCIpKSk6 CisgICAgICAgICAgICAgICAgICAgYW5kIG5vdCBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4o cm9vdF9kaXIsICIuZ2l0IikpCisgICAgICAgICAgICAgICAgICAgYW5kIG5vdCBvcy5wYXRoLmV4 aXN0cyhvcy5wYXRoLmpvaW4ocm9vdF9kaXIsICIuc3ZuIikpKToKICAgICAgICAgICAgICAgICBy b290X2RpciA9IG9zLnBhdGguZGlybmFtZShyb290X2RpcikKLSAgICAgICAgICAgICAgICBpZiBv cy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4ocm9vdF9kaXIsICIuZ2l0IikpOgorICAgICAgICAg ICAgICAgIGlmIChvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4ocm9vdF9kaXIsICIuZ2l0Iikp IG9yCisgICAgICAgICAgICAgICAgICAgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKHJvb3Rf ZGlyLCAiLnN2biIpKSk6CiAgICAgICAgICAgICAgICAgICAgIHByZWZpeCA9IG9zLnBhdGguY29t bW9ucHJlZml4KFtyb290X2RpciwgcHJvamVjdF9kaXJdKQogICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gZnVsbG5hbWVbbGVuKHByZWZpeCkgKyAxOl0KIAo=