71160 2011-10-28 16:30:36 -0700 NRWT doesn't show build output when building DRT 2011-11-30 11:13:24 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73469 1 simon.fraser webkit-unassigned aroben dpranke eric ojan simon.fraser oldest_to_newest 492778 0 simon.fraser 2011-10-28 16:30:36 -0700 4$ $ ./Tools/Scripts/run-webkit-tests --debug LayoutTests/canvas/ Running new-run-webkit-tests with one child process. For more parallelism, run new-run-webkit-tests directly. Failed to build DumpRenderTree Build check failed Not very helpful. 6$ $ ./Tools/Scripts/old-run-webkit-tests --debug LayoutTests/canvas/ Running build-dumprendertree 2011-10-28 16:29:42.789 xcodebuild[513:60f] [MT] DVTPlugInManager: Error obtaining required capabilities for GPUDebuggerFoundation.ideplugin: Error Domain=NSCocoaErrorDomain Code=260 UserInfo=0x2002da6c0 "The file “Info.plist” couldn’t be opened because there is no such file." Underlying Error=(Error Domain=NSPOSIXErrorDomain Code=2 "The operation couldn’t be completed. No such file or directory") 2011-10-28 16:29:42.803 xcodebuild[513:60f] [MT] DVTPlugInManager: Error obtaining required capabilities for GPUTraceDebugger.ideplugin: Error Domain=NSCocoaErrorDomain Code=260 UserInfo=0x20034f5e0 "The file “Info.plist” couldn’t be opened because there is no such file." Underlying Error=(Error Domain=NSPOSIXErrorDomain Code=2 "The operation couldn’t be completed. No such file or directory") Build settings from command line: ARCHS = x86_64 OBJROOT = /Users/smfr/webkit/WebKit.git/WebKitBuild SYMROOT = /Users/smfr/webkit/WebKit.git/WebKitBuild === BUILD NATIVE TARGET DumpRenderTree OF PROJECT DumpRenderTree WITH CONFIGURATION Debug === Check dependencies === BUILD NATIVE TARGET ImageDiff OF PROJECT DumpRenderTree WITH CONFIGURATION Debug === Check dependencies === BUILD NATIVE TARGET TestNetscapePlugIn OF PROJECT DumpRenderTree WITH CONFIGURATION Debug === Check dependencies CompileC /Users/smfr/webkit/WebKit.git/WebKitBuild/DumpRenderTree.build/Debug/TestNetscapePlugIn.build/Objects-normal/x86_64/ContentsScaleFactor.o TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler cd /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree setenv LANG en_US.US-ASCII /Developer/usr/bin/clang -x c++ -arch x86_64 -fmessage-length=0 -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -O0 -Werror -Wno-return-type -Wparentheses -Wswitch -Wunused-function -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -Wc++0x-extensions -DENABLE_DASHBOARD_SUPPORT -DWEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST -fasm-blocks -Wno-deprecated-declarations -mmacosx-version-min=10.6 -gdwarf-2 -fvisibility-inlines-hidden -Wno-sign-conversion -I/Users/smfr/webkit/WebKit.git/WebKitBuild/DumpRenderTree.build/Debug/TestNetscapePlugIn.build/TestNetscapePlugIn.hmap -I/Users/smfr/webkit/WebKit.git/WebKitBuild/Debug/include -IForwardingHeaders -Imac/InternalHeaders -I/usr/local/include/WebCoreTestSupport -I/Users/smfr/webkit/WebKit.git/WebKitBuild/DumpRenderTree.build/Debug/TestNetscapePlugIn.build/DerivedSources/x86_64 -I/Users/smfr/webkit/WebKit.git/WebKitBuild/DumpRenderTree.build/Debug/TestNetscapePlugIn.build/DerivedSources -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -F/Users/smfr/webkit/WebKit.git/WebKitBuild/Debug -F/System/Library/Frameworks/Quartz.framework/Frameworks -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks -F/System/Library/Frameworks/CoreServices.framework/Frameworks -MMD -MT dependencies -MF /Users/smfr/webkit/WebKit.git/WebKitBuild/DumpRenderTree.build/Debug/TestNetscapePlugIn.build/Objects-normal/x86_64/ContentsScaleFactor.d -c /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp -o /Users/smfr/webkit/WebKit.git/WebKitBuild/DumpRenderTree.build/Debug/TestNetscapePlugIn.build/Objects-normal/x86_64/ContentsScaleFactor.o /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp:42:22: error: use of undeclared identifier 'NPNVcontentsScaleFactor'; did you mean 'contentsScaleFactor'? [3] NPN_GetValue(NPNVcontentsScaleFactor, &contentsScaleFactor); ^~~~~~~~~~~~~~~~~~~~~~~ contentsScaleFactor fix-it:"/Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp":{42:22-42:45}:"contentsScaleFactor" /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp:41:16: note: 'contentsScaleFactor' declared here [3] double contentsScaleFactor = 1.0; ^ /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp:42:22:{42:22-42:45}: error: cannot initialize a parameter of type 'NPNVariable' with an lvalue of type 'double' [3] NPN_GetValue(NPNVcontentsScaleFactor, &contentsScaleFactor); ^~~~~~~~~~~~~~~~~~~~~~~ /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h:77:37: note: passing argument to parameter here [3] NPError NPN_GetValue(NPNVariable, void* value); ^ /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp:97:14: error: use of undeclared identifier 'NPNVcontentsScaleFactor'; did you mean 'contentsScaleFactor'? [3] case NPNVcontentsScaleFactor: ^~~~~~~~~~~~~~~~~~~~~~~ contentsScaleFactor fix-it:"/Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp":{97:14-97:37}:"contentsScaleFactor" /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp:41:16: note: 'contentsScaleFactor' declared here [3] double contentsScaleFactor = 1.0; ^ /Users/smfr/webkit/WebKit.git/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp:97:14:{97:14-97:37}: error: expression is not an integer constant expression [3] case NPNVcontentsScaleFactor: ^~~~~~~~~~~~~~~~~~~~~~~ 4 errors generated. ** BUILD FAILED ** The following build commands failed: CompileC /Users/smfr/webkit/WebKit.git/WebKitBuild/DumpRenderTree.build/Debug/TestNetscapePlugIn.build/Objects-normal/x86_64/ContentsScaleFactor.o TestNetscapePlugIn/Tests/mac/ContentsScaleFactor.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler (1 failure) Compiling DumpRenderTree failed! More helpful. 492792 1 eric 2011-10-28 16:53:54 -0700 The behavior is intentional. It could save the log somewhere, or it could direct you to use build-dumprendertree to debug the failure,or print the output if passed --verbose. NRWT is intentionally much more sparse in output than ORWT. Keeping with the "show the minimum needed for the common case" philosophy, do you have a preference between telling folks to debug with build-dumprendertree, or pass --verbose, or spewing the log only on failure? 492794 2 simon.fraser 2011-10-28 16:56:50 -0700 Spew the log only on failure. It needs to show up on the bots too. 510802 3 aroben 2011-11-29 08:40:39 -0800 I'd recommend spewing when --verbose is passed or when the build fails, even if --verbose was not passed. It would be great to fix this so we can investigate bug 73326. 511784 4 aroben 2011-11-30 08:50:02 -0800 I'm going to take a stab at this. 511904 5 117227 aroben 2011-11-30 11:03:16 -0800 Created attachment 117227 Make NRWT show DRT/WTR build logs when the build fails or --verbose is passed 511908 6 117227 eric 2011-11-30 11:06:32 -0800 Comment on attachment 117227 Make NRWT show DRT/WTR build logs when the build fails or --verbose is passed LGTM. Thanks! 511921 7 aroben 2011-11-30 11:13:24 -0800 Committed r101534: <http://trac.webkit.org/changeset/101534> 117227 2011-11-30 11:03:16 -0800 2011-11-30 11:06:32 -0800 Make NRWT show DRT/WTR build logs when the build fails or --verbose is passed bug-71160-20111130140314.patch text/plain 9224 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNTIxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWMxYmU4NTYyYzEwZDc0MDY0ODZjYjY1NmU4YTlhMjY0 ZjBiODg4My4uYmZjOWJlNDZiYTVmN2EyOTVkNTdlYTY2N2U4YzI1OTU4MjQ4OTc2YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4 IEBACiAyMDExLTExLTMwICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAorICAgICAg ICBNYWtlIE5SV1Qgc2hvdyBEUlQvV1RSIGJ1aWxkIGxvZ3Mgd2hlbiB0aGUgYnVpbGQgZmFpbHMg b3IgLS12ZXJib3NlIGlzIHBhc3NlZAorCisgICAgICAgIFRoaXMgd2lsbCBtYWtlIGl0IGEgbG90 IGVhc2llciB0byBpbnZlc3RpZ2F0ZSBidWlsZCBmYWlsdXJlcyBvbiB0aGUgYm90cy4KKworICAg ICAgICBGaXhlcyA8aHR0cDovL3dlYmtpdC5vcmcvYi83MTE2MD4gTlJXVCBkb2Vzbid0IHNob3cg YnVpbGQgb3V0cHV0IHdoZW4gYnVpbGRpbmcgRFJUCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v ZXhlY3V0aXZlX21vY2sucHk6CisgICAgICAgIChNb2NrRXhlY3V0aXZlLnJ1bl9jb21tYW5kKTog SW5jbHVkZSB0aGUgbW9jayBvdXRwdXQgaW4gdGhlIFNjcmlwdEVycm9yIHdlIHJhaXNlIHNpbmNl IGl0CisgICAgICAgIG1ha2VzIHRoZSBleHBlY3RlZCBvdXRwdXQgaW4gV2ViS2l0UG9ydFRlc3Qu dGVzdF9idWlsZF9kcml2ZXIgbW9yZSBjbG9zZWx5IG1pbWljIHRoZSBvdXRwdXQKKyAgICAgICAg c2VlbiBpbiBwcmFjdGljZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChNYW5hZ2VyVGVz dC50ZXN0X2h0dHBfbG9ja2luZyk6IFBhc3MgRmFsc2UgZm9yIHRoZSBjb25maWd1cmVfbG9nZ2lu ZyBwYXJhbWV0ZXIgdG8gUHJpbnRlci4KKyAgICAgICAgVGhlIFByaW50ZXIgd2FzIG1vZGlmeWlu ZyB0aGUgcm9vdCBsb2dnZXIgaW4gd2F5IHRoYXQgd291bGQgY2F1c2UgbXkgbmV3IHRlc3RzIGlu CisgICAgICAgIFdlYktpdFBvcnQudGVzdF9idWlsZF9kcml2ZXIgdG8gZmFpbC4gVGhlIHZhbHVl IG9mIHRoZSBjb25maWd1cmVfbG9nZ2luZyBwYXJhbWV0ZXIgZG9lc24ndAorICAgICAgICBzZWVt IGltcG9ydGFudCB0byB0aGUgZnVuY3Rpb25pbmcgb2YgdGhpcyB0ZXN0LCBhbmQgcGFzc2luZyBG YWxzZSBtYWtlcyBQcmludGVyIG5vdCBtb2RpZnkKKyAgICAgICAgdGhlIHJvb3QgbG9nZ2VyLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHk6 CisgICAgICAgIChXZWJLaXRQb3J0Ll9ydW5fc2NyaXB0KTogTG9nIHRoZSBvdXRwdXQgb2YgdGhl IGNvbW1hbmQgYXQgdGhlIERFQlVHIGxldmVsIHNvIGl0IHdpbGwgc2hvdworICAgICAgICB1cCB3 aGVuIC0tdmVyYm9zZSBpcyBwYXNzZWQgYnV0IG5vdCBvdGhlcndpc2UuCisgICAgICAgIChXZWJL aXRQb3J0Ll9idWlsZF9kcml2ZXIpOiBXaGVuIGFuIGVycm9yIG9jY3VycywgbG9nIHRoZSBlcnJv ciBtZXNzYWdlIGFuZCB0aGUgc2NyaXB0J3MKKyAgICAgICAgb3V0cHV0IGF0IHRoZSBFUlJPUiBs ZXZlbCBzbyBpdCB3aWxsIGFsd2F5cyBzaG93IHVwLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRfdW5pdHRlc3QucHk6CisgICAgICAgIChXZWJL aXRQb3J0VGVzdC50ZXN0X2J1aWxkX2RyaXZlcik6IFRlc3QgdGhhdCBub3RoaW5nIGlzIGxvZ2dl ZCBpbiB0aGUgbm9ybWFsLCBzdWNjZXNzZnVsCisgICAgICAgIGNhc2VzLiBUZXN0IHRoYXQgdGhl IGJ1aWxkIHNjcmlwdHMnIG91dHB1dCBpcyBsb2dnZWQgd2hlbiAtLXZlcmJvc2UgaXMgcGFzc2Vk IG9yIHRoZSBidWlsZAorICAgICAgICBmYWlscy4KKworMjAxMS0xMS0zMCAgQWRhbSBSb2JlbiAg PGFyb2JlbkBhcHBsZS5jb20+CisKICAgICAgICAgQWRkIGEgd2F5IHRvIHNldCBPdXRwdXRDYXB0 dXJlJ3MgbG9nIGxldmVsCiAKICAgICAgICAgVGhpcyB3aWxsIGJlIHVzZWQgYnkgc29tZSB1bml0 IHRlc3RzIEknbSBwbGFubmluZyB0byBhZGQuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlX21vY2sucHkKaW5kZXggOGIzOTY2OGM5NTcz N2Q2MzMyYjU3M2EyYjQ4MGM5NDAwNzdhNmZlMy4uMGJjM2M1Njc3YzBhYjVmMWM5ZjQ2YWQ2ZDdm YjMwMjkxN2FlMDkyMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL2V4ZWN1dGl2ZV9tb2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9leGVjdXRpdmVfbW9jay5weQpAQCAtNjksOSArNjksMTAgQEAgY2xhc3MgTW9j a0V4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICAgICAgaWYgZW52OgogICAgICAgICAgICAgICAg IGVudl9zdHJpbmcgPSAiLCBlbnY9JXMiICUgZW52CiAgICAgICAgICAgICBsb2coIk1PQ0sgcnVu X2NvbW1hbmQ6ICVzLCBjd2Q9JXMlcyIgJSAoYXJncywgY3dkLCBlbnZfc3RyaW5nKSkKKyAgICAg ICAgb3V0cHV0ID0gIk1PQ0sgb3V0cHV0IG9mIGNoaWxkIHByb2Nlc3MiCiAgICAgICAgIGlmIHNl bGYuX3Nob3VsZF90aHJvdzoKLSAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKCJNT0NLIFNj cmlwdEVycm9yIikKLSAgICAgICAgcmV0dXJuICJNT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9jZXNz IgorICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IoIk1PQ0sgU2NyaXB0RXJyb3IiLCBvdXRw dXQ9b3V0cHV0KQorICAgICAgICByZXR1cm4gb3V0cHV0CiAKIAogY2xhc3MgTW9ja0V4ZWN1dGl2 ZTIob2JqZWN0KToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CmluZGV4IDEx YWM0NTM2OGEyMTQ3MGZmYTZiODEwYmQxNDM4YWRkYjRjZmU0OTYuLmVlODQ2ZWRjZTI5MGQ2ZGFm OWIyZTQ5OTkxODk0ZDQ4YmJkMzM5MzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0 dGVzdC5weQpAQCAtMTkwLDcgKzE5MCw3IEBAIGNsYXNzIE1hbmFnZXJUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAgICAgICAgcG9ydCA9IGhvc3Qu cG9ydF9mYWN0b3J5LmdldChwb3J0X25hbWU9b3B0aW9ucy5wbGF0Zm9ybSwgb3B0aW9ucz1vcHRp b25zKQogICAgICAgICBydW5fd2Via2l0X3Rlc3RzLl9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBv cnQsIG9wdGlvbnMpCi0gICAgICAgIHByaW50ZXIgPSBwcmludGluZy5QcmludGVyKHBvcnQsIG9w dGlvbnMsIFN0cmluZ0lPLlN0cmluZ0lPKCksIFN0cmluZ0lPLlN0cmluZ0lPKCksIGNvbmZpZ3Vy ZV9sb2dnaW5nPVRydWUpCisgICAgICAgIHByaW50ZXIgPSBwcmludGluZy5QcmludGVyKHBvcnQs IG9wdGlvbnMsIFN0cmluZ0lPLlN0cmluZ0lPKCksIFN0cmluZ0lPLlN0cmluZ0lPKCksIGNvbmZp Z3VyZV9sb2dnaW5nPUZhbHNlKQogICAgICAgICBtYW5hZ2VyID0gTG9ja0NoZWNraW5nTWFuYWdl cihwb3J0LCBvcHRpb25zLCBwcmludGVyKQogICAgICAgICBtYW5hZ2VyLmNvbGxlY3RfdGVzdHMo YXJncykKICAgICAgICAgbWFuYWdlci5wYXJzZV9leHBlY3RhdGlvbnMoKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRleCBkZTNl ODkzMWQxY2ZjNGI2Mjc4MWYzYmI2MmZhZTYzZDEwNmFiNWRiLi42MTlmZjU5NDA1OTZlMjQzZWM2 YmVmZDMzM2MzMzQ1NTdlZmRhYWZkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAtMTAzLDcgKzEwMyw5IEBAIGNsYXNzIFdl YktpdFBvcnQoUG9ydCk6CiAgICAgICAgICAgICBydW5fc2NyaXB0X2NvbW1hbmQuZXh0ZW5kKHNl bGYuX2FyZ3VtZW50c19mb3JfY29uZmlndXJhdGlvbigpKQogICAgICAgICBpZiBhcmdzOgogICAg ICAgICAgICAgcnVuX3NjcmlwdF9jb21tYW5kLmV4dGVuZChhcmdzKQotICAgICAgICByZXR1cm4g c2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKHJ1bl9zY3JpcHRfY29tbWFuZCwgY3dkPXNlbGYu X2NvbmZpZy53ZWJraXRfYmFzZV9kaXIoKSwgZGVjb2RlX291dHB1dD1kZWNvZGVfb3V0cHV0LCBl bnY9ZW52KQorICAgICAgICBvdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQocnVu X3NjcmlwdF9jb21tYW5kLCBjd2Q9c2VsZi5fY29uZmlnLndlYmtpdF9iYXNlX2RpcigpLCBkZWNv ZGVfb3V0cHV0PWRlY29kZV9vdXRwdXQsIGVudj1lbnYpCisgICAgICAgIF9sb2cuZGVidWcoJ091 dHB1dCBvZiAlczpcbiVzJyAlIChydW5fc2NyaXB0X2NvbW1hbmQsIG91dHB1dCkpCisgICAgICAg IHJldHVybiBvdXRwdXQKIAogICAgIGRlZiBfYnVpbGRfZHJpdmVyKHNlbGYpOgogICAgICAgICBl bnZpcm9ubWVudCA9IHNlbGYuaG9zdC5jb3B5X2N1cnJlbnRfZW52aXJvbm1lbnQoKQpAQCAtMTE5 LDggKzEyMSw4IEBAIGNsYXNzIFdlYktpdFBvcnQoUG9ydCk6CiAgICAgICAgICAgICBzZWxmLl9y dW5fc2NyaXB0KCJidWlsZC1kdW1wcmVuZGVydHJlZSIsIGVudj1lbnYpCiAgICAgICAgICAgICBp ZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgogICAgICAgICAgICAgICAg IHNlbGYuX3J1bl9zY3JpcHQoImJ1aWxkLXdlYmtpdHRlc3RydW5uZXIiLCBlbnY9ZW52KQotICAg ICAgICBleGNlcHQgU2NyaXB0RXJyb3I6Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCJGYWlsZWQg dG8gYnVpbGQgJXMiICUgc2VsZi5kcml2ZXJfbmFtZSgpKQorICAgICAgICBleGNlcHQgU2NyaXB0 RXJyb3IsIGU6CisgICAgICAgICAgICBfbG9nLmVycm9yKGUubWVzc2FnZV93aXRoX291dHB1dChv dXRwdXRfbGltaXQ9Tm9uZSkpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0 dXJuIFRydWUKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC93ZWJraXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weQppbmRleCA3NjhjNjZmNTk5NzM0MWM0MDgw ZDFhNzIxOGQ0NGQzNTUxMTNjNjhhLi45MTA1NTlhY2MwMmE2YjBjNmQzM2Q3Njc5MDg1MmNjM2U4 MWViMGM2IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dlYmtpdF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weQpAQCAtMjUsNiArMjUsNyBAQAogIyAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAoraW1wb3J0IGxvZ2dpbmcKIGltcG9ydCB1bml0dGVz dAogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0CkBAIC0x NzgsMTggKzE3OSwyNyBAQCBCVUdfU0tJUFBFRCBTS0lQIDogbWVkaWEgPSBGQUlMIiIiKQogICAg ICAgICBwb3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlKHNob3VsZF9sb2c9VHJ1ZSkKICAg ICAgICAgcG9ydC5fb3B0aW9ucyA9IE1vY2tPcHRpb25zKGNvbmZpZ3VyYXRpb249IlJlbGVhc2Ui KSAgIyBUaGlzIHNob3VsZCBub3QgYmUgbmVjZXNzYXJ5LCBidXQgSSB0aGluayBUZXN0V2ViS2l0 UG9ydCBpcyBhY3R1YWxseSByZWFkaW5nIGZyb20gZGlzayAoYW5kIHRodXMgZGV0ZWN0cyB0aGUg Y3VycmVudCBjb25maWd1cmF0aW9uKS4KICAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk1PQ0sg cnVuX2NvbW1hbmQ6IFsnVG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZScsICctLXJl bGVhc2UnXSwgY3dkPS9tb2NrLWNoZWNrb3V0LCBlbnY9eydMQ19BTEwnOiAnQycsICdNT0NLX0VO VklST05fQ09QWSc6ICcxJ31cbiIKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG91dHB1dC5hc3Nl cnRfb3V0cHV0cyhzZWxmLCBwb3J0Ll9idWlsZF9kcml2ZXIsIGV4cGVjdGVkX3N0ZGVycj1leHBl Y3RlZF9zdGRlcnIpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUob3V0cHV0LmFzc2VydF9vdXRw dXRzKHNlbGYsIHBvcnQuX2J1aWxkX2RyaXZlciwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0 ZGVyciwgZXhwZWN0ZWRfbG9ncz0nJykpCiAKLSAgICAgICAgIyBNYWtlIHN1cmUgd2hlbiBwYXNz ZWQgLS13ZWJraXQtdGVzdC1ydW5uZXIgd2ViIGJ1aWxkIHRoZSByaWdodCB0b29sLgorICAgICAg ICAjIE1ha2Ugc3VyZSB3aGVuIHBhc3NlZCAtLXdlYmtpdC10ZXN0LXJ1bm5lciB3ZSBidWlsZCB0 aGUgcmlnaHQgdG9vbC4KICAgICAgICAgcG9ydC5fb3B0aW9ucyA9IE1vY2tPcHRpb25zKHdlYmtp dF90ZXN0X3J1bm5lcj1UcnVlLCBjb25maWd1cmF0aW9uPSJSZWxlYXNlIikKICAgICAgICAgZXhw ZWN0ZWRfc3RkZXJyID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnVG9vbHMvU2NyaXB0cy9idWlsZC1k dW1wcmVuZGVydHJlZScsICctLXJlbGVhc2UnXSwgY3dkPS9tb2NrLWNoZWNrb3V0LCBlbnY9eydM Q19BTEwnOiAnQycsICdNT0NLX0VOVklST05fQ09QWSc6ICcxJ31cbk1PQ0sgcnVuX2NvbW1hbmQ6 IFsnVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXR0ZXN0cnVubmVyJywgJy0tcmVsZWFzZSddLCBj d2Q9L21vY2stY2hlY2tvdXQsIGVudj17J0xDX0FMTCc6ICdDJywgJ01PQ0tfRU5WSVJPTl9DT1BZ JzogJzEnfVxuIgotICAgICAgICBzZWxmLmFzc2VydFRydWUob3V0cHV0LmFzc2VydF9vdXRwdXRz KHNlbGYsIHBvcnQuX2J1aWxkX2RyaXZlciwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVy cikpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvdXRwdXQuYXNzZXJ0X291dHB1dHMoc2VsZiwg cG9ydC5fYnVpbGRfZHJpdmVyLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyLCBleHBl Y3RlZF9sb2dzPScnKSkKKworICAgICAgICAjIE1ha2Ugc3VyZSB3ZSBzaG93IHRoZSBidWlsZCBs b2cgd2hlbiAtLXZlcmJvc2UgaXMgcGFzc2VkLCB3aGljaCB3ZSBzaW11bGF0ZSBieSBzZXR0aW5n IHRoZSBsb2dnaW5nIGxldmVsIHRvIERFQlVHLgorICAgICAgICBvdXRwdXQuc2V0X2xvZ19sZXZl bChsb2dnaW5nLkRFQlVHKQorICAgICAgICBwb3J0Ll9vcHRpb25zID0gTW9ja09wdGlvbnMoY29u ZmlndXJhdGlvbj0iUmVsZWFzZSIpCisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1 bl9jb21tYW5kOiBbJ1Rvb2xzL1NjcmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUnLCAnLS1yZWxl YXNlJ10sIGN3ZD0vbW9jay1jaGVja291dCwgZW52PXsnTENfQUxMJzogJ0MnLCAnTU9DS19FTlZJ Uk9OX0NPUFknOiAnMSd9XG4iCisgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiT3V0cHV0IG9mIFsn VG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZScsICctLXJlbGVhc2UnXTpcbk1PQ0sg b3V0cHV0IG9mIGNoaWxkIHByb2Nlc3NcbiIKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG91dHB1 dC5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0Ll9idWlsZF9kcml2ZXIsIGV4cGVjdGVkX3N0ZGVy cj1leHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykpCisgICAgICAg IG91dHB1dC5zZXRfbG9nX2xldmVsKGxvZ2dpbmcuSU5GTykKIAogICAgICAgICAjIE1ha2Ugc3Vy ZSB0aGF0IGZhaWx1cmUgdG8gYnVpbGQgcmV0dXJucyBGYWxzZS4KICAgICAgICAgcG9ydC5fZXhl Y3V0aXZlID0gTW9ja0V4ZWN1dGl2ZShzaG91bGRfbG9nPVRydWUsIHNob3VsZF90aHJvdz1UcnVl KQogICAgICAgICAjIEJlY2F1c2UgV0syIGN1cnJlbnRseSBoYXMgdG8gYnVpbGQgYm90aCB3ZWJr aXR0ZXN0cnVubmVyIGFuZCBEUlQsIGlmIERSVCBmYWlscywgdGhhdCdzIHRoZSBvbmx5IG9uZSBp dCB0cmllcy4KICAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsn VG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZScsICctLXJlbGVhc2UnXSwgY3dkPS9t b2NrLWNoZWNrb3V0LCBlbnY9eydMQ19BTEwnOiAnQycsICdNT0NLX0VOVklST05fQ09QWSc6ICcx J31cbiIKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShvdXRwdXQuYXNzZXJ0X291dHB1dHMoc2Vs ZiwgcG9ydC5fYnVpbGRfZHJpdmVyLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKSkK KyAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICJNT0NLIFNjcmlwdEVycm9yXG5cbk1PQ0sgb3V0cHV0 IG9mIGNoaWxkIHByb2Nlc3NcbiIKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShvdXRwdXQuYXNz ZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5fYnVpbGRfZHJpdmVyLCBleHBlY3RlZF9zdGRlcnI9ZXhw ZWN0ZWRfc3RkZXJyLCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpKQogCiAgICAgZGVmIF9h c3NlcnRfY29uZmlnX2ZpbGVfZm9yX3BsYXRmb3JtKHNlbGYsIHBvcnQsIHBsYXRmb3JtLCBjb25m aWdfZmlsZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuX2FwYWNoZV9jb25maWdf ZmlsZV9uYW1lX2Zvcl9wbGF0Zm9ybShwbGF0Zm9ybSksIGNvbmZpZ19maWxlKQo=