190328 2018-10-06 04:40:45 -0700 [WPE] Fix CMake rules in for TestWebKitAPIBase library building in developer mode 2019-02-21 08:22:20 -0800 1 1 1 Unclassified WebKit CMake WebKit Local Build Other Unspecified RESOLVED FIXED P2 Normal --- 1 psaavedra psaavedra achristensen aperez bugs-noreply commit-queue don.olmstead fujii loic.yhuel mcatanzaro saam sam ysuzuki oldest_to_newest 1466851 0 psaavedra 2018-10-06 04:40:45 -0700 This situation happens using a cross-compiled toolchain to build WPE with delevoper mode ON (API tests, layout tests, ...): . /Tools/Scripts/build-webkit --release --wpe --cmakeargs="-DBUILD_SHARED_LIBS=ON" --no-experimental-features The current cmake rules doesn't include required object files and librearies to get a succesful build: More especifically: Tools/wpe/backends/CMakeFiles/WPEToolingBackends.dir/HeadlessViewBackend.cpp.o Tools/wpe/backends/CMakeFiles/WPEToolingBackends.dir/ViewBackend.cpp.o and /home/igalia/psaavedra/toolchain_env/wandboard_mesa/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/lib/libWPEBackend-fdo-0.1.so This is the error: [2885/2972] Linking CXX shared library lib/libTestWebKitAPIBase.so FAILED: lib/libTestWebKitAPIBase.so ... Tools/TestWebKitAPI/CMakeFiles/TestWebKitAPIBase.dir/wpe/PlatformWebViewWPE.cpp.o: In function `TestWebKitAPI::PlatformWebView::initialize(OpaqueWKPageConfiguration const*)': /home/igalia/psaavedra/WebKit/WebKitBuild/Release/../../Tools/TestWebKitAPI/wpe/PlatformWebViewWPE.cpp:69: undefined reference to `WPEToolingBackends::HeadlessViewBackend::HeadlessViewBackend(unsigned int, unsigned int)' /home/igalia/psaavedra/WebKit/WebKitBuild/Release/../../Tools/TestWebKitAPI/wpe/PlatformWebViewWPE.cpp:70: undefined reference to `WPEToolingBackends::ViewBackend::backend() const' Tools/TestWebKitAPI/CMakeFiles/TestWebKitAPIBase.dir/wpe/PlatformWebViewWPE.cpp.o: In function `TestWebKitAPI::PlatformWebView::~PlatformWebView()': /home/igalia/psaavedra/WebKit/WebKitBuild/Release/../../Tools/TestWebKitAPI/wpe/PlatformWebViewWPE.cpp:64: undefined reference to `WPEToolingBackends::HeadlessViewBackend::~HeadlessViewBackend()' 1466852 1 351720 psaavedra 2018-10-06 04:43:07 -0700 Created attachment 351720 patch 1466954 2 351720 don.olmstead 2018-10-07 14:08:39 -0700 Comment on attachment 351720 patch View in context: https://bugs.webkit.org/attachment.cgi?id=351720&action=review Informal review. Just need to move these things into the right places. > Tools/TestWebKitAPI/CMakeLists.txt:288 > + if (PORT STREQUAL "WPE") > + find_package(WPEBackend-fdo REQUIRED) > + list(APPEND TestWebKitAPI_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES}) > + list(APPEND TestWebKitAPIBase_SOURCES > + ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp > + ${TOOLS_DIR}/wpe/backends/HeadlessViewBackend.cpp > + ) > + endif () There is a PlatformWPE.cmake file in this directory. This shouldn't be in the root CMake file. > Tools/TestWebKitAPI/CMakeLists.txt:299 > + if (PORT STREQUAL "WPE") > + target_link_libraries(TestWebKitAPIBase WPEBackend-fdo-0.1) > + endif () This also should be doable in the PlatformWPE.cmake file. 1469365 3 351720 mcatanzaro 2018-10-15 12:00:38 -0700 Comment on attachment 351720 patch Thanks! Please respond to Don's comments. 1471539 4 psaavedra 2018-10-23 04:15:20 -0700 (In reply to Don Olmstead from comment #2) > Comment on attachment 351720 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351720&action=review > > Informal review. Just need to move these things into the right places. > > > Tools/TestWebKitAPI/CMakeLists.txt:288 > > + if (PORT STREQUAL "WPE") > > + find_package(WPEBackend-fdo REQUIRED) > > + list(APPEND TestWebKitAPI_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES}) > > + list(APPEND TestWebKitAPIBase_SOURCES > > + ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp > > + ${TOOLS_DIR}/wpe/backends/HeadlessViewBackend.cpp > > + ) > > + endif () > > There is a PlatformWPE.cmake file in this directory. This shouldn't be in > the root CMake file. > > > Tools/TestWebKitAPI/CMakeLists.txt:299 > > + if (PORT STREQUAL "WPE") > > + target_link_libraries(TestWebKitAPIBase WPEBackend-fdo-0.1) > > + endif () > > This also should be doable in the PlatformWPE.cmake file. Hi, I'm sorry for the delay. I was out for 2 weeks. Thanks for the review. OK with your suggestions I will try to fix it ASAP. 1471783 5 353025 psaavedra 2018-10-24 00:10:19 -0700 Created attachment 353025 patch 1471833 6 353025 mcatanzaro 2018-10-24 08:04:15 -0700 Comment on attachment 353025 patch View in context: https://bugs.webkit.org/attachment.cgi?id=353025&action=review Looks good, just please change the casing of the variable names. I see the style is a bit inconsistent in this file, but generally we use this style: > Tools/TestWebKitAPI/CMakeLists.txt:88 > + set(test_webKit_api_base_LIBRARIES TestWebKitAPIBase_LIBRARIES > Tools/TestWebKitAPI/CMakeLists.txt:95 > + set(test_webKit_api_base_SOURCES TestWebKitAPIBase_SOURCES 1471839 7 psaavedra 2018-10-24 08:36:23 -0700 (In reply to Michael Catanzaro from comment #6) > Comment on attachment 353025 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=353025&action=review > > Looks good, just please change the casing of the variable names. I see the > style is a bit inconsistent in this file, but generally we use this style: > > > Tools/TestWebKitAPI/CMakeLists.txt:88 > > + set(test_webKit_api_base_LIBRARIES > > TestWebKitAPIBase_LIBRARIES > > > Tools/TestWebKitAPI/CMakeLists.txt:95 > > + set(test_webKit_api_base_SOURCES > > TestWebKitAPIBase_SOURCES Yes it is a bit inconsistent. I changed the style to match with the latest changes introduced in the file. 1471841 8 353036 psaavedra 2018-10-24 08:38:08 -0700 Created attachment 353036 patch 1471845 9 don.olmstead 2018-10-24 08:49:35 -0700 This LGTM now. Thank you for updating it I think its much better now. 1471874 10 353036 commit-queue 2018-10-24 10:44:28 -0700 Comment on attachment 353036 patch Clearing flags on attachment: 353036 Committed r237390: <https://trac.webkit.org/changeset/237390> 1471875 11 commit-queue 2018-10-24 10:44:30 -0700 All reviewed patches have been landed. Closing bug. 1508501 12 loic.yhuel 2019-02-21 06:56:37 -0800 Any reason why TestWebKitAPIBase_LIBRARIES is constructed with an explicit WPEBackend-fdo-0.1, instead of ${WPEBACKEND_FDO_LIBRARIES} ? If WPEBackend-fdo is compiled separately and installed in /usr/local, only the latter works. CMake sets WPEBACKEND_FDO_LIBRARIES=/usr/local/lib64/libWPEBackend-fdo-0.1.so, which allows a build with only : - PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig so cmake finds wpe/wpebackend-fdo - LD_LIBRARY_PATH=/usr/local/lib64 for gtkdoc (wpe-webextensions-0.1-scan seems to be built without rpath unlike the CMake-generated binaries) 1508515 13 aperez 2019-02-21 08:14:47 -0800 (In reply to Loïc Yhuel from comment #12) > Any reason why TestWebKitAPIBase_LIBRARIES is constructed with an explicit > WPEBackend-fdo-0.1, instead of ${WPEBACKEND_FDO_LIBRARIES} ? No reason. Moreover: I agree with you and I am convinced that currently this is wrong. I have just been hit by this while trying to make a 2.23.90 release tarball during the distcheck, and I have a local patch which I'll be landing momentarily. 1508522 14 aperez 2019-02-21 08:22:20 -0800 (In reply to Adrian Perez from comment #13) > (In reply to Loïc Yhuel from comment #12) > > Any reason why TestWebKitAPIBase_LIBRARIES is constructed with an explicit > > WPEBackend-fdo-0.1, instead of ${WPEBACKEND_FDO_LIBRARIES} ? > > No reason. Moreover: I agree with you and I am convinced that > currently this is wrong. > > I have just been hit by this while trying to make a 2.23.90 release > tarball during the distcheck, and I have a local patch which I'll be > landing momentarily. See bug #194901 for the patch =) 351720 2018-10-06 04:43:07 -0700 2018-10-24 00:10:05 -0700 patch bug-190328-20181006134305.patch text/plain 2057 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2ODkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTNmMGNhNjQxNWY2Y2Y4ZGUyYTZmMWExNGMxNmQ0NzUz ZjlmNGZhZC4uZjViYWE4ZTIwNWJkMmU3MDRlMjViN2RhOWQzYTI1YjkwYzE0NjUzNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDE4LTEwLTA2ICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtXUEVdIEZpeCBDTWFrZSBydWxlcyBpbiBmb3IgVGVzdFdlYktpdEFQSUJhc2Ug bGlicmFyeSBidWlsZGluZyBpbiBkZXZlbG9wZXIgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0 OgorCiAyMDE4LTEwLTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgUmVncmVzc2lvbihyMjM2ODYyKTogQ3Jhc2ggdW5kZXIgRE9NV2luZG93RXh0ZW5zaW9uOjp3 aWxsRGV0YWNoR2xvYmFsT2JqZWN0RnJvbUZyYW1lKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQgYi9Ub29scy9UZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMu dHh0CmluZGV4IDgzMWMxYmE5YzYwNDU3MmQ5YjllNTZhZDE0ZDZiMDU4MDMyOGFmN2QuLjUyNTJi ZmE2ZmYxMDFkMjdkNmViNWI2ZTE0ZTYzYmNlZjg3NTVmOTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9DTWFr ZUxpc3RzLnR4dApAQCAtMjcwLDcgKzI3MCw3IEBAIGlmIChDT01QSUxFUl9JU19HQ0NfT1JfQ0xB TkcpCiBlbmRpZiAoKQogCiBpZiAoRU5BQkxFX1dFQktJVCkKLSAgICBhZGRfbGlicmFyeShUZXN0 V2ViS2l0QVBJQmFzZQorICAgIHNldChUZXN0V2ViS2l0QVBJQmFzZV9TT1VSQ0VTCiAgICAgICAg ICR7dGVzdF9tYWluX1NPVVJDRVN9CiAgICAgICAgICR7d2Via2l0X2FwaV9oYXJuZXNzX1NPVVJD RVN9CiAgICAgICAgICR7VEVTVFdFQktJVEFQSV9ESVJ9L0phdmFTY3JpcHRUZXN0LmNwcApAQCAt Mjc4LDggKzI3OCwyNiBAQCBpZiAoRU5BQkxFX1dFQktJVCkKICAgICAgICAgJHtURVNUV0VCS0lU QVBJX0RJUn0vVGVzdHNDb250cm9sbGVyLmNwcAogICAgICkKIAorICAgIGlmIChQT1JUIFNUUkVR VUFMICJXUEUiKQorICAgICAgICBmaW5kX3BhY2thZ2UoV1BFQmFja2VuZC1mZG8gUkVRVUlSRUQp CisgICAgICAgIGxpc3QoQVBQRU5EIFRlc3RXZWJLaXRBUElfTElCUkFSSUVTICR7V1BFQkFDS0VO RF9GRE9fTElCUkFSSUVTfSkKKyAgICAgICAgbGlzdChBUFBFTkQgVGVzdFdlYktpdEFQSUJhc2Vf U09VUkNFUworICAgICAgICAgICAgJHtUT09MU19ESVJ9L3dwZS9iYWNrZW5kcy9WaWV3QmFja2Vu ZC5jcHAKKyAgICAgICAgICAgICR7VE9PTFNfRElSfS93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3 QmFja2VuZC5jcHAKKyAgICAgICAgKQorICAgIGVuZGlmICgpCisKKyAgICBhZGRfbGlicmFyeShU ZXN0V2ViS2l0QVBJQmFzZQorICAgICAgICAke3Rlc3RfbWFpbl9TT1VSQ0VTfQorICAgICAgICAk e1Rlc3RXZWJLaXRBUElCYXNlX1NPVVJDRVN9CisgICAgKQorCiAgICAgdGFyZ2V0X2xpbmtfbGli cmFyaWVzKFRlc3RXZWJLaXRBUElCYXNlIEphdmFTY3JpcHRDb3JlIFdURiBXZWJLaXQgZ3Rlc3Qp CiAKKyAgICBpZiAoUE9SVCBTVFJFUVVBTCAiV1BFIikKKyAgICAgICAgdGFyZ2V0X2xpbmtfbGli cmFyaWVzKFRlc3RXZWJLaXRBUElCYXNlIFdQRUJhY2tlbmQtZmRvLTAuMSkKKyAgICBlbmRpZiAo KQorCiAgICAgYWRkX2RlcGVuZGVuY2llcyhUZXN0V2ViS2l0QVBJQmFzZSBXZWJLaXQgJHtUZXN0 V2ViS2l0QVBJX0RFUEVOREVOQ0lFU30pCiAKICAgICBpZiAoQ09NUElMRVJfSVNfR0NDX09SX0NM QU5HKQo= 353025 2018-10-24 00:10:19 -0700 2018-10-24 08:37:54 -0700 patch bug-190328-20181024091018.patch text/plain 2990 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3Mzc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWM0YjIwZGZlMTY3YTNhNThiNGYwYmFjN2M2ODMzYzMw ODgwZDVjMC4uYWY1MjhmYmE2MmFhNDkxODZiNjY3Yjk1NDAxNjE2MTU3NzdkNDhmNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE4LTEwLTIzICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtXUEVdIEZpeCBDTWFrZSBydWxlcyBpbiBmb3IgVGVzdFdlYktpdEFQSUJhc2Ug bGlicmFyeSBidWlsZGluZyBpbiBkZXZlbG9wZXIgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0 OgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvUGxhdGZvcm1XUEUuY21ha2U6CisKIDIwMTgtMTAt MjMgIEp1c3RpbiBGYW4gIDxqdXN0aW5fZmFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViR1BV XSBSZW5hbWUgb2xkIEdQVSogaW1wbGVtZW50YXRpb24gZmlsZXMgdG8gR1BVTGVnYWN5KiBmb3Ig V2ViTWV0YWwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0CmluZGV4IDgzMWMxYmE5YzYwNDU3 MmQ5YjllNTZhZDE0ZDZiMDU4MDMyOGFmN2QuLjQxMzI4ZGM2ZDMwMTBlZWRkYzVkMjc1YmUzZTJl NTNmNGVjZDI2NzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50 eHQKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9DTWFrZUxpc3RzLnR4dApAQCAtODUsNiArODUs MTkgQEAgaWYgKEVOQUJMRV9XRUJLSVQpCiAgICAgICAgICR7VEVTVFdFQktJVEFQSV9ESVJ9L1Rl c3RzL1dlYktpdC9XS1VSTC5jcHAKICAgICApCiAKKyAgICBzZXQodGVzdF93ZWJLaXRfYXBpX2Jh c2VfTElCUkFSSUVTCisgICAgICAgIEphdmFTY3JpcHRDb3JlCisgICAgICAgIFdURgorICAgICAg ICBXZWJLaXQKKyAgICAgICAgZ3Rlc3QKKyAgICApCisKKyAgICBzZXQodGVzdF93ZWJLaXRfYXBp X2Jhc2VfU09VUkNFUworICAgICAgICAke1RFU1RXRUJLSVRBUElfRElSfS9KYXZhU2NyaXB0VGVz dC5jcHAKKyAgICAgICAgJHtURVNUV0VCS0lUQVBJX0RJUn0vUGxhdGZvcm1VdGlsaXRpZXMuY3Bw CisgICAgICAgICR7VEVTVFdFQktJVEFQSV9ESVJ9L1Rlc3RzQ29udHJvbGxlci5jcHAKKyAgICAp CisKICAgICBsaXN0KEFQUEVORCBUZXN0V2ViS2l0QVBJX0xJQlJBUklFUwogICAgICAgICBXZWJL aXQKICAgICApCkBAIC0yNzMsMTIgKzI4NiwxMCBAQCBpZiAoRU5BQkxFX1dFQktJVCkKICAgICBh ZGRfbGlicmFyeShUZXN0V2ViS2l0QVBJQmFzZQogICAgICAgICAke3Rlc3RfbWFpbl9TT1VSQ0VT fQogICAgICAgICAke3dlYmtpdF9hcGlfaGFybmVzc19TT1VSQ0VTfQotICAgICAgICAke1RFU1RX RUJLSVRBUElfRElSfS9KYXZhU2NyaXB0VGVzdC5jcHAKLSAgICAgICAgJHtURVNUV0VCS0lUQVBJ X0RJUn0vUGxhdGZvcm1VdGlsaXRpZXMuY3BwCi0gICAgICAgICR7VEVTVFdFQktJVEFQSV9ESVJ9 L1Rlc3RzQ29udHJvbGxlci5jcHAKKyAgICAgICAgJHt0ZXN0X3dlYktpdF9hcGlfYmFzZV9TT1VS Q0VTfQogICAgICkKIAotICAgIHRhcmdldF9saW5rX2xpYnJhcmllcyhUZXN0V2ViS2l0QVBJQmFz ZSBKYXZhU2NyaXB0Q29yZSBXVEYgV2ViS2l0IGd0ZXN0KQorICAgIHRhcmdldF9saW5rX2xpYnJh cmllcyhUZXN0V2ViS2l0QVBJQmFzZSAke3Rlc3Rfd2ViS2l0X2FwaV9iYXNlX0xJQlJBUklFU30p CiAKICAgICBhZGRfZGVwZW5kZW5jaWVzKFRlc3RXZWJLaXRBUElCYXNlIFdlYktpdCAke1Rlc3RX ZWJLaXRBUElfREVQRU5ERU5DSUVTfSkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9QbGF0Zm9ybVdQRS5jbWFrZSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XUEUuY21h a2UKaW5kZXggYmZlMGRkMzI2Yjg0MTUwZWRhNjY4N2QyODVlYzZjY2Q2NzQxMGIwZS4uYzQxNTll YWVkZTgwNmJhZGUyNjlmN2MyYTRjZTRlZTJiNWQxNTRlYSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFdlYktpdEFQSS9QbGF0Zm9ybVdQRS5jbWFrZQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Bs YXRmb3JtV1BFLmNtYWtlCkBAIC04OSw2ICs4OSwxNyBAQCBhZGRfdGVzdChUZXN0V2ViS2l0ICR7 VEVTVFdFQktJVEFQSV9SVU5USU1FX09VVFBVVF9ESVJFQ1RPUll9L1dlYktpdC9UZXN0V2ViS2l0 KQogc2V0X3Rlc3RzX3Byb3BlcnRpZXMoVGVzdFdlYktpdCBQUk9QRVJUSUVTIFRJTUVPVVQgNjAp CiBzZXRfdGFyZ2V0X3Byb3BlcnRpZXMoVGVzdFdlYktpdCBQUk9QRVJUSUVTIFJVTlRJTUVfT1VU UFVUX0RJUkVDVE9SWSAke1RFU1RXRUJLSVRBUElfUlVOVElNRV9PVVRQVVRfRElSRUNUT1JZfS9X ZWJLaXQpCiAKKyMgVGVzdFdlYktpdEFQSUJhc2UKK2xpc3QoQVBQRU5EIHRlc3Rfd2ViS2l0X2Fw aV9iYXNlX0xJQlJBUklFUworICAgIFdQRUJhY2tlbmQtZmRvLTAuMQorKQorZmluZF9wYWNrYWdl KFdQRUJhY2tlbmQtZmRvIFJFUVVJUkVEKQorbGlzdChBUFBFTkQgVGVzdFdlYktpdEFQSV9MSUJS QVJJRVMgJHtXUEVCQUNLRU5EX0ZET19MSUJSQVJJRVN9KQorbGlzdChBUFBFTkQgdGVzdF93ZWJL aXRfYXBpX2Jhc2VfU09VUkNFUworICAgICR7VE9PTFNfRElSfS93cGUvYmFja2VuZHMvVmlld0Jh Y2tlbmQuY3BwCisgICAgJHtUT09MU19ESVJ9L3dwZS9iYWNrZW5kcy9IZWFkbGVzc1ZpZXdCYWNr ZW5kLmNwcAorKQorCiAjIFRlc3RKU0MKIAogYWRkX2RlZmluaXRpb25zKC1EV0VCS0lUX1NSQ19E SVI9IiR7Q01BS0VfU09VUkNFX0RJUn0iKQo= 353036 2018-10-24 08:38:08 -0700 2018-10-24 10:44:28 -0700 patch bug-190328-20181024173807.patch text/plain 2972 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3Mzc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWM0YjIwZGZlMTY3YTNhNThiNGYwYmFjN2M2ODMzYzMw ODgwZDVjMC4uYWY1MjhmYmE2MmFhNDkxODZiNjY3Yjk1NDAxNjE2MTU3NzdkNDhmNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE4LTEwLTIzICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtXUEVdIEZpeCBDTWFrZSBydWxlcyBpbiBmb3IgVGVzdFdlYktpdEFQSUJhc2Ug bGlicmFyeSBidWlsZGluZyBpbiBkZXZlbG9wZXIgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0 OgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvUGxhdGZvcm1XUEUuY21ha2U6CisKIDIwMTgtMTAt MjMgIEp1c3RpbiBGYW4gIDxqdXN0aW5fZmFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViR1BV XSBSZW5hbWUgb2xkIEdQVSogaW1wbGVtZW50YXRpb24gZmlsZXMgdG8gR1BVTGVnYWN5KiBmb3Ig V2ViTWV0YWwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0CmluZGV4IDgzMWMxYmE5YzYwNDU3 MmQ5YjllNTZhZDE0ZDZiMDU4MDMyOGFmN2QuLjQ5ZjBhOGM0Y2M0NTgzMzIzMDNmZWExYjI4Mjkz NjAwZTVhZmY2ZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50 eHQKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9DTWFrZUxpc3RzLnR4dApAQCAtODUsNiArODUs MTkgQEAgaWYgKEVOQUJMRV9XRUJLSVQpCiAgICAgICAgICR7VEVTVFdFQktJVEFQSV9ESVJ9L1Rl c3RzL1dlYktpdC9XS1VSTC5jcHAKICAgICApCiAKKyAgICBzZXQoVGVzdFdlYktpdEFQSUJhc2Vf TElCUkFSSUVTCisgICAgICAgIEphdmFTY3JpcHRDb3JlCisgICAgICAgIFdURgorICAgICAgICBX ZWJLaXQKKyAgICAgICAgZ3Rlc3QKKyAgICApCisKKyAgICBzZXQoVGVzdFdlYktpdEFQSUJhc2Vf U09VUkNFUworICAgICAgICAke1RFU1RXRUJLSVRBUElfRElSfS9KYXZhU2NyaXB0VGVzdC5jcHAK KyAgICAgICAgJHtURVNUV0VCS0lUQVBJX0RJUn0vUGxhdGZvcm1VdGlsaXRpZXMuY3BwCisgICAg ICAgICR7VEVTVFdFQktJVEFQSV9ESVJ9L1Rlc3RzQ29udHJvbGxlci5jcHAKKyAgICApCisKICAg ICBsaXN0KEFQUEVORCBUZXN0V2ViS2l0QVBJX0xJQlJBUklFUwogICAgICAgICBXZWJLaXQKICAg ICApCkBAIC0yNzMsMTIgKzI4NiwxMCBAQCBpZiAoRU5BQkxFX1dFQktJVCkKICAgICBhZGRfbGli cmFyeShUZXN0V2ViS2l0QVBJQmFzZQogICAgICAgICAke3Rlc3RfbWFpbl9TT1VSQ0VTfQogICAg ICAgICAke3dlYmtpdF9hcGlfaGFybmVzc19TT1VSQ0VTfQotICAgICAgICAke1RFU1RXRUJLSVRB UElfRElSfS9KYXZhU2NyaXB0VGVzdC5jcHAKLSAgICAgICAgJHtURVNUV0VCS0lUQVBJX0RJUn0v UGxhdGZvcm1VdGlsaXRpZXMuY3BwCi0gICAgICAgICR7VEVTVFdFQktJVEFQSV9ESVJ9L1Rlc3Rz Q29udHJvbGxlci5jcHAKKyAgICAgICAgJHtUZXN0V2ViS2l0QVBJQmFzZV9TT1VSQ0VTfQogICAg ICkKIAotICAgIHRhcmdldF9saW5rX2xpYnJhcmllcyhUZXN0V2ViS2l0QVBJQmFzZSBKYXZhU2Ny aXB0Q29yZSBXVEYgV2ViS2l0IGd0ZXN0KQorICAgIHRhcmdldF9saW5rX2xpYnJhcmllcyhUZXN0 V2ViS2l0QVBJQmFzZSAke1Rlc3RXZWJLaXRBUElCYXNlX0xJQlJBUklFU30pCiAKICAgICBhZGRf ZGVwZW5kZW5jaWVzKFRlc3RXZWJLaXRBUElCYXNlIFdlYktpdCAke1Rlc3RXZWJLaXRBUElfREVQ RU5ERU5DSUVTfSkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVdQ RS5jbWFrZSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XUEUuY21ha2UKaW5kZXggYmZl MGRkMzI2Yjg0MTUwZWRhNjY4N2QyODVlYzZjY2Q2NzQxMGIwZS4uNWZiZmI0MDk0Nzg2OTk4MDgz YzBmMDQxZGYyMTJhYTgxNzZmZWY0YyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9Q bGF0Zm9ybVdQRS5jbWFrZQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtV1BFLmNt YWtlCkBAIC04OSw2ICs4OSwxNyBAQCBhZGRfdGVzdChUZXN0V2ViS2l0ICR7VEVTVFdFQktJVEFQ SV9SVU5USU1FX09VVFBVVF9ESVJFQ1RPUll9L1dlYktpdC9UZXN0V2ViS2l0KQogc2V0X3Rlc3Rz X3Byb3BlcnRpZXMoVGVzdFdlYktpdCBQUk9QRVJUSUVTIFRJTUVPVVQgNjApCiBzZXRfdGFyZ2V0 X3Byb3BlcnRpZXMoVGVzdFdlYktpdCBQUk9QRVJUSUVTIFJVTlRJTUVfT1VUUFVUX0RJUkVDVE9S WSAke1RFU1RXRUJLSVRBUElfUlVOVElNRV9PVVRQVVRfRElSRUNUT1JZfS9XZWJLaXQpCiAKKyMg VGVzdFdlYktpdEFQSUJhc2UKK2xpc3QoQVBQRU5EIFRlc3RXZWJLaXRBUElCYXNlX0xJQlJBUklF UworICAgIFdQRUJhY2tlbmQtZmRvLTAuMQorKQorZmluZF9wYWNrYWdlKFdQRUJhY2tlbmQtZmRv IFJFUVVJUkVEKQorbGlzdChBUFBFTkQgVGVzdFdlYktpdEFQSV9MSUJSQVJJRVMgJHtXUEVCQUNL RU5EX0ZET19MSUJSQVJJRVN9KQorbGlzdChBUFBFTkQgVGVzdFdlYktpdEFQSUJhc2VfU09VUkNF UworICAgICR7VE9PTFNfRElSfS93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuY3BwCisgICAgJHtU T09MU19ESVJ9L3dwZS9iYWNrZW5kcy9IZWFkbGVzc1ZpZXdCYWNrZW5kLmNwcAorKQorCiAjIFRl c3RKU0MKIAogYWRkX2RlZmluaXRpb25zKC1EV0VCS0lUX1NSQ19ESVI9IiR7Q01BS0VfU09VUkNF X0RJUn0iKQo=