218223 2020-10-26 22:33:24 -0700 Update generate_xcfilelists to accommodate paths with symlinks 2020-10-27 12:33:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin ews-watchlist glenn jbedard timothy webkit-bug-importer oldest_to_newest 1701764 0 krollin 2020-10-26 22:33:24 -0700 There are cases where file system paths are compared against each other, and where the comparisons are failing because one or the other (or both) make use of symlinks, causing paths that refer to the same location to fail to compare correctly. Address this by resolving path components that are symlinks. 1701765 1 webkit-bug-importer 2020-10-26 22:33:41 -0700 <rdar://problem/70709808> 1701766 2 412392 krollin 2020-10-26 22:36:42 -0700 Created attachment 412392 Patch 1701948 3 timothy 2020-10-27 10:18:50 -0700 This fixed my issue, thanks! 1702029 4 ews-feeder 2020-10-27 12:33:18 -0700 Committed r269063: <https://trac.webkit.org/changeset/269063> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412392. 412392 2020-10-26 22:36:42 -0700 2020-10-27 12:33:18 -0700 Patch bug-218223-20201026223640.patch text/plain 6168 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4OTk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzcxM2IyMzQwOWJkMTE1MDJhMmE3ZTk2ZmQ1ZGJmODll YWU3MTM0YS4uMGViYTk2NTRhYjRjOTVjYjRkMDliYjNlZWZmOGE4MTQwOWMyNzI1NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTEwLTI2ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAg ICAgICBVcGRhdGUgZ2VuZXJhdGVfeGNmaWxlbGlzdHMgdG8gYWNjb21tb2RhdGUgcGF0aHMgd2l0 aCBzeW1saW5rcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjE4MjIzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MDcwOTgwOD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBhcmUgY2FzZXMgd2hl cmUgZmlsZSBzeXN0ZW0gcGF0aHMgYXJlIGNvbXBhcmVkIGFnYWluc3QgZWFjaAorICAgICAgICBv dGhlciwgYW5kIHdoZXJlIHRoZSBjb21wYXJpc29ucyBhcmUgZmFpbGluZyBiZWNhdXNlIG9uZSBv ciB0aGUgb3RoZXIKKyAgICAgICAgKG9yIGJvdGgpIG1ha2UgdXNlIG9mIHN5bWxpbmtzLCBjYXVz aW5nIHBhdGhzIHRoYXQgcmVmZXIgdG8gdGhlIHNhbWUKKyAgICAgICAgbG9jYXRpb24gdG8gZmFp bCB0byBjb21wYXJlIGNvcnJlY3RseS4gQWRkcmVzcyB0aGlzIGJ5IHJlc29sdmluZyBwYXRoCisg ICAgICAgIGNvbXBvbmVudHMgdGhhdCBhcmUgc3ltbGlua3MuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2dlbmVyYXRlX3hjZmlsZWxpc3RzX2xpYi9nZW5lcmF0b3JzLnB5OgorICAgICAg ICAoQmFzZUdlbmVyYXRvcik6CisgICAgICAgIChCYXNlR2VuZXJhdG9yLl91bmV4cGFuZCk6Cisg ICAgICAgIChCYXNlR2VuZXJhdG9yLl91bmV4cGFuZC5fZXhwYW5kX2lmX2Ficyk6CisgICAgICAg IChCYXNlR2VuZXJhdG9yLl91bmV4cGFuZC5fdmFyaWF0aW9ucyk6CisgICAgICAgIChCYXNlR2Vu ZXJhdG9yLl91bmV4cGFuZC5fdmFyaWF0aW9ucy5fZ2VuKToKKyAgICAgICAgKEJhc2VHZW5lcmF0 b3IuX3VuZXhwYW5kLl90cnlfdW5leHBhbmQpOgorICAgICAgICAoQmFzZUdlbmVyYXRvci5fdW5l eHBhbmQuX2RvX3VuZXhwYW5kKToKKwogMjAyMC0xMC0yNiAgQWFrYXNoIEphaW4gIDxhYWthc2hf amFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgc2tpcHBpbmcgc3BlY2lmaWMgZmlsZXMg ZnJvbSByZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9nZW5lcmF0ZV94Y2ZpbGVsaXN0c19saWIvZ2VuZXJhdG9ycy5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvZ2VuZXJhdGVfeGNmaWxlbGlzdHNfbGliL2dlbmVyYXRvcnMu cHkKaW5kZXggMTZjYTY3NzYyY2E3OWYyZmFmOGNlZTg5YzBlYTc2YjM1Y2M4ZTRlMi4uMDVmNGNm ZDAzNmNhMjIwM2U4MDIyYzQ4ODA2MTBmM2Q3NzU0ZTlkNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9nZW5lcmF0ZV94Y2ZpbGVsaXN0c19saWIvZ2VuZXJhdG9ycy5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2dlbmVyYXRlX3hjZmlsZWxpc3RzX2xpYi9nZW5lcmF0 b3JzLnB5CkBAIC01NSw2ICs1NSw3IEBACiAKIGZyb20gX19mdXR1cmVfXyBpbXBvcnQgcHJpbnRf ZnVuY3Rpb24KIAoraW1wb3J0IGl0ZXJ0b29scwogaW1wb3J0IG9zCiBpbXBvcnQgcGlja2xlCiBp bXBvcnQgcmUKQEAgLTM0OSwxMyArMzUwLDg0IEBAIGNsYXNzIEJhc2VHZW5lcmF0b3Iob2JqZWN0 KToKICAgICAjIFV0aWxpdHkgZm9yIHBvc3QtcHJvY2Vzc2luZyB0aGUgaW5pdGlhbCAueGNmaWxl bGlzdCBjb250ZW50LiBVc2VkIHRvCiAgICAgIyByZXBsYWNlIGZpbGUgcGF0aCBzZWdtZW50cyB3 aXRoIHRoZSB2YXJpYWJsZXMgdGhhdCByZXByZXNlbnQgdGhvc2UgcGF0aAogICAgICMgc2VnbWVu dHMuCisgICAgIworICAgICMgVGhlIHdheSB3ZSBhcHByb2FjaCB0aGlzIGdldHMgYSBsaXR0bGUg aW52b2x2ZWQuIFRoZSBzdHJhaWdodGZvcndhcmQKKyAgICAjIGFwcHJvYWNoIHdvdWxkIGJlIHRv IGZldGNoIHRoZSB2YWx1ZSAoYSBmaWxlIHN5c3RlbSBwYXRoKSBvZiB0aGUgZ2l2ZW4KKyAgICAj IGVudmlyb25tZW50IHZhcmlhYmxlLCBhbmQgdGhlbiByZXBsYWNlIHRoYXQgcGF0aCB3aXRoIHRo ZSB2YXJpYWJsZSBuYW1lCisgICAgIyBpbiBlYWNoIG9mIHRoZSBnaXZlbiBsaW5lcyBpZiB0aGUg cGFydGljdWxhciBsaW5lIGlzIHByZWZpeGVkIHdpdGggdGhhdAorICAgICMgcGF0aC4gU28sIGZv ciBpbnN0YW5jZSwgY29udmVydGluZzoKKyAgICAjCisgICAgIyAgIC9Wb2x1bWVzL0RhdGEvZGV2 L3dlYmtpdC9PcGVuU291cmNlL1dlYktpdEJ1aWxkL0RlYnVnL0Rlcml2ZWRTb3VyY2VzL0phdmFT Y3JpcHRDb3JlL0Vycm9yUHJvdG90eXBlLmx1dC5oCisgICAgIworICAgICMgdG86CisgICAgIwor ICAgICMgICAkKEJVSUxUX1BST0RVQ1RTX0RJUikvRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENv cmUvRXJyb3JQcm90b3R5cGUubHV0LmgKKyAgICAjCisgICAgIyBIb3dldmVyLCB0aGVyZSBhcmUg aXNzdWVzIHdpdGggc3ltbGlua3MgbWVzc2luZyB1cCB0aGF0IHByZWZpeCBtYXRjaGluZy4KKyAg ICAjIEl0J3MgcG9zc2libGUgZm9yIHRoZSBlbnRyaWVzIGluICJsaW5lcyIgdG8gY29udGFpbiBm dWxseSByZXNvbHZlZCBwYXRocywKKyAgICAjIHdoaWxlIHRoZSB2YXJpYWJsZSBjb250YWlucyBh IHBhdGggdGhhdCBoYXMgY29tcG9uZW50cyB0aGF0IGFyZSBzeW1saW5rcy4KKyAgICAjIFRoZXNl IHN5bWxpbmtzIG5lZWQgdG8gYmUgcmVzb2x2ZWQgYmVmb3JlIHRoZSBwcmVmaXggbWF0Y2hpbmcg Y2FuIGJlCisgICAgIyBwZXJmb3JtZWQuIFRoYXQgaXMsIGlmIEJVSUxUX1BST0RVQ1RTX0RJUiBj b250YWluZWQKKyAgICAjICIvVXNlcnMvTWUvd2Via2l0L09wZW5Tb3VyY2UvV2ViS2l0QnVpbGQv RGVidWciLCB3ZSB3b3VsZCBuZWVkIHRvIGZpcnN0CisgICAgIyByZXNvbHZlIHRoYXQgdG8gIi9W b2x1bWVzL0RhdGEvZGV2L3dlYmtpdC9PcGVuU291cmNlL1dlYktpdEJ1aWxkL0RlYnVnIgorICAg ICMgYmVmb3JlIHRyeWluZyB0byByZXBsYWNlIGl0IGluIGFueSBsaW5lcyB0aGF0IGFyZSBwcmVm aXhlZCB3aXRoIGl0LgorICAgICMKKyAgICAjIEZ1cnRoZXIsIGl0J3Mgbm90IGFsd2F5cyB0aGUg Y2FzZSB0aGF0IHRoZSBlbnRyaWVzIGluICJsaW5lcyIgY29udGFpbgorICAgICMgZnVsbHktcmVz b2x2ZWQgcGF0aHMuIEZvciBpbnN0YW5jZSwgc29tZSBvZiB0aGVtIG1heSByZWZlciB0byBzb21l dGhpbmcKKyAgICAjIGxpa2UgPGZyYW1ld29yaz4uUHJpdmF0ZUhlYWRlcnMsIHdoaWNoIG1heSBi ZSBhIHN5bWxpbmsgaW4gYSBub24tc2hhbGxvdworICAgICMgZnJhbWV3b3JrLiBJZiBhbiBpbmNv bWluZyByZXBsYWNlbWVudCB2YWx1ZSByZWZlcnJlZCB0byB0aGF0CisgICAgIyBQcml2YXRlSGVh ZGVycyBkaXJlY3RvcnksIGFmdGVyIGJlaW5nIHJlc29sdmVkLCBpdCBub3cgcmVmZXJzIHRvIHRo ZQorICAgICMgdmVyc2lvbmVkIGxvY2F0aW9uICh0aGF0IGlzLCA8ZnJhbWV3b3JrPi9WZXJzaW9u cy9BL1ByaXZhdGVIZWFkZXJzKSwgYW5kCisgICAgIyB3aWxsIG5vIGxvbmdlciBtYXRjaCBhIHBh dGggZXhwcmVzc2VkIGluIHRlcm1zIG9mCisgICAgIyA8ZnJhbWV3b3JrPi5Qcml2YXRlSGVhZGVy cy4gVGhpcyBtZWFucyB0aGF0IGVhY2ggZW50cnkgaW4gImxpbmVzIiBhbHNvCisgICAgIyBuZWVk cyB0byBiZSBmdWxseSByZXNvbHZlZC4KKyAgICAjCisgICAgIyBBbmQsIHlldCwgdGhlcmUncyBz dGlsbCBhIHdyaW5rbGUuIFNvbWV0aW1lcyB3ZSAqZG9uJ3QqIHdhbnQgdG8gZXhwYW5kCisgICAg IyB0aGUgcGF0aHMgaW4gImxpbmVzIi4gQW4gZXhhbXBsZSBvZiB0aGlzIG9jY3VycyBpbiBEdW1w UmVuZGVyVHJlZSwgd2hlcmUKKyAgICAjIHdlIHdhbnRlZCB0byBjb252ZXJ0OgorICAgICMKKyAg ICAjICAgL1ZvbHVtZXMvRGF0YS9kZXYvd2Via2l0L09wZW5Tb3VyY2UvVG9vbHMvRHVtcFJlbmRl clRyZWUvLi4vVGVzdFJ1bm5lclNoYXJlZC9VSVNjcmlwdENvbnRleHQvQmluZGluZ3MvVUlTY3Jp cHRDb250cm9sbGVyLmlkbAorICAgICMKKyAgICAjIHRvOgorICAgICMKKyAgICAjICAgJChQUk9K RUNUX0RJUikvLi4vVGVzdFJ1bm5lclNoYXJlZC9VSVNjcmlwdENvbnRleHQvQmluZGluZ3MvVUlT Y3JpcHRDb250cm9sbGVyLmlkbAorICAgICMKKyAgICAjIElmIHdlIG1lcmVseSByZXNvbHZlZCB0 aGUgcGF0aCwgaXQgd291bGQgaGF2ZSBiZWVuIHR1cm5lZCBpbnRvOgorICAgICMKKyAgICAjICAg L1ZvbHVtZXMvRGF0YS9kZXYvd2Via2l0L09wZW5Tb3VyY2UvVG9vbHMvVGVzdFJ1bm5lclNoYXJl ZC9VSVNjcmlwdENvbnRleHQvQmluZGluZ3MvVUlTY3JpcHRDb250cm9sbGVyLmlkbAorICAgICMK KyAgICAjIGFuZCBpdCB3b3VsZCBubyBsb25nZXIgaGF2ZSBhIHByZWZpeCB0aGF0IG1hdGNoZWQg JFBST0pFQ1RfRElSLiBTbyB3ZQorICAgICMgYWRvcHQgYW4gYXBwcm9hY2ggd2hlcmUgd2UnbGwg dHJ5IGJvdGggdGhlIHJhdyBhbmQgcmVzb2x2ZWQgcGF0aHMgaW4gdGhlCisgICAgIyBnaXZlbiBl bnZpcm9ubWVudCB2YXJpYWJsZSwgYW5kIHRoZSByYXcgYW5kIHJlc29sdmVkIHBhdGhzIGluIGVh Y2ggb2YgdGhlCisgICAgIyBlbnRyaWVzIGluICJsaW5lcyIuCiAKICAgICBAdXRpbC5Mb2dFbnRy eUV4aXQKICAgICBkZWYgX3VuZXhwYW5kKHNlbGYsIGxpbmVzLCB2YXJpYWJsZV9uYW1lKToKLSAg ICAgICAgdG9fcmVwbGFjZSA9IHNlbGYuX2dldGVudih2YXJpYWJsZV9uYW1lKQotICAgICAgICBp ZiBub3QgdG9fcmVwbGFjZToKKyAgICAgICAgcHJlZml4ID0gc2VsZi5fZ2V0ZW52KHZhcmlhYmxl X25hbWUpCisgICAgICAgIGlmIG5vdCBwcmVmaXg6CiAgICAgICAgICAgICByZXR1cm4gbGluZXMK LSAgICAgICAgcmV0dXJuIHNlbGYuX3JlcGxhY2UobGluZXMsICJee30vIi5mb3JtYXQodG9fcmVw bGFjZSksICIkKHt9KS8iLmZvcm1hdCh2YXJpYWJsZV9uYW1lKSkKKworICAgICAgICBkZWYgX2V4 cGFuZF9pZl9hYnMocGF0aCk6CisgICAgICAgICAgICByZXR1cm4gb3MucGF0aC5yZWFscGF0aChw YXRoKSBpZiBvcy5wYXRoLmlzYWJzKHBhdGgpIGVsc2UgcGF0aAorCisgICAgICAgIGRlZiBfdmFy aWF0aW9ucyhwYXRoKToKKyAgICAgICAgICAgIGRlZiBfZ2VuKHBhdGgpOgorICAgICAgICAgICAg ICAgIHlpZWxkIHBhdGgKKyAgICAgICAgICAgICAgICB5aWVsZCBfZXhwYW5kX2lmX2FicyhwYXRo KQorICAgICAgICAgICAgcmV0dXJuICh4IGZvciB4IGluIF9nZW4ocGF0aCkpCisKKyAgICAgICAg ZGVmIF90cnlfdW5leHBhbmQocHJlZml4LCBsaW5lKToKKyAgICAgICAgICAgIG5ld19saW5lID0g cmUuc3ViKCJee30vIi5mb3JtYXQocHJlZml4KSwgIiQoe30pLyIuZm9ybWF0KHZhcmlhYmxlX25h bWUpLCBsaW5lKQorICAgICAgICAgICAgcmV0dXJuIG5ld19saW5lICE9IGxpbmUsIG5ld19saW5l CisKKyAgICAgICAgZGVmIF9kb191bmV4cGFuZChsaW5lKToKKyAgICAgICAgICAgIGZvciBhX3By ZWZpeCwgYV9saW5lIGluIGl0ZXJ0b29scy5wcm9kdWN0KF92YXJpYXRpb25zKHByZWZpeCksIF92 YXJpYXRpb25zKGxpbmUpKToKKyAgICAgICAgICAgICAgICBjaGFuZ2VkLCBuZXdfbGluZSA9IF90 cnlfdW5leHBhbmQoYV9wcmVmaXgsIGFfbGluZSkKKyAgICAgICAgICAgICAgICBpZiBjaGFuZ2Vk OgorICAgICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgcmV0dXJuIG5ld19saW5l IGlmIGNoYW5nZWQgZWxzZSBsaW5lCisKKyAgICAgICAgcmV0dXJuIHNldChfZG9fdW5leHBhbmQo bGluZSkgZm9yIGxpbmUgaW4gbGluZXMpCiAKICAgICAjIEdpdmVuIGEgc291cmNlIGZpbGUgd2l0 aCBuZXcgLnhjZmlsZWxpc3QgY29udGVudCBhbmQgYSBkZXN0IGZpbGUgdGhhdAogICAgICMgY29u dGFpbnMgdGhlIG9yaWdpbmFsL3ByZXZpb3VzIC54Y2ZpbGVsaXN0IGNvbnRlbnQgKHRoYXQgaXMs IGxpa2VseSB0aGUK