149753 2015-10-02 10:09:40 -0700 LayoutTestRelay is not built and archived when building for iOS Simulator 2015-10-04 15:31:56 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build iPhone / iPad All RESOLVED FIXED P2 Normal --- 1 dbates dbates ap ddkilzer lforschler simon.fraser oldest_to_newest 1130250 0 dbates 2015-10-02 10:09:40 -0700 The iOS Simulator testers fail to run layout tests with error output of the form: [[ 08:16:02.167 16586 Using port 'ios-simulator' 08:16:02.167 16586 Test configuration: <, x86_64, release> 08:16:02.167 16586 Placing test results in /Volumes/Data/slave/ios-simulator-9-release-tests-wk1/build/layout-test-results 08:16:02.167 16586 Baseline search path: ios-simulator-wk1 -> ios-simulator -> generic 08:16:02.167 16586 Using Release build 08:16:02.167 16586 Pixel tests disabled 08:16:02.167 16586 Regular timeout: 30000, slow test timeout: 150000 08:16:02.350 16586 "perl Tools/Scripts/webkit-build-directory --configuration --release --ios-simulator" took 0.18s 08:16:02.528 16586 "perl Tools/Scripts/webkit-build-directory --configuration --release --mac" took 0.18s 08:16:02.533 16586 "xcrun --sdk iphonesimulator --show-sdk-version" took 0.00s 08:16:02.661 16586 "xcrun simctl list" took 0.13s 08:16:02.711 16586 "xcrun simctl list" took 0.05s 08:16:02.711 16586 Command line: /Volumes/Data/slave/ios-simulator-9-release-tests-wk1/build/WebKitBuild/Release/LayoutTestRelay -runtime com.apple.CoreSimulator.SimRuntime.iOS-9-0 -deviceType com.apple.CoreSimulator.SimDeviceType.iPhone-5s -suffix 0 -productDir /Volumes/Data/slave/ios-simulator-9-release-tests-wk1/build/WebKitBuild/Release-iphonesimulator -app /Volumes/Data/slave/ios-simulator-9-release-tests-wk1/build/WebKitBuild/Release-iphonesimulator/DumpRenderTree.app -- - 08:16:02.711 16586 08:16:02.711 16586 Collecting tests ... 08:16:07.288 16586 Parsing expectations ... 08:16:22.831 16586 Found 41293 tests; running 35554, skipping 5739. 08:16:22.831 16586 Checking build ... 08:16:22.847 16586 LayoutTestRelay was not found at /Volumes/Data/slave/ios-simulator-9-release-tests-wk1/build/WebKitBuild/Release/LayoutTestRelay 08:16:22.847 16586 Build check failed 08:16:22.848 16586 Testing completed, Exit status: -1 ]] <https://build.webkit.org/builders/Apple%20iOS%209%20Simulator%20Release%20WK1%20%28Tests%29/builds/44/steps/layout-test/logs/stdio> As implied by the error message, we need to build and include the Mac tool LayoutTestRelay in the built product archive produced by the iOS Simulator builder. 1130253 1 262340 dbates 2015-10-02 10:37:56 -0700 Created attachment 262340 Patch 1130282 2 dbates 2015-10-02 12:43:38 -0700 Committed r190515: <http://trac.webkit.org/changeset/190515> 1130533 3 dbates 2015-10-04 15:31:56 -0700 Committed build fixes in <http://trac.webkit.org/changeset/190519> and <http://trac.webkit.org/changeset/190554>. 262340 2015-10-02 10:37:56 -0700 2015-10-02 12:36:08 -0700 Patch bug-149753-20151002103730.patch text/plain 10134 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNDUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZThhZWNlYjU2NGMyOTE0MDRhYWI4MjE0OTYwZDY4Njdk ZTFmZjhmMC4uYTdjZjQ3NjFiNDBlNGFlMWJhODU0MzQ0ZTBjOWM0ODE3OTQwY2M4MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDE1LTEwLTAyICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBMYXlvdXRUZXN0UmVsYXkgaXMgbm90IGJ1aWx0IGFuZCBhcmNoaXZlZCB3aGVuIGJ1aWxk aW5nIGZvciBpT1MgU2ltdWxhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDk3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUb3dhcmRzIHJ1bm5pbmcgbGF5b3V0IHRlc3RzIG9uIHRoZSBpT1MgU2lt dWxhdG9yIHRlc3QgYm90cywgd2UgbmVlZCB0byB0ZWFjaCBzY3JpcHRzIGJ1aWxkLXdlYmtpdAor ICAgICAgICBhbmQgYnVpbHQtcHJvZHVjdC1hcmNoaXZlIHRvIGJ1aWxkIHRoZSBNYWMgdG9vbCBM YXlvdXRUZXN0UmVsYXkgYW5kIGluY2x1ZGUgdGhpcyB0b29sIGluIHRoZSBidWlsdAorICAgICAg ICBwcm9kdWN0IGFyY2hpdmUgd2hlbiBidWlsZGluZyBmb3IgaU9TIFNpbXVsYXRvciwgcmVzcGVj dGl2ZWx5LgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNo aXZlOgorICAgICAgICAobWFpbik6IFBhc3MgdGhlIGZ1bGwgcGxhdGZvcm0gbmFtZSAob3B0aW9u cy5wbGF0Zm9ybSkgdG8gYXJjaGl2ZUJ1aWx0UHJvZHVjdCgpIHNvIHRoYXQgaXQgY2FuCisgICAg ICAgIGRpZmZlcmVudGlhdGUgYmV0d2VlbiBpT1MgZGV2aWNlIGFuZCBpT1MgU2ltdWxhdG9yIHBs YXRmb3Jtcy4KKyAgICAgICAgKHdlYmtpdEJ1aWxkRGlyZWN0b3J5Rm9yQ29uZmlndXJhdGlvbkFu ZFBsYXRmb3JtKTogRXh0cmFjdGVkIGxvZ2ljIHRvIHJ1biB0aGUgc2NyaXB0IHdlYmtpdC1idWls ZC1kaXJlY3RvcnkKKyAgICAgICAgZnJvbSBkZXRlcm1pbmVXZWJLaXRCdWlsZERpcmVjdG9yaWVz KCkgaW50byB0aGlzIGZ1bmN0aW9uIHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQgYnkgYm90aAorICAg ICAgICBkZXRlcm1pbmVXZWJLaXRCdWlsZERpcmVjdG9yaWVzKCkgYW5kIGFyY2hpdmVCdWlsdFBy b2R1Y3QoKS4KKyAgICAgICAgKGRldGVybWluZVdlYktpdEJ1aWxkRGlyZWN0b3JpZXMpOiBNb3Zl ZCBsb2dpYyB0byBleGVjdXRlIHRoZSBzY3JpcHQgd2Via2l0LWJ1aWxkLWRpcmVjdG9yeSBmcm9t IGhlcmUgdG8KKyAgICAgICAgd2Via2l0QnVpbGREaXJlY3RvcnlGb3JDb25maWd1cmF0aW9uQW5k UGxhdGZvcm0oKS4KKyAgICAgICAgKGNyZWF0ZVppcCk6IEFkZGVkIHBhcmFtZXRlciBlbWJlZFBh cmVudERpcmVjdG9yeU5hbWVPbkRhcndpbiAoZGVmYXVsdHMgdG8gRmFsc2UpIHRvIHNwZWNpZnkg d2hldGhlcgorICAgICAgICB3ZSBzaG91bGQgY2FsbCBkaXR0bygxKSB3aXRoIC0ta2VlcFBhcmVu dCB0byBlbWJlZCB0aGUgcGFyZW50IGRpcmVjdG9yeSBuYW1lIGluIHRoZSB6aXAgYXJjaGl2ZS4g VGhpcworICAgICAgICBhcmd1bWVudCBpcyBvbmx5IGFwcGxpY2FibGUgd2hlbiBidWlsZGluZyBv biBEYXJ3aW4uIFdlIG9ubHkgcGFzcyBlbWJlZFBhcmVudERpcmVjdG9yeU5hbWVPbkRhcndpbj1U cnVlCisgICAgICAgIHdoZW4gbWFraW5nIGFuIGFyY2hpdmUgZm9yIGEgTWFjIG9yIGlPUyBkZXZp Y2UgYnVpbGQuIEZvciBpT1MgU2ltdWxhdG9yIGJ1aWxkcyB3ZSBhcmNoaXZlIHR3byBkaXJlY3Rv cmllcworICAgICAgICBhbmQgd2UgZG8gbm90IHdhbnQgdG8ga2VlcCB0aGUgcGFyZW50IGRpcmVj dG9yeSBiZWNhdXNlIGl0IGlzIGEgcGxhY2Vob2xkZXIgZGlyZWN0b3J5IHVzZWQgYXMgYSB3b3Jr YXJvdW5kCisgICAgICAgIGZvciB0aGUgbGltaXRhdGlvbiB0aGF0IGRpdHRvKDEpIGNhbiBvbmx5 IGFjY2VwdCBhIHNpbmdsZSBkaXJlY3RvcnkgdG8gYXJjaGl2ZSBvbiBpdHMgY29tbWFuZCBsaW5l LgorICAgICAgICAoYXJjaGl2ZUJ1aWx0UHJvZHVjdCk6IE1vZGlmaWVkIHRvIHRha2UgdGhlIGZ1 bGwgcGxhdGZvcm0gbmFtZSBhcyBhbiBhcmd1bWVudC4gQWRkZWQgbG9naWMgZm9yIGlPUy4KKyAg ICAgICAgRm9yIGlPUyBkZXZpY2UgYnVpbGRzIHdlIHVzZSB0aGUgc2FtZSBsb2dpYyBhcyBmb3Ig YSBNYWMgYnVpbGQgYW5kIGFyY2hpdmUgdGhlIGNvbmZpZ3VyYXRpb24tc3BlY2lmaWMKKyAgICAg ICAgYnVpbGQgZGlyZWN0b3J5LiBGb3IgaU9TIFNpbXVsYXRvciBidWlsZHMgd2UgYXJjaGl2ZSB0 aGUgY29uZmlndXJhdGlvbi1zcGVjaWZpYyBpT1MgYnVpbGQgZGlyZWN0b3J5LAorICAgICAgICBM YXlvdXRUZXN0UmVsYXkgYW5kIExheW91dFRlc3RSZWxheS5kU1lNIChpZiBpdCBleGlzdHMpIGZy b20gdGhlIGNvbmZpZ3VyYXRpb24tc3BlY2lmaWMgTWFjIGJ1aWxkLgorICAgICAgICAqIFNjcmlw dHMvYnVpbGQtbGF5b3V0dGVzdHJlbGF5OgorICAgICAgICAgICAgLSBSZW1vdmUgdW5uZWNlc3Nh cnkgaW5jbHVkZSBvZiBQZXJsIG1vZHVsZSBQT1NJWC4KKyAgICAgICAgICAgIC0gT25seSBidWls ZCBMYXlvdXRUZXN0UmVsYXkgd2hlbiBidWlsZGluZyBmb3IgaU9TIFNpbXVsYXRvciAoaS5lLiAt LWlvcy1zaW11bGF0b3IgaXMgcGFzc2VkKS4KKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtp dDoKKyAgICAgICAgICAgIC0gSW52b2tlIHNjcmlwdCBidWlsZC1sYXlvdXR0ZXN0cmVsYXkgd2hl biBidWlsZGluZyBmb3IgaU9TIFNpbXVsYXRvci4KKwogMjAxNS0xMC0wMSAgQnJlbnQgRnVsZ2hh bSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBVbnJldmlld2VkIGJ1aWxk IGZpeCBmb3IgcnVuLWFwaS10ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQt cHJvZHVjdC1hcmNoaXZlCmluZGV4IGNiMjJkMmJlYTk2NzVjYWNhNzIyOTMyYzhkMmZiZDY3NDc4 ZjQ1MDEuLjY4N2RlZWVjMjUzODI4MDEwYTIwNWJkNzUyNDg1OWYwOGM5NGQ2ZGYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQorKysgYi9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUKQEAgLTYyLDIxICs2 MiwyOSBAQCBkZWYgbWFpbigpOgogICAgICAgICByZXR1cm4gMQogCiAgICAgaWYgYWN0aW9uID09 ICdhcmNoaXZlJzoKLSAgICAgICAgcmV0dXJuIGFyY2hpdmVCdWlsdFByb2R1Y3Qob3B0aW9ucy5j b25maWd1cmF0aW9uLCBnZW5lcmljUGxhdGZvcm0pCisgICAgICAgIHJldHVybiBhcmNoaXZlQnVp bHRQcm9kdWN0KG9wdGlvbnMuY29uZmlndXJhdGlvbiwgZ2VuZXJpY1BsYXRmb3JtLCBvcHRpb25z LnBsYXRmb3JtKQogICAgIGVsc2U6CiAgICAgICAgIHJldHVybiBleHRyYWN0QnVpbHRQcm9kdWN0 KG9wdGlvbnMuY29uZmlndXJhdGlvbiwgZ2VuZXJpY1BsYXRmb3JtKQogCiAKLWRlZiBkZXRlcm1p bmVXZWJLaXRCdWlsZERpcmVjdG9yaWVzKHBsYXRmb3JtLCBmdWxsUGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb24pOgotICAgIGdsb2JhbCBfY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5Ci0gICAgZ2xv YmFsIF90b3BMZXZlbEJ1aWxkRGlyZWN0b3J5CitkZWYgd2Via2l0QnVpbGREaXJlY3RvcnlGb3JD b25maWd1cmF0aW9uQW5kUGxhdGZvcm0oY29uZmlndXJhdGlvbiwgcGxhdGZvcm0sIGZ1bGxQbGF0 Zm9ybT0nJywgcmV0dXJuVG9wTGV2ZWxEaXJlY3Rvcnk9RmFsc2UpOgogICAgIGlmIGZ1bGxQbGF0 Zm9ybS5zdGFydHN3aXRoKCdpb3Mtc2ltdWxhdG9yJyk6CiAgICAgICAgIHBsYXRmb3JtID0gJ2lv cy1zaW11bGF0b3InCiAgICAgZWxpZiBwbGF0Zm9ybSA9PSAnaW9zJzoKICAgICAgICAgcGxhdGZv cm0gPSAnZGV2aWNlJwogICAgIGNvbW1hbmQgPSBbJ3BlcmwnLCBvcy5wYXRoLmpvaW4ob3MucGF0 aC5kaXJuYW1lKF9fZmlsZV9fKSwgJy4uJywgJ1NjcmlwdHMnLCAnd2Via2l0LWJ1aWxkLWRpcmVj dG9yeScpLCAnLS0nICsgcGxhdGZvcm0sICctLScgKyBjb25maWd1cmF0aW9uXQotICAgIF9jb25m aWd1cmF0aW9uQnVpbGREaXJlY3RvcnkgPSBzdWJwcm9jZXNzLlBvcGVuKGNvbW1hbmQgKyBbJy0t Y29uZmlndXJhdGlvbiddLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFKS5jb21tdW5pY2F0ZSgpWzBd LnN0cmlwKCkKLSAgICBfdG9wTGV2ZWxCdWlsZERpcmVjdG9yeSA9IHN1YnByb2Nlc3MuUG9wZW4o Y29tbWFuZCArIFsnLS10b3AtbGV2ZWwnXSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkuY29tbXVu aWNhdGUoKVswXS5zdHJpcCgpCisgICAgaWYgcmV0dXJuVG9wTGV2ZWxEaXJlY3Rvcnk6CisgICAg ICAgIGNvbW1hbmQgKz0gWyctLXRvcC1sZXZlbCddCisgICAgZWxzZToKKyAgICAgICAgY29tbWFu ZCArPSBbJy0tY29uZmlndXJhdGlvbiddCisgICAgcmV0dXJuIHN1YnByb2Nlc3MuUG9wZW4oY29t bWFuZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkuY29tbXVuaWNhdGUoKVswXS5zdHJpcCgpCisK KworZGVmIGRldGVybWluZVdlYktpdEJ1aWxkRGlyZWN0b3JpZXMocGxhdGZvcm0sIGZ1bGxQbGF0 Zm9ybSwgY29uZmlndXJhdGlvbik6CisgICAgZ2xvYmFsIF9jb25maWd1cmF0aW9uQnVpbGREaXJl Y3RvcnkKKyAgICBnbG9iYWwgX3RvcExldmVsQnVpbGREaXJlY3RvcnkKKyAgICBfY29uZmlndXJh dGlvbkJ1aWxkRGlyZWN0b3J5ID0gd2Via2l0QnVpbGREaXJlY3RvcnlGb3JDb25maWd1cmF0aW9u QW5kUGxhdGZvcm0oY29uZmlndXJhdGlvbiwgcGxhdGZvcm0sIGZ1bGxQbGF0Zm9ybSkKKyAgICBf dG9wTGV2ZWxCdWlsZERpcmVjdG9yeSA9IHdlYmtpdEJ1aWxkRGlyZWN0b3J5Rm9yQ29uZmlndXJh dGlvbkFuZFBsYXRmb3JtKGNvbmZpZ3VyYXRpb24sIHBsYXRmb3JtLCBmdWxsUGxhdGZvcm0sIHJl dHVyblRvcExldmVsRGlyZWN0b3J5PVRydWUpCiAgICAgcmV0dXJuIF90b3BMZXZlbEJ1aWxkRGly ZWN0b3J5CiAKIApAQCAtMTAwLDcgKzEwOCw3IEBAIGRlZiBjcmVhdGVaaXBNYW51YWxseShkaXJl Y3RvcnlUb1ppcCwgYXJjaGl2ZUZpbGUpOgogICAgIGFyY2hpdmVaaXAuY2xvc2UoKQogCiAKLWRl ZiBjcmVhdGVaaXAoZGlyZWN0b3J5VG9aaXAsIGNvbmZpZ3VyYXRpb24pOgorZGVmIGNyZWF0ZVpp cChkaXJlY3RvcnlUb1ppcCwgY29uZmlndXJhdGlvbiwgZW1iZWRQYXJlbnREaXJlY3RvcnlOYW1l T25EYXJ3aW49RmFsc2UpOgogICAgIGFyY2hpdmVEaXIgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0 aC5qb2luKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICIuLiIsICIuLiIsICJXZWJLaXRCdWls ZCIpKQogICAgIGFyY2hpdmVGaWxlID0gb3MucGF0aC5qb2luKGFyY2hpdmVEaXIsIGNvbmZpZ3Vy YXRpb24gKyAiLnppcCIpCiAKQEAgLTExMSw3ICsxMTksMTEgQEAgZGVmIGNyZWF0ZVppcChkaXJl Y3RvcnlUb1ppcCwgY29uZmlndXJhdGlvbik6CiAgICAgICAgICAgICByYWlzZQogCiAgICAgaWYg c3lzLnBsYXRmb3JtID09ICdkYXJ3aW4nOgotICAgICAgICByZXR1cm4gc3VicHJvY2Vzcy5jYWxs KFsiZGl0dG8iLCAiLWMiLCAiLWsiLCAiLS1rZWVwUGFyZW50IiwgIi0tc2VxdWVzdGVyUnNyYyIs IGRpcmVjdG9yeVRvWmlwLCBhcmNoaXZlRmlsZV0pCisgICAgICAgIGNvbW1hbmQgPSBbJ2RpdHRv JywgJy1jJywgJy1rJywgJy0tc2VxdWVzdGVyUnNyYyddCisgICAgICAgIGlmIGVtYmVkUGFyZW50 RGlyZWN0b3J5TmFtZU9uRGFyd2luOgorICAgICAgICAgICAgY29tbWFuZCArPSBbJy0ta2VlcFBh cmVudCddCisgICAgICAgIGNvbW1hbmQgKz0gW2RpcmVjdG9yeVRvWmlwLCBhcmNoaXZlRmlsZV0K KyAgICAgICAgcmV0dXJuIHN1YnByb2Nlc3MuY2FsbChjb21tYW5kKQogICAgIGVsaWYgc3lzLnBs YXRmb3JtID09ICdjeWd3aW4nOgogICAgICAgICByZXR1cm4gc3VicHJvY2Vzcy5jYWxsKFsiemlw IiwgIi1yIiwgYXJjaGl2ZUZpbGUsICJiaW4zMiJdLCBjd2Q9ZGlyZWN0b3J5VG9aaXApCiAgICAg ZWxpZiBzeXMucGxhdGZvcm0gPT0gJ3dpbjMyJzoKQEAgLTEyMSwxMSArMTMzLDMzIEBAIGRlZiBj cmVhdGVaaXAoZGlyZWN0b3J5VG9aaXAsIGNvbmZpZ3VyYXRpb24pOgogICAgICAgICByZXR1cm4g c3VicHJvY2Vzcy5jYWxsKFsiemlwIiwgIi15IiwgIi1yIiwgYXJjaGl2ZUZpbGUsICIuIl0sIGN3 ZD1kaXJlY3RvcnlUb1ppcCkKIAogCi1kZWYgYXJjaGl2ZUJ1aWx0UHJvZHVjdChjb25maWd1cmF0 aW9uLCBwbGF0Zm9ybSk6CitkZWYgYXJjaGl2ZUJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBw bGF0Zm9ybSwgZnVsbFBsYXRmb3JtKToKICAgICBhc3NlcnQgcGxhdGZvcm0gaW4gKCdtYWMnLCAn d2luJywgJ2d0aycsICdlZmwnLCAnaW9zJykKIAotICAgIGlmIHBsYXRmb3JtIGluICgnbWFjJywg J2lvcycpOgotICAgICAgICByZXR1cm4gY3JlYXRlWmlwKF9jb25maWd1cmF0aW9uQnVpbGREaXJl Y3RvcnksIGNvbmZpZ3VyYXRpb24pCisgICAgaWYgZnVsbFBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2lv cy1zaW11bGF0b3InKToKKyAgICAgICAgIyBXZSBuZWVkIHRvIGluY2x1ZGUgaW4gdGhlIGFyY2hp dmUgdGhlIE1hYyB0b29sLCBMYXlvdXRUZXN0UmVsYXksIHRvIHJ1biBsYXlvdXQgdGVzdHMgaW4g dGhlIGlPUyBzaW11bGF0b3IuCisgICAgICAgIGNvbWJpbmVkRGlyZWN0b3J5ID0gb3MucGF0aC5q b2luKF90b3BMZXZlbEJ1aWxkRGlyZWN0b3J5LCAnY29tYmluZWQtbWFjLWFuZC1pb3MnKQorICAg ICAgICByZW1vdmVEaXJlY3RvcnlJZkV4aXN0cyhjb21iaW5lZERpcmVjdG9yeSkKKyAgICAgICAg b3MubWFrZWRpcnMoY29tYmluZWREaXJlY3RvcnkpCisKKyAgICAgICAgaWYgc3VicHJvY2Vzcy5j YWxsKFsnL2Jpbi9jcCcsICctcFInLCBfY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5LCBjb21i aW5lZERpcmVjdG9yeV0pOgorICAgICAgICAgICAgcmV0dXJuIDEKKworICAgICAgICBtYWNCdWls ZERpcmVjdG9yeSA9IHdlYmtpdEJ1aWxkRGlyZWN0b3J5Rm9yQ29uZmlndXJhdGlvbkFuZFBsYXRm b3JtKGNvbmZpZ3VyYXRpb24sICdtYWMnKQorICAgICAgICBkZXN0aW5hdGlvbkRpcmVjdG9yeSA9 IG9zLnBhdGguam9pbihjb21iaW5lZERpcmVjdG9yeSwgb3MucGF0aC5yZWxwYXRoKG1hY0J1aWxk RGlyZWN0b3J5LCBfdG9wTGV2ZWxCdWlsZERpcmVjdG9yeSkpCisgICAgICAgIG9zLm1ha2VkaXJz KGRlc3RpbmF0aW9uRGlyZWN0b3J5KQorICAgICAgICBmb3IgZmlsZW5hbWUgaW4gWydMYXlvdXRU ZXN0UmVsYXknLCAnTGF5b3V0VGVzdFJlbGF5LmRTWU0nXToKKyAgICAgICAgICAgIHNvdXJjZUZp bGUgPSBvcy5wYXRoLmpvaW4obWFjQnVpbGREaXJlY3RvcnksIGZpbGVuYW1lKQorICAgICAgICAg ICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKHNvdXJjZUZpbGUpOgorICAgICAgICAgICAgICAgIGNv bnRpbnVlCisgICAgICAgICAgICBpZiBzdWJwcm9jZXNzLmNhbGwoWycvYmluL2NwJywgJy1wUics IHNvdXJjZUZpbGUsIGRlc3RpbmF0aW9uRGlyZWN0b3J5XSk6CisgICAgICAgICAgICAgICAgcmV0 dXJuIDEKKworICAgICAgICBpZiBjcmVhdGVaaXAoY29tYmluZWREaXJlY3RvcnksIGNvbmZpZ3Vy YXRpb24pOgorICAgICAgICAgICAgcmV0dXJuIDEKKyAgICAgICAgc2h1dGlsLnJtdHJlZShjb21i aW5lZERpcmVjdG9yeSkKKyAgICBlbGlmIHBsYXRmb3JtIGluICgnbWFjJywgJ2lvcycpOgorICAg ICAgICByZXR1cm4gY3JlYXRlWmlwKF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnksIGNvbmZp Z3VyYXRpb24sIGVtYmVkUGFyZW50RGlyZWN0b3J5TmFtZU9uRGFyd2luPVRydWUpCiAgICAgZWxp ZiBwbGF0Zm9ybSA9PSAnd2luJzoKICAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkbid0IGhhcmRj b2RlIHRoZSBhc3N1bXB0aW9uIG9mIGEgMzItYml0IGJ1aWxkLiBTZWUgPGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk3MTU+LgogICAgICAgICBiaW5EaXJlY3Rvcnkg PSBvcy5wYXRoLmpvaW4oX2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwgJ2JpbjMyJykKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtbGF5b3V0dGVzdHJlbGF5IGIvVG9vbHMvU2Ny aXB0cy9idWlsZC1sYXlvdXR0ZXN0cmVsYXkKaW5kZXggYWU0YWJjODNmMmRhNzdlODU4NDg5YjQ0 ZjVhZjI2YmUxNDI5Mzg2OS4uNTUxMjYyMzY1ZTYyMmI2YjgwNDQ3YjAzNDZkMWZmODlkYzYzMjE0 MiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC1sYXlvdXR0ZXN0cmVsYXkKKysrIGIv VG9vbHMvU2NyaXB0cy9idWlsZC1sYXlvdXR0ZXN0cmVsYXkKQEAgLTEsNiArMSw2IEBACiAjIS91 c3IvYmluL3BlcmwgLXcKIAotIyBDb3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTQsIDIwMTUgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOSw3ICsy OSw2IEBAIHVzZSBGaW5kQmluOwogdXNlIEdldG9wdDo6TG9uZyBxdyg6Y29uZmlnIHBhc3NfdGhy b3VnaCk7CiB1c2UgbGliICRGaW5kQmluOjpCaW47CiB1c2Ugd2Via2l0ZGlyczsKLXVzZSBQT1NJ WDsKIAogbXkgJHNob3dIZWxwID0gMDsKIG15ICRjbGVhbiA9IDA7CkBAIC01NywxMCArNTYsMTAg QEAgY2hkaXJXZWJLaXQoKTsKIAogY2hkaXIgIlRvb2xzL0xheW91dFRlc3RSZWxheSIgb3IgZGll OwogCi1pZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7Ci0gICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVQ cm9qZWN0KCJMYXlvdXRUZXN0UmVsYXkiLCAkY2xlYW4sIFhjb2RlT3B0aW9ucygpLCBAQVJHVik7 Ci19IGVsc2UgewotICAgIGRpZSAiV2ViS2l0VGVzdFJ1bm5lciBpcyBub3Qgc3VwcG9ydGVkIG9u IHRoaXMgcGxhdGZvcm0uXG4iOworaWYgKGlzSU9TV2ViS2l0KCkgJiYgd2lsbFVzZUlPU1NpbXVs YXRvclNES1doZW5CdWlsZGluZygpKSB7CisgICAgc2V0WGNvZGVTREsodW5kZWYpOyAjIEZvcmNl IHVzZSBvZiBNYWMgU0RLCisgICAgZXhpdCBleGl0U3RhdHVzKGJ1aWxkWENvZGVQcm9qZWN0KCJM YXlvdXRUZXN0UmVsYXkiLCAkY2xlYW4sIFhjb2RlT3B0aW9ucygpLCBAQVJHVikpOwogfQogCi1l eGl0IGV4aXRTdGF0dXMoJHJlc3VsdCk7CitwcmludCBTVERFUlIgIkxheW91dFRlc3RSZWxheSBp cyBvbmx5IHN1cHBvcnRlZCBmb3IgaU9TIFNpbXVsYXRvci5cbiI7CitleGl0IDE7CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0CmluZGV4IDhhNmQ3YzNmMmQ2ZGZmZWUxNzQ5NjFhYmY5NTA1NGQ2YjFiMTg5MTkuLmQ4NmJj NTg4MDg2NTI0ZGU1OWFjMjI0NTQyN2VkOGYxMjRjZGYyNGMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CkBAIC0y MDEsNiArMjAxLDEwIEBAIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgKTsKICAg ICAgICAgcHJpbnQoam9pbigiICIsIEBjb3B5TGlicmFyaWVzQXJncykgLiAiXG4iKTsKICAgICAg ICAgKHN5c3RlbShAY29weUxpYnJhcmllc0FyZ3MpID09IDApIG9yIGRpZTsKKworICAgICAgICBp ZiAod2lsbFVzZUlPU1NpbXVsYXRvclNES1doZW5CdWlsZGluZygpKSB7CisgICAgICAgICAgICAo c3lzdGVtKCJwZXJsIiwgIlRvb2xzL1NjcmlwdHMvYnVpbGQtbGF5b3V0dGVzdHJlbGF5IiwgYXJn dW1lbnRzRm9yQ29uZmlndXJhdGlvbigpKSA9PSAwKSBvciBkaWU7CisgICAgICAgIH0KICAgICB9 CiAKICAgICAjIEJ1aWxkIFRvb2xzIG5lZWRlZCBmb3IgQXBwbGUgcG9ydHMK