134195 2014-06-23 08:44:36 -0700 [EFL] Remove WebKit1 related code from scripts 2014-06-27 08:01:54 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 134245 134299 134391 134087 1 mpakulavelrutka mpakulavelrutka commit-queue dbates glenn laszlo.gombos lucas.de.marchi ossy rniwa oldest_to_newest 1017568 0 mpakulavelrutka 2014-06-23 08:44:36 -0700 After removing WebKit1 from EFL port still there is some code related to DumpRenderTree, EWebLauncher. Also running layout tests requires adding -2/--webkit-test-runner switch. 1017569 1 233609 mpakulavelrutka 2014-06-23 08:50:39 -0700 Created attachment 233609 proposed patch 1017574 2 233609 ossy 2014-06-23 09:24:06 -0700 Comment on attachment 233609 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=233609&action=review > Tools/Scripts/webkitpy/port/efl.py:113 > - if self.get_option('webkit_test_runner'): > - search_paths.append(self.port_name + '-wk2') > - search_paths.append('wk2') > - else: > - search_paths.append(self.port_name + '-wk1') > + search_paths.append('wk2') Before doing it, efl-wk2/TestExpectations should be merged to efl/TestExpectations. 1018131 3 233609 laszlo.gombos 2014-06-24 15:31:34 -0700 Comment on attachment 233609 proposed patch lgtm. Seems combining the expectation files are already landed - http://trac.webkit.org/changeset/170354 . 1018308 4 233609 commit-queue 2014-06-25 05:25:45 -0700 Comment on attachment 233609 proposed patch Clearing flags on attachment: 233609 Committed r170426: <http://trac.webkit.org/changeset/170426> 1018309 5 commit-queue 2014-06-25 05:25:49 -0700 All reviewed patches have been landed. Closing bug. 1018323 6 laszlo.gombos 2014-06-25 07:18:38 -0700 Michal, it seems this change impacting some python test. Can you please check and and try to fix it ! [1203/1421] webkitpy.style.checkers.test_expectations_unittest.TestExpectationsTestCase.test_determine_port_from_expectations_path failed: Traceback (most recent call last): File "/Volumes/Data/slave/mavericks-debug-tests-wk1/build/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py", line 80, in test_determine_port_from_expectations_path self._expect_port_for_expectations_path('efl', 'LayoutTests/platform/efl-wk2/TestExpectations') File "/Volumes/Data/slave/mavericks-debug-tests-wk1/build/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py", line 73, in _expect_port_for_expectations_path self.assertIsNone(expected_port_implementation) AssertionError: 'efl' is not None 1018330 7 mpakulavelrutka 2014-06-25 08:12:46 -0700 Regression was fixed by re-adding efl-wk2 to search paths <https://trac.webkit.org/changeset/170427>, still we have to remove this unnecessary path again without breaking tests. 1018957 8 mpakulavelrutka 2014-06-27 08:01:54 -0700 efl-wk2 baselines were removed in <http://trac.webkit.org/changeset/170527> 233609 2014-06-23 08:50:39 -0700 2014-06-25 05:25:44 -0700 proposed patch remove-webkit1-from-tools.diff text/plain 5348 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNGMz MWVjLi5iMTdkMjNjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTQtMDYtMjMgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBSZW1vdmUgV2Vi S2l0MSByZWxhdGVkIGNvZGUgZnJvbSBzY3JpcHRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQxOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByZW1vdmluZyBXZWJLaXQxIGZyb20gRUZMIHBv cnQsIHN0aWxsIHRoZXJlIGlzIHNvbWUgY29kZSBsZWZ0IHJlbGF0ZWQgdG8gRHVtcFJlbmRlclRy ZWUsIAorICAgICAgICBFV2ViTGF1bmNoZXIuIEFsc28gcnVubmluZyBsYXlvdXQgdGVzdHMgZG9l cyBub3QgcmVxdWlyZSBhZGRpbmcgLTIvLS13ZWJraXQtdGVzdC1ydW5uZXIgc3dpdGNoLgorCisg ICAgICAgICogU2NyaXB0cy9ydW4tbGF1bmNoZXI6IE1pbmlCcm93c2VyIG5vdyBydW5zIGFzIGRl ZmF1bHQgd2l0aG91dCAtMiBzd2l0Y2guCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBt OgorICAgICAgICAoYnVpbHREeWxpYlBhdGhGb3JOYW1lKTogUmVtb3ZlIHJlZmVyZW5jZSB0byBs aWJld2Via2l0LnNvCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKTogU2Ny aXB0IHJ1bnMgV0tUUiBieSBkZWZhdWx0LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcGVy Zm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5OgorICAgICAgICAoUGVyZlRlc3RzUnVu bmVyLl9faW5pdF9fKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Vm bC5weToKKyAgICAgICAgKEVmbFBvcnQuX3NlYXJjaF9wYXRocyk6IFJlbW92ZSBlZmwtd2syIGZy b20gYmFzZWxpbmUgc2VhcmNoIHBhdGguCisgICAgICAgIChFZmxQb3J0LnNob3dfcmVzdWx0c19o dG1sX2ZpbGUpOiBSdW4gTWluaUJyb3dzZXIgYXMgcmVzdWx0IHZpZXdlci4KKwogMjAxNC0wNi0y MSAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIERp c2FibGUgZ2FtZXBhZCBmZWF0dXJlIG9uIEVGTCBhbmQgR1RLIHBvcnRzIGJ5IGRlZmF1bHQKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyIGIvVG9vbHMvU2NyaXB0cy9ydW4t bGF1bmNoZXIKaW5kZXggMmFkOTI4ZC4uYTg0MWIwNSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9ydW4tbGF1bmNoZXIKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIKQEAgLTQ1LDE0 ICs0NSw4IEBAIG15IEBqaGJ1aWxkV3JhcHBlcjsKIGNoZWNrRnJhbWV3b3JrcygpOwogCiAjIFNl dCBwYXRocyBhY2NvcmRpbmcgdG8gdGhlIGJ1aWxkIHN5c3RlbSB1c2VkCi1pZiAoaXNHdGsoKSkg eworaWYgKGlzR3RrKCkgfHwgaXNFZmwoKSkgewogICAgICRsYXVuY2hlclBhdGggPSBjYXRkaXIo JHByb2R1Y3REaXIsICJiaW4iLCAiTWluaUJyb3dzZXIiKTsKLX0gZWxzaWYgKGlzRWZsKCkpIHsK LSAgICBpZiAoaXNXSzIoKSkgewotICAgICAgICAkbGF1bmNoZXJQYXRoID0gY2F0ZGlyKCRwcm9k dWN0RGlyLCAiYmluIiwgIk1pbmlCcm93c2VyIik7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgJGxh dW5jaGVyUGF0aCA9IGNhdGRpcigkcHJvZHVjdERpciwgImJpbiIsICJFV2ViTGF1bmNoZXIiKTsK LSAgICB9CiB9CiAKICRsYXVuY2hlclBhdGggJiYgLXggJGxhdW5jaGVyUGF0aCBvciBkaWUgIkNh bid0IGZpbmQgdGhlIGxhdW5jaGVyIGNvbW1hbmQiOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGEzMjM3 MDcuLjg2MjA0ODggMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTgyOSwxMCArODI5LDcgQEAgc3ViIGJ1 aWx0RHlsaWJQYXRoRm9yTmFtZQogICAgICAgICByZXR1cm4gIk5vdEZvdW5kIjsKICAgICB9CiAg ICAgaWYgKGlzRWZsKCkpIHsKLSAgICAgICAgaWYgKGlzV0syKCkpIHsKLSAgICAgICAgICAgIHJl dHVybiAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL2xpYi9saWJld2Via2l0Mi5zbyI7Ci0gICAg ICAgIH0KLSAgICAgICAgcmV0dXJuICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvbGliL2xpYmV3 ZWJraXQuc28iOworICAgICAgICByZXR1cm4gIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci9saWIv bGliZXdlYmtpdDIuc28iOwogICAgIH0KICAgICBpZiAoaXNXaW5DRSgpKSB7CiAgICAgICAgIHJl dHVybiAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyLyRsaWJyYXJ5TmFtZSI7CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQppbmRleCBkMGFhNmRmLi44ODcxZDMyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTM4Miw4ICszODIs OCBAQCBkZWYgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwgb3B0aW9ucyk6CiAgICAgaWYg b3B0aW9ucy5ydW5fc2luZ2x5OgogICAgICAgICBvcHRpb25zLnZlcmJvc2UgPSBUcnVlCiAKLSAg ICAjIFRoZSBHVEsrIHBvcnQgb25seSBzdXBwb3J0IFdlYktpdDIgc28gaXQgYWx3YXlzIHVzZXMg V0tUUi4KLSAgICBpZiBvcHRpb25zLnBsYXRmb3JtID09ICJndGsiOgorICAgICMgVGhlIEdUSysg YW5kIEVGTCBwb3J0cyBvbmx5IHN1cHBvcnQgV2ViS2l0MiBzbyB0aGV5IGFsd2F5cyB1c2UgV0tU Ui4KKyAgICBpZiBvcHRpb25zLnBsYXRmb3JtID09ICJndGsiIG9yIG9wdGlvbnMucGxhdGZvcm0g PT0gImVmbCI6CiAgICAgICAgIG9wdGlvbnMud2Via2l0X3Rlc3RfcnVubmVyID0gVHJ1ZQogCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVy ZnRlc3RzcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0 cy9wZXJmdGVzdHNydW5uZXIucHkKaW5kZXggOGEwNTI0Ny4uMTExMmJmNyAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVz dHNydW5uZXIucHkKQEAgLTY2LDggKzY2LDggQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVj dCk6CiAgICAgICAgICAgICBzZWxmLl9ob3N0ID0gSG9zdCgpCiAgICAgICAgICAgICBzZWxmLl9w b3J0ID0gc2VsZi5faG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KHNlbGYuX29wdGlvbnMucGxhdGZvcm0s IHNlbGYuX29wdGlvbnMpCiAKLSAgICAgICAgIyBUaGUgR1RLKyBwb3J0IG9ubHkgc3VwcG9ydHMg V2ViS2l0Miwgc28gaXQgYWx3YXlzIHVzZXMgV0tUUi4KLSAgICAgICAgaWYgc2VsZi5fcG9ydC5u YW1lKCkuc3RhcnRzd2l0aCgiZ3RrIik6CisgICAgICAgICMgVGhlIEdUSysgYW5kIEVGTCBwb3J0 cyBvbmx5IHN1cHBvcnRzIFdlYktpdDIsIHNvIHRoZXkgYWx3YXlzIHVzZSBXS1RSLgorICAgICAg ICBpZiBzZWxmLl9wb3J0Lm5hbWUoKS5zdGFydHN3aXRoKCJndGsiKSBvciBzZWxmLl9wb3J0Lm5h bWUoKS5zdGFydHN3aXRoKCJlZmwiKToKICAgICAgICAgICAgIHNlbGYuX29wdGlvbnMud2Via2l0 X3Rlc3RfcnVubmVyID0gVHJ1ZQogCiAgICAgICAgIHNlbGYuX2hvc3QuaW5pdGlhbGl6ZV9zY20o KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2VmbC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9lZmwucHkKaW5kZXggNzk0YTY0Mi4uODRjNWZjYiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2VmbC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZWZsLnB5CkBAIC0xMTAsMTEgKzExMCw3IEBAIGNsYXNzIEVm bFBvcnQoUG9ydCk6CiAKICAgICBkZWYgX3NlYXJjaF9wYXRocyhzZWxmKToKICAgICAgICAgc2Vh cmNoX3BhdGhzID0gW10KLSAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9y dW5uZXInKToKLSAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5wb3J0X25hbWUg KyAnLXdrMicpCi0gICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCd3azInKQotICAgICAg ICBlbHNlOgotICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLnBvcnRfbmFtZSAr ICctd2sxJykKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgnd2syJykKICAgICAgICAgc2Vh cmNoX3BhdGhzLmFwcGVuZChzZWxmLnBvcnRfbmFtZSkKICAgICAgICAgcmV0dXJuIHNlYXJjaF9w YXRocwogCkBAIC0xMjksOCArMTI1LDYgQEAgY2xhc3MgRWZsUG9ydChQb3J0KToKICAgICAgICAg IyBGSVhNRTogV2Ugc2hvdWxkIGZpbmQgYSB3YXkgdG8gc2hhcmUgdGhpcyBpbXBsbWVudGF0aW9u IHdpdGggR3RrLAogICAgICAgICAjIG9yIHRlYWNoIHJ1bi1sYXVuY2hlciBob3cgdG8gY2FsbCBy dW4tc2FmYXJpIGFuZCBtb3ZlIHRoaXMgZG93biB0byBXZWJLaXRQb3J0LgogICAgICAgICBydW5f bGF1bmNoZXJfYXJncyA9IFsiZmlsZTovLyVzIiAlIHJlc3VsdHNfZmlsZW5hbWVdCi0gICAgICAg IGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6Ci0gICAgICAgICAgICBy dW5fbGF1bmNoZXJfYXJncy5hcHBlbmQoJy0yJykKICAgICAgICAgIyBGSVhNRTogb2xkLXJ1bi13 ZWJraXQtdGVzdHMgYWxzbyBhZGRlZCBbIi1ncmFwaGljc3N5c3RlbSIsICJyYXN0ZXIiLCAiLXN0 eWxlIiwgIndpbmRvd3MiXQogICAgICAgICAjIEZJWE1FOiBvbGQtcnVuLXdlYmtpdC10ZXN0cyBj b252ZXJ0ZWQgcmVzdWx0c19maWxlbmFtZSBwYXRoIGZvciBjeWd3aW4uCiAgICAgICAgIHNlbGYu X3J1bl9zY3JpcHQoInJ1bi1sYXVuY2hlciIsIHJ1bl9sYXVuY2hlcl9hcmdzKQo=