121089 2013-09-10 04:53:39 -0700 [Qt] Fix build with Qt 5.2 QtPositioning module. 2013-09-26 07:21:46 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121090 1 allan.jensen allan.jensen hausmann jturcotte kadam michael.bruning zarvai oldest_to_newest 927258 0 allan.jensen 2013-09-10 04:53:39 -0700 There is no QtLocation module in Qt5 anymore, and there was one released. Part of it will be released with Qt 5.2 as QtPosition. We need to update the build to make that work with QtWebKit. 927260 1 allan.jensen 2013-09-10 05:18:11 -0700 (In reply to comment #0) > There is no QtLocation module in Qt5 anymore, and there was one released. Part of it will be released with Qt 5.2 as QtPosition. We need to update the build to make that work with QtWebKit. Should read: There was never such a module released. 927262 2 211191 allan.jensen 2013-09-10 05:31:44 -0700 Created attachment 211191 Patch 932934 3 211191 allan.jensen 2013-09-25 05:08:33 -0700 Comment on attachment 211191 Patch The naming seems to be final now, putting back for review. 932941 4 211191 michael.bruning 2013-09-25 05:19:48 -0700 Comment on attachment 211191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211191&action=review LGTM except for the small comment in defaul_pre.prf > Tools/qmake/mkspecs/features/default_pre.prf:72 > + I think this might have leaked from another change... 932945 5 211191 michael.bruning 2013-09-25 05:26:40 -0700 Comment on attachment 211191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211191&action=review >> Tools/qmake/mkspecs/features/default_pre.prf:72 >> +# We use private_tests to detect developer build, since the destdir will >> +# always be our webkit build dir. This might change as configure changes. >> +contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build >> + >> +# By default we enable "production build", and build-webkit, which is >> +# used by bots and developers, will disable it, to enable warnings etc. >> +CONFIG += production_build >> + > > I think this might have leaked from another change... I meant the whle section of course... 932949 6 allan.jensen 2013-09-25 05:43:04 -0700 (In reply to comment #5) > (From update of attachment 211191 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=211191&action=review > > >> Tools/qmake/mkspecs/features/default_pre.prf:72 > >> +# We use private_tests to detect developer build, since the destdir will > >> +# always be our webkit build dir. This might change as configure changes. > >> +contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build > >> + > >> +# By default we enable "production build", and build-webkit, which is > >> +# used by bots and developers, will disable it, to enable warnings etc. > >> +CONFIG += production_build > >> + > > > > I think this might have leaked from another change... > > I meant the whle section of course... No, but it probably should be mentioned in the Changelog. The problem is the production_build variable was not set correctly in features.prf, so that code needed to be moved above it to work correctly. 933005 7 allan.jensen 2013-09-25 07:56:11 -0700 Committed r156395: <http://trac.webkit.org/changeset/156395> 933394 8 kadam 2013-09-26 00:58:13 -0700 Something is wrong with this change. The geolocation, devicemotion, deviceorientation tests are failing because the geolacation, device orientation, orientation events are disabled after this patch. The bots use Qt 5.1.1 with qtjsbackend, qtdeclarative modules. 933435 9 allan.jensen 2013-09-26 03:35:59 -0700 (In reply to comment #8) > Something is wrong with this change. The geolocation, devicemotion, deviceorientation tests are failing because the geolacation, device orientation, orientation events are disabled after this patch. The bots use Qt 5.1.1 with qtjsbackend, qtdeclarative modules. Are you building with qmake with production_build set? After the patch we now properly disable the mocked geolocation when production_build is set 933476 10 zarvai 2013-09-26 07:03:49 -0700 (In reply to comment #9) > (In reply to comment #8) > > Something is wrong with this change. The geolocation, devicemotion, deviceorientation tests are failing because the geolacation, device orientation, orientation events are disabled after this patch. The bots use Qt 5.1.1 with qtjsbackend, qtdeclarative modules. > > Are you building with qmake with production_build set? After the patch we now properly disable the mocked geolocation when production_build is set Qt is buildt with ./configure -opensource -confirm-license -no-pch -nomake examples -nomake tests -no-gtkstyle -qt-zlib -qt-sql-sqlite -release -prefix /usr/local/Trolltech/Qt5/Qt-5.1.1 WebKit buildt with perl ./Tools/Scripts/build-webkit --release --qt Production build .............. no Have .......................... qtquick qtprintsupport qstyle qttestlib xcomposite xrender glx fontconfig sqlite3 qttestsupport More logs http://build.webkit.org/builders/Qt%20Linux%20Release/builds/63252/steps/compile-webkit/logs/stdio In Tools/qmake/mkspec/features/features.prf we have: # Geolocation support if QtPositioning exists or if we're doing a developer build (Mock implementation exists # and used for layout tests) have?(qtpositioning)|!production_build: WEBKIT_CONFIG += geolocation # Orientation support if QtSensors exists or if we're doing a developer build (Mock implementation exists # and used for layout tests) have?(qtsensors)|!production_build: WEBKIT_CONFIG += orientation_events device_orientation 933479 11 allan.jensen 2013-09-26 07:21:46 -0700 Yeah I know what the problem is. These configure tests are run from default_pre which is before command line arguments to qmake have been processed. So at this point we can not actually tell if it is a production_build or not. 211191 2013-09-10 05:31:44 -0700 2013-09-25 06:26:33 -0700 Patch bug-121089-20130910143142.patch text/plain 8736 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMwNDE3NzFkMTJjMjM2YjJl YzQxMzU5YTA4YWI3NjBjYjgzNmE3NjQuLjc1ZWYyNzE5YjY5NzhlZTAwMTg0MDY2Yzc1NmQ5YTA0 NzcyOWQ2ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDktMTAgIEFsbGFuIFNh bmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0XSBG aXggYnVpbGQgd2l0aCBRdCA1LjIgUXRQb3NpdGlvbiBtb2R1bGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTA4OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFF0TG9jYXRpb24gLT4gUXRQb3NpdGlvbmlu ZworCisgICAgICAgICogV2ViS2l0MS5wcmk6CisKIDIwMTMtMDktMDggIEFudHRpIEtvaXZpc3Rv ICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB3aW5kb3cgYnVpbGQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IGFiYzg5MzMzN2JkNGE5OWIyMDIwMTM0ZTk4NjU5YjYwZWNmNGNhNmIuLmMwNjIz MTcyMjBmNTc4MWQ5ZTUyMGE2OTVlNGU2N2E0MjlkYjBiMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTMtMDktMTAgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmpl bnNlbkBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0XSBGaXggYnVpbGQgd2l0aCBRdCA1LjIgUXRQ b3NpdGlvbiBtb2R1bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyMTA4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFF0TG9jYXRpb24gLT4gUXRQb3NpdGlvbmluZworCisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHA6CisKIDIwMTMtMDktMDMgIEFsbGFuIFNhbmRm ZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0XSBJbWFn ZXMgc2NhbGVkIHBvb3JseSBvbiBjb21wb3NpdGVkIGNhbnZhcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDRjNTRm YzBlYmU3MDYyNjJiNTlhYmYyZTQ2ZmJiNDA5Y2U3MGViMmMuLmFhZDA2MjBhZGJmY2UwZmNhM2Zh NTE3N2NmNGZjZTExODI4YTc5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAxMy0w OS0xMCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KIAor ICAgICAgICBbUXRdIEZpeCBidWlsZCB3aXRoIFF0IDUuMiBRdFBvc2l0aW9uIG1vZHVsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxMDg5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXRMb2NhdGlvbiAt PiBRdFBvc2l0aW9uaW5nCisKKyAgICAgICAgKiBUYXJnZXQucHJpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9xdC9XZWJHZW9sb2NhdGlvblByb3ZpZGVyUXQuY3BwOgorICAgICAgICAqIFdlYktpdDIu cHJpOgorCisyMDEzLTA5LTEwICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5A ZGlnaWEuY29tPgorCiAgICAgICAgIFtRdF0gbWFrZSB1c2Ugb2YgcXRIYXZlTW9kdWxlKCkgCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjEwOTAKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQxLnByaSBiL1NvdXJjZS9XZWJLaXQvV2Vi S2l0MS5wcmkKaW5kZXggMDZhYzE2MDMxZjNhYWUzZTEwMDI0MmJiMDJhODlkMDg5MWUwNzhhMS4u NmZjMTgyOTQxZTJjNTNlMWY5N2RmZTE1MzM3YTYwMmQ1YTMyOThlYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJLaXQxLnByaQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdDEucHJpCkBA IC0xNCw3ICsxNCw3IEBAIElOQ0xVREVQQVRIICs9IFwKIAogaGF2ZT8ocXRzZW5zb3JzKTppZihl bmFibGU/KERFVklDRV9PUklFTlRBVElPTil8ZW5hYmxlPyhPUklFTlRBVElPTl9FVkVOVFMpKTog UVQgKz0gc2Vuc29ycwogCi1oYXZlPyhxdGxvY2F0aW9uKTplbmFibGU/KEdFT0xPQ0FUSU9OKTog UVQgKz0gbG9jYXRpb24KK2hhdmU/KHF0cG9zaXRpb25pbmcpOmVuYWJsZT8oR0VPTE9DQVRJT04p OiBRVCArPSBwb3NpdGlvbmluZwogCiBjb250YWlucyhDT05GSUcsIHRleG1hcCk6IERFRklORVMg Kz0gV1RGX1VTRV9URVhUVVJFX01BUFBFUj0xCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3BwCmluZGV4IDI2ZDFiNDA3 YThjYjAzYmUxNTVmYzgxOGZlOTI4NmNjODY1M2EzZGQuLmI0YzUxODlmNjg1ZTc3YmM0ZDc4ZWE1 NTQ2MzgwNjI4N2I0NzAxMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcApAQCAtMzYsNyArMzYsNyBAQAogI2lu Y2x1ZGUgIlFXZWJGcmFtZUFkYXB0ZXIuaCIKICNpbmNsdWRlICJRV2ViUGFnZUFkYXB0ZXIuaCIK IAotI2luY2x1ZGUgPFF0TG9jYXRpb24vUUdlb1Bvc2l0aW9uSW5mb1NvdXJjZT4KKyNpbmNsdWRl IDxRdFBvc2l0aW9uaW5nL1FHZW9Qb3NpdGlvbkluZm9Tb3VyY2U+CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaSBiL1NvdXJjZS9X ZWJLaXQyL1RhcmdldC5wcmkKaW5kZXggN2JhYzM4M2YyZjRlZGUzYTFjOWM0MzFlZDk2NmU0Yzcx YWJlNDUyYi4uNTk3ZTAxMDg4NDdjMjg5ZTc4NDIwZGU5YzUyYTM1NWZkMWUwOTZmMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9UYXJn ZXQucHJpCkBAIC05MzcsNyArOTM3LDcgQEAgZW5hYmxlPyhUT1VDSF9FVkVOVFMpIHsKIH0KIAog Ci1oYXZlPyhxdGxvY2F0aW9uKTplbmFibGU/KEdFT0xPQ0FUSU9OKTogUVQgKz0gbG9jYXRpb24K K2hhdmU/KHF0cG9zaXRpb25pbmcpOmVuYWJsZT8oR0VPTE9DQVRJT04pOiBRVCArPSBwb3NpdGlv bmluZwogCiB1c2U/KDNEX0dSQVBISUNTKTogV0VCS0lUICs9IGFuZ2xlCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJHZW9sb2NhdGlvblByb3ZpZGVyUXQuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkdlb2xvY2F0aW9uUHJvdmlkZXJRdC5j cHAKaW5kZXggMDM4OTkyMTQzNzU0ZGVjZTM4OTA1YmFhZjVlYzRlYWRmYjE5NWUyZi4uN2QwNWYw NDNlM2Y1OWI4ZmFkZWY2OWU0MTZjMDY5M2UzZjEyMDMyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1dlYkdlb2xvY2F0aW9uUHJvdmlkZXJRdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkdlb2xvY2F0aW9uUHJvdmlkZXJRdC5jcHAKQEAg LTIxLDggKzIxLDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJHZW9sb2Nh dGlvblByb3ZpZGVyUXQuaCIKIAotI2lmIEVOQUJMRShHRU9MT0NBVElPTikgJiYgSEFWRShRVExP Q0FUSU9OKQotI2luY2x1ZGUgPFF0TG9jYXRpb24vUUdlb1Bvc2l0aW9uSW5mb1NvdXJjZT4KKyNp ZiBFTkFCTEUoR0VPTE9DQVRJT04pICYmIEhBVkUoUVRQT1NJVElPTklORykKKyNpbmNsdWRlIDxR dFBvc2l0aW9uaW5nL1FHZW9Qb3NpdGlvbkluZm9Tb3VyY2U+CiAKIG5hbWVzcGFjZSBXZWJLaXQg ewogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnByaSBiL1NvdXJjZS9XZWJL aXQyL1dlYktpdDIucHJpCmluZGV4IGIxYWFlY2ZkYmRkMzU2OGY5NzBjYTFkMGFmNjVlMTk0MTA1 OTEyMGUuLjE5ZDM0Nzk3OTE3ZjE0YWIwZmJjYTc1YjMwOWZjYzNjZjg0MThkMDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIucHJpCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktp dDIucHJpCkBAIC04Miw3ICs4Miw3IEBAIGxpbnV4LSo6IHsKIAogaGF2ZT8oUVRRVUlDSyk6IFFU ICs9IHFtbCBxdWljawogCi1oYXZlPyhxdGxvY2F0aW9uKTplbmFibGU/KEdFT0xPQ0FUSU9OKTog UVQgKz0gbG9jYXRpb24KK2hhdmU/KHF0cG9zaXRpb25pbmcpOmVuYWJsZT8oR0VPTE9DQVRJT04p OiBRVCArPSBwb3NpdGlvbmluZwogCiBlbmFibGU/KFNFQ0NPTVBfRklMVEVSUyk6IFBLR0NPTkZJ RyArPSBsaWJzZWNjb21wCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCA0N2U5Y2YxNjEwOWYwODAwMWQ4NzU0ZjcxYjg2ODg3YTk2MjI2MmUzLi5i ZjFjNWM4NmUzYjRjZjdlMThmYjNmNDRiZmQyYzI5NDdkY2IyODk1IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTMt MDktMTAgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAK KyAgICAgICAgW1F0XSBGaXggYnVpbGQgd2l0aCBRdCA1LjIgUXRQb3NpdGlvbiBtb2R1bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTA4OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFF0TG9jYXRpb24g LT4gUXRQb3NpdGlvbmluZy4gTWFrZSBzdXJlIHdlIHNldCBidWlsZCB0eXBlIGJlZm9yZSBkb2lu ZyBjb25maWd1cmUgY2hlY2tzCisgICAgICAgIHRoYXQgbWlnaHQgZGVwZW5kIG9uIHRoZW0uCisK KyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRfcHJlLnByZjoKKyAgICAg ICAgKiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZjoKKworMjAxMy0wOS0xMCAg QWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KKwogICAgICAg ICBbUXRdIG1ha2UgdXNlIG9mIHF0SGF2ZU1vZHVsZSgpIAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxMDkwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL3Ft YWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wcmUucHJmIGIvVG9vbHMvcW1ha2UvbWtzcGVj cy9mZWF0dXJlcy9kZWZhdWx0X3ByZS5wcmYKaW5kZXggNjk5ZDc3ZmZiODFhZmZlMWU0ZDNiZTk5 ZWQ2MjkyNjI4YzMzOGJhZS4uYzI2OTgzYTVhZTM5MTgwYWU2NzA0MzU1NDJhOTc5YWE2YzJjNTJk ZiAxMDA2NDQKLS0tIGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3ByZS5w cmYKKysrIGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3ByZS5wcmYKQEAg LTYyLDYgKzYyLDE0IEBAIHdpbjMyLW1zdmMqOiBNQUtFRklMRV9OT09QX0NPTU1BTkQgPSBAZWNo byA+TlVMCiBzY3JhdGNoYm94OiBQWVRIT04gPSBweXRob24yLjYKIGVsc2U6IFBZVEhPTiA9IHB5 dGhvbgogCisjIFdlIHVzZSBwcml2YXRlX3Rlc3RzIHRvIGRldGVjdCBkZXZlbG9wZXIgYnVpbGQs IHNpbmNlIHRoZSBkZXN0ZGlyIHdpbGwKKyMgYWx3YXlzIGJlIG91ciB3ZWJraXQgYnVpbGQgZGly LiBUaGlzIG1pZ2h0IGNoYW5nZSBhcyBjb25maWd1cmUgY2hhbmdlcy4KK2NvbnRhaW5zKFFUX0NP TkZJRywgcHJpdmF0ZV90ZXN0cyk6IENPTkZJRyArPSBxdF9kZXZlbG9wZXJfYnVpbGQKKworIyBC eSBkZWZhdWx0IHdlIGVuYWJsZSAicHJvZHVjdGlvbiBidWlsZCIsIGFuZCBidWlsZC13ZWJraXQs IHdoaWNoIGlzCisjIHVzZWQgYnkgYm90cyBhbmQgZGV2ZWxvcGVycywgd2lsbCBkaXNhYmxlIGl0 LCB0byBlbmFibGUgd2FybmluZ3MgZXRjLgorQ09ORklHICs9IHByb2R1Y3Rpb25fYnVpbGQKKwog IyBSdW4gY29uZmlndXJlIGJlZm9yZSBtYWtpbmcgZGVjaXNpb25zIHRoYXQgZGVwZW5kIG9uIHRo ZSByZXN1bHQKIHJvb3RfcHJvamVjdF9maWxlIHsKICAgICBsb2FkKGNvbmZpZ3VyZSkKQEAgLTc0 LDIwICs4MiwxMiBAQCB1bml4OmNvbmZpZ19nY2NkZXBlbmRzIHsKICAgICBDT05GSUcgKz0gR05V bWFrZSBnY2NfTURfZGVwZW5kcwogfQogCi0jIFdlIHVzZSBwcml2YXRlX3Rlc3RzIHRvIGRldGVj dCBkZXZlbG9wZXIgYnVpbGQsIHNpbmNlIHRoZSBkZXN0ZGlyIHdpbGwKLSMgYWx3YXlzIGJlIG91 ciB3ZWJraXQgYnVpbGQgZGlyLiBUaGlzIG1pZ2h0IGNoYW5nZSBhcyBjb25maWd1cmUgY2hhbmdl cy4KLWNvbnRhaW5zKFFUX0NPTkZJRywgcHJpdmF0ZV90ZXN0cyk6IENPTkZJRyArPSBxdF9kZXZl bG9wZXJfYnVpbGQKLQogIyBTZXQgc29tZSBkZWZhdWx0cyBmb3Igc3BlY2lmaWMgcGxhdGZvcm1z CiBDT05GSUcgKz0gaW5jbHVkZV93ZWJpbnNwZWN0b3IKIAogIyBNYWtlIHN1cmUgd2UgcHJvY2Vz cyB0aGUgUEtHQ09ORklHIHZhcmlhYmxlIGlmIGFwcGxpY2FibGUKICFtYWM6IENPTkZJRyArPSBs aW5rX3BrZ2NvbmZpZwogCi0jIEJ5IGRlZmF1bHQgd2UgZW5hYmxlICJwcm9kdWN0aW9uIGJ1aWxk IiwgYW5kIGJ1aWxkLXdlYmtpdCwgd2hpY2ggaXMKLSMgdXNlZCBieSBib3RzIGFuZCBkZXZlbG9w ZXJzLCB3aWxsIGRpc2FibGUgaXQsIHRvIGVuYWJsZSB3YXJuaW5ncyBldGMuCi1DT05GSUcgKz0g cHJvZHVjdGlvbl9idWlsZAotCiAjIExpbWl0IHRoZSBjcmVhdGlvbiBvZiB0aGluIGFyY2hpdmVz IHRvIExpbnV4LCBzaW5jZSBvbmx5IEdOVSdzIGFyIHN1cHBvcnRzIGl0LgogIWRlYnVnX2FuZF9y ZWxlYXNlOmxpbnV4LWcrKyo6IENPTkZJRyArPSBnbnVfdGhpbl9hcmNoaXZlcwogCmRpZmYgLS1n aXQgYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZiBiL1Rvb2xzL3Ft YWtlL21rc3BlY3MvZmVhdHVyZXMvZmVhdHVyZXMucHJmCmluZGV4IDMxNjQ4MWVhNzgwYjgyMWIz ZjQzYTYxZGJhODA5NTYyMGM3NTQ4MjUuLmU3YzdjNjkwMTAzMmQ2MzQyN2MzODQ1NTJjODViZmQy NDEwZGQ2MjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZmVhdHVy ZXMucHJmCisrKyBiL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZmVhdHVyZXMucHJmCkBA IC0zNyw3ICszNyw3IEBAIGRlZmluZVRlc3QoZGV0ZWN0RmVhdHVyZXMpIHsKICAgICBxdEhhdmVN b2R1bGUocHJpbnRzdXBwb3J0KTogV0VCS0lUX0NPTkZJRyArPSBoYXZlX3F0cHJpbnRzdXBwb3J0 CiAgICAgcXRIYXZlTW9kdWxlKHdpZGdldHMpOiBXRUJLSVRfQ09ORklHICs9IGhhdmVfcXN0eWxl CiAgICAgcXRIYXZlTW9kdWxlKHRlc3RsaWIpOiBXRUJLSVRfQ09ORklHICs9IGhhdmVfcXR0ZXN0 bGliCi0gICAgcXRIYXZlTW9kdWxlKGxvY2F0aW9uKTogV0VCS0lUX0NPTkZJRyArPSBoYXZlX3F0 bG9jYXRpb24KKyAgICBxdEhhdmVNb2R1bGUocG9zaXRpb25pbmcpOiBXRUJLSVRfQ09ORklHICs9 IGhhdmVfcXRwb3NpdGlvbmluZwogICAgIHF0SGF2ZU1vZHVsZShzZW5zb3JzKTogV0VCS0lUX0NP TkZJRyArPSBoYXZlX3F0c2Vuc29ycwogCiAgICAgY29uZmlnX2xpYnhtbDI6IFdFQktJVF9DT05G SUcgKz0gdXNlX2xpYnhtbDIKQEAgLTk3LDkgKzk3LDkgQEAgZGVmaW5lVGVzdChkZXRlY3RGZWF0 dXJlcykgewogICAgICMgRW5hYmxlIENTUyBzaGFkZXJzIHdoZW4gQ1NTIGZpbHRlcnMgYW5kIFdl YkdMIGFyZSBlbmFibGVkCiAgICAgZW5hYmxlPyhjc3NfZmlsdGVycyk6ZW5hYmxlPyh3ZWJnbCk6 IFdFQktJVF9DT05GSUcgKz0gY3NzX3NoYWRlcnMKIAotICAgICMgR2VvbG9jYXRpb24gc3VwcG9y dCBpZiBRdExvY2F0aW9uIGV4aXN0cyBvciBpZiB3ZSdyZSBkb2luZyBhIGRldmVsb3BlciBidWls ZCAoTW9jayBpbXBsZW1lbnRhdGlvbiBleGlzdHMKKyAgICAjIEdlb2xvY2F0aW9uIHN1cHBvcnQg aWYgUXRQb3NpdGlvbmluZyBleGlzdHMgb3IgaWYgd2UncmUgZG9pbmcgYSBkZXZlbG9wZXIgYnVp bGQgKE1vY2sgaW1wbGVtZW50YXRpb24gZXhpc3RzCiAgICAgIyBhbmQgdXNlZCBmb3IgbGF5b3V0 IHRlc3RzKQotICAgIGhhdmU/KHF0bG9jYXRpb24pfCFwcm9kdWN0aW9uX2J1aWxkOiBXRUJLSVRf Q09ORklHICs9IGdlb2xvY2F0aW9uCisgICAgaGF2ZT8ocXRwb3NpdGlvbmluZyl8IXByb2R1Y3Rp b25fYnVpbGQ6IFdFQktJVF9DT05GSUcgKz0gZ2VvbG9jYXRpb24KIAogICAgICMgT3JpZW50YXRp b24gc3VwcG9ydCBpZiBRdFNlbnNvcnMgZXhpc3RzIG9yIGlmIHdlJ3JlIGRvaW5nIGEgZGV2ZWxv cGVyIGJ1aWxkIChNb2NrIGltcGxlbWVudGF0aW9uIGV4aXN0cwogICAgICMgYW5kIHVzZWQgZm9y IGxheW91dCB0ZXN0cykK