139786 2014-12-18 12:10:39 -0800 Perf tests frequently fail saying "build not up to date" 2014-12-19 09:42:44 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=139818 P2 Normal --- 139811 1 ap ap dburkart lforschler ossy rniwa oldest_to_newest 1056859 0 ap 2014-12-18 12:10:39 -0800 E.g.: https://build.webkit.org/builders/Apple%20MountainLion%20Release%20%28Perf%29/builds/10909/steps/perf-test/logs/stdio CompileC /Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/DumpRenderTree.build/Release/DumpRenderTree\ (Library).build/Objects-normal/x86_64/EditingDelegate.o mac/EditingDelegate.mm normal x86_64 objective-c++ com.apple.compilers.llvm.clang.1_0.compiler cd /Volumes/Data/slave/mountainlion-release-perf-tests/build/Tools/DumpRenderTree export LANG=en_US.US-ASCII /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c++ -arch x86_64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu++11 -stdlib=libc++ -Wno-trigraphs -fno-rtti -fpascal-strings -Os -Werror -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-implicit-atomic-properties -Wno-receiver-is-weak -Wno-arc-repeated-use-of-weak -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wno-shorten-64-to-32 -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -Wno-c++11-extensions -DNDEBUG -DENABLE_DASHBOARD_SUPPORT -DWEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wno-deprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.8 -g -Wno-sign-conversion -I/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/DumpRenderTree.build/Release/DumpRenderTree\ (Library).build/DumpRenderTree.hmap -I/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/Release/include -I/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/Release/usr/local/include -I/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/Release/WebCoreTestSupport -IForwardingHeaders -Imac/InternalHeaders -I/usr/local/include/WebCoreTestSupport -I/Volumes/Data/slave/mountainlion-release-perf-tests/build/Tools/DumpRenderTree/../../Source/JavaScriptCore/icu -I/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/DumpRenderTree.build/Release/DumpRenderTree\ (Library).build/DerivedSources/x86_64 -I/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/DumpRenderTree.build/Release/DumpRenderTree\ (Library).build/DerivedSources -Wall -W -Wno-unused-parameter -Wundef -F/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/Release -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Quartz.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/ApplicationServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/WebKit.framework/Frameworks -include /Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/PrecompiledHeaders/DumpRenderTreePrefix-eznzwvgtqfndrdhafdiqkocjvhoa/DumpRenderTreePrefix.h -MMD -MT dependencies -MF /Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/DumpRenderTree.build/Release/DumpRenderTree\ (Library).build/Objects-normal/x86_64/EditingDelegate.d --serialize-diagnostics /Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/DumpRenderTree.build/Release/DumpRenderTree\ (Library).build/Objects-normal/x86_64/EditingDelegate.dia -c /Volumes/Data/slave/mountainlion-release-perf-tests/build/Tools/DumpRenderTree/mac/EditingDelegate.mm -o /Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/DumpRenderTree.build/Release/DumpRenderTree\ (Library).build/Objects-normal/x86_64/EditingDelegate.o fatal error: file '/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/Release/usr/local/include/wtf/FeatureDefines.h' has been modified since the precompiled header '/Volumes/Data/slave/mountainlion-release-perf-tests/build/WebKitBuild/PrecompiledHeaders/DumpRenderTreePrefix-eznzwvgtqfndrdhafdiqkocjvhoa/DumpRenderTreePrefix.h.pch' was built 1 error generated. 1056860 1 243512 ap 2014-12-18 12:17:17 -0800 Created attachment 243512 proposed fix 1056903 2 ap 2014-12-18 14:51:50 -0800 Committed <http://trac.webkit.org/r177529>. 1056913 3 243512 ap 2014-12-18 15:07:57 -0800 Comment on attachment 243512 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=243512&action=review > Tools/ChangeLog:12 > + Also, removed unused "build and perf test" code. This were actually used, just under a different name (string manipulation for class name === evil). Rolled out this part in r177533. 1056914 4 ap 2014-12-18 15:12:12 -0800 More fixes needed. 1056915 5 243523 ap 2014-12-18 15:14:39 -0800 Created attachment 243523 proposed re-fix 1056917 6 lforschler 2014-12-18 15:17:20 -0800 looks good to me. 1056918 7 ap 2014-12-18 15:22:59 -0800 Committed <http://trac.webkit.org/r177535>. 1056923 8 rniwa 2014-12-18 15:37:48 -0800 Retroactively r=me. 243512 2014-12-18 12:17:17 -0800 2014-12-18 15:14:39 -0800 proposed fix PerfTests.txt text/plain 4343 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NzUxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE0LTEyLTE4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFBlcmYgdGVzdHMgZnJlcXVlbnRseSBmYWlsIHNheWluZyAiYnVpbGQgbm90 IHVwIHRvIGRhdGUiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzk3ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBQZXJmIHRlc3RzIG9ubHkgYnVpbGQgRHVtcFJlbmRlclRyZWUsIG5vdCBXZWJLaXQgaXRz ZWxmLiBKdXN0IGNsZWFuIHRoZSBidWlsZAorICAgICAgICBkaXJlY3RvcnkgdG8gZ2V0IHJpZCBv ZiBzdGFsZSBwcmVjb21waWxlZCBoZWFkZXJzLCBhbmQgbGV0IGl0IHJlYnVpbGQKKyAgICAgICAg RHVtcFJlbmRlclRyZWUgZWFjaCB0aW1lLCB0aGF0J3MgZmFzdC4KKworICAgICAgICBBbHNvLCBy ZW1vdmVkIHVudXNlZCAiYnVpbGQgYW5kIHBlcmYgdGVzdCIgY29kZS4KKworICAgICAgICAqIEJ1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOgorCiAy MDE0LTEyLTE4ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFtXaW5dIENvcnJlY3QgV2luZG93cyB0ZXN0cyBhZnRlciBCdWcgMTM5MTQ5IChlZGl0KQpJbmRl eDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmln Lmpzb24KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvY29uZmlnLmpzb24JKHJldmlzaW9uIDE3NzQ2NikKKysrIFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uCSh3b3JraW5n IGNvcHkpCkBAIC0xMDcsNiArMTA3LDcgQEAKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAg ICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkFwcGxlIE1v dW50YWluTGlvbiBSZWxlYXNlIChQZXJmKSIsICJ0eXBlIjogIkRvd25sb2FkQW5kUGVyZlRlc3Qi LCAiYnVpbGRkaXIiOiAibW91bnRhaW5saW9uLXJlbGVhc2UtcGVyZi10ZXN0cyIsCisgICAgICAg ICAgICAgICAgICAgICAgImlzX2NsZWFuIjogdHJ1ZSwKICAgICAgICAgICAgICAgICAgICAgICAi cGxhdGZvcm0iOiAibWFjLW1vdW50YWlubGlvbiIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2Ui LCAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0sCiAgICAgICAgICAgICAgICAgICAgICAgInNs YXZlbmFtZXMiOiBbImJvdDE0MSJdCiAgICAgICAgICAgICAgICAgICAgIH0sCkBAIC0xNDcsNiAr MTQ4LDcgQEAKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgewog ICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkFwcGxlIE1hdmVyaWNrcyBSZWxlYXNlIChQ ZXJmKSIsICJ0eXBlIjogIkRvd25sb2FkQW5kUGVyZlRlc3QiLCAiYnVpbGRkaXIiOiAibWF2ZXJp Y2tzLXJlbGVhc2UtcGVyZi10ZXN0cyIsCisgICAgICAgICAgICAgICAgICAgICAgImlzX2NsZWFu IjogdHJ1ZSwKICAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAibWFjLW1hdmVyaWNr cyIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0 Il0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImJvdDEzNSJdCiAgICAg ICAgICAgICAgICAgICAgIH0sCkBAIC0xODcsNiArMTg5LDcgQEAKICAgICAgICAgICAgICAgICAg ICAgfSwKICAgICAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICAgICJuYW1l IjogIkFwcGxlIFlvc2VtaXRlIFJlbGVhc2UgKFBlcmYpIiwgInR5cGUiOiAiRG93bmxvYWRBbmRQ ZXJmVGVzdCIsICJidWlsZGRpciI6ICJ5b3NlbWl0ZS1yZWxlYXNlLXBlcmYtdGVzdHMiLAorICAg ICAgICAgICAgICAgICAgICAgICJpc19jbGVhbiI6IHRydWUsCiAgICAgICAgICAgICAgICAgICAg ICAgInBsYXRmb3JtIjogIm1hYy15b3NlbWl0ZSIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2Ui LCAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0sCiAgICAgICAgICAgICAgICAgICAgICAgInNs YXZlbmFtZXMiOiBbImJvdDE5NCJdCiAgICAgICAgICAgICAgICAgICAgIH0sCkBAIC0yNDYsNiAr MjQ5LDcgQEAKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgewog ICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkdUSyBMaW51eCA2NC1iaXQgUmVsZWFzZSAo UGVyZikiLCAidHlwZSI6ICJEb3dubG9hZEFuZFBlcmZUZXN0V2ViS2l0MiIsICJidWlsZGRpciI6 ICJndGstbGludXgtNjQtcmVsZWFzZS1wZXJmLXRlc3RzIiwKKyAgICAgICAgICAgICAgICAgICAg ICAiaXNfY2xlYW4iOiB0cnVlLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJn dGsiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82 NCJdLAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJndGstbGludXgtc2xh dmUtOCJdCiAgICAgICAgICAgICAgICAgICAgIH0sCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcJ KHJldmlzaW9uIDE3NzQ2NikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL21hc3Rlci5jZmcJKHdvcmtpbmcgY29weSkKQEAgLTkwNywxOCArOTA3LDYg QEAgY2xhc3MgVGVzdExlYWtzRmFjdG9yeShUZXN0RmFjdG9yeSk6CiBjbGFzcyBUZXN0V2ViS2l0 MkZhY3RvcnkoVGVzdEZhY3RvcnkpOgogICAgIExheW91dFRlc3RDbGFzcyA9IFJ1bldlYktpdDJU ZXN0cwogCi1jbGFzcyBCdWlsZEFuZFBlcmZUZXN0RmFjdG9yeShGYWN0b3J5KToKLSAgICBkZWYg X19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGFk ZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgU1ZOTWlycm9yPU5vbmUsICoqa3dhcmdzKToKLSAgICAg ICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0 ZWN0dXJlcywgRmFsc2UsIGFkZGl0aW9uYWxBcmd1bWVudHMsIFNWTk1pcnJvciwgKiprd2FyZ3Mp Ci0gICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlV2ViS2l0KCkpCi0gICAgICAgIHNlbGYuYWRk U3RlcChSdW5BbmRVcGxvYWRQZXJmVGVzdHMoKSkKLQotY2xhc3MgQnVpbGRBbmRQZXJmVGVzdFdl YktpdDJGYWN0b3J5KEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwg Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCBT Vk5NaXJyb3I9Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYs IHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25h bEFyZ3VtZW50cywgU1ZOTWlycm9yLCAqKmt3YXJncykKLSAgICAgICAgc2VsZi5hZGRTdGVwKENv bXBpbGVXZWJLaXQoKSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkFuZFVwbG9hZFBlcmZUZXN0 c1dlYktpdDIoKSkKLQogY2xhc3MgRG93bmxvYWRBbmRQZXJmVGVzdEZhY3RvcnkoRmFjdG9yeSk6 CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmVzLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIFNWTk1pcnJvcj1Ob25lLCAqKmt3YXJn cyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnRzLCBTVk5NaXJyb3Is ICoqa3dhcmdzKQo= 243523 2014-12-18 15:14:39 -0800 2014-12-18 15:23:06 -0800 proposed re-fix PerfTests.txt text/plain 5109 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NzUzMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE0LTEyLTE4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFBlcmYgdGVzdHMgZnJlcXVlbnRseSBmYWlsIHNheWluZyAiYnVpbGQgbm90 IHVwIHRvIGRhdGUiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzk3ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVbmRvIHRoZSByZXN0IG9mIHRoZSBmaXJzdCBmaXgsIGFuZCBpbXBsZW1lbnQgdGhlIGJl aGF2aW9yIGRpZmZlcmVudGx5LgorCisgICAgICAgIGlzX2NsZWFuIGlzbid0IGF1dG9tYXRpY2Fs bHkgZm9yd2FyZGVkIGZyb20gY29uZmlnLmpzb24gdG8gcHJvcGVydGllcy4KKworICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOgor ICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmc6CisgICAgICAgIChDbGVhbkJ1aWxkVW5jb25kaXRpb25hbGx5KToKKyAgICAgICAgKENs ZWFuQnVpbGRVbmNvbmRpdGlvbmFsbHkuc3RhcnQpOgorICAgICAgICAoRG93bmxvYWRBbmRQZXJm VGVzdEZhY3RvcnkuX19pbml0X18pOgorICAgICAgICAoRG93bmxvYWRBbmRQZXJmVGVzdFdlYktp dDJGYWN0b3J5Ll9faW5pdF9fKToKKwogMjAxNC0xMi0xOCAgQWxleGV5IFByb3NrdXJ5YWtvdiAg PGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSb2xsIG91dCBwYXJ0IG9mIHRoZSBwcmV2aW91cyBw YXRjaCAtIEJ1aWxkQW5kUGVyZlRlc3RXZWJLaXQyIGlzIHVzZWQgYnkgRWZsLgpJbmRleDogVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvY29uZmlnLmpzb24JKHJldmlzaW9uIDE3NzUyOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uCSh3b3JraW5nIGNvcHkp CkBAIC0xMDcsNyArMTA3LDYgQEAKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAg ICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkFwcGxlIE1vdW50YWlu TGlvbiBSZWxlYXNlIChQZXJmKSIsICJ0eXBlIjogIkRvd25sb2FkQW5kUGVyZlRlc3QiLCAiYnVp bGRkaXIiOiAibW91bnRhaW5saW9uLXJlbGVhc2UtcGVyZi10ZXN0cyIsCi0gICAgICAgICAgICAg ICAgICAgICAgImlzX2NsZWFuIjogdHJ1ZSwKICAgICAgICAgICAgICAgICAgICAgICAicGxhdGZv cm0iOiAibWFjLW1vdW50YWlubGlvbiIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJj aGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFt ZXMiOiBbImJvdDE0MSJdCiAgICAgICAgICAgICAgICAgICAgIH0sCkBAIC0xNDgsNyArMTQ3LDYg QEAKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgewogICAgICAg ICAgICAgICAgICAgICAgICJuYW1lIjogIkFwcGxlIE1hdmVyaWNrcyBSZWxlYXNlIChQZXJmKSIs ICJ0eXBlIjogIkRvd25sb2FkQW5kUGVyZlRlc3QiLCAiYnVpbGRkaXIiOiAibWF2ZXJpY2tzLXJl bGVhc2UtcGVyZi10ZXN0cyIsCi0gICAgICAgICAgICAgICAgICAgICAgImlzX2NsZWFuIjogdHJ1 ZSwKICAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAibWFjLW1hdmVyaWNrcyIsICJj b25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0sCiAg ICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImJvdDEzNSJdCiAgICAgICAgICAg ICAgICAgICAgIH0sCkBAIC0xODksNyArMTg3LDYgQEAKICAgICAgICAgICAgICAgICAgICAgfSwK ICAgICAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkFw cGxlIFlvc2VtaXRlIFJlbGVhc2UgKFBlcmYpIiwgInR5cGUiOiAiRG93bmxvYWRBbmRQZXJmVGVz dCIsICJidWlsZGRpciI6ICJ5b3NlbWl0ZS1yZWxlYXNlLXBlcmYtdGVzdHMiLAotICAgICAgICAg ICAgICAgICAgICAgICJpc19jbGVhbiI6IHRydWUsCiAgICAgICAgICAgICAgICAgICAgICAgInBs YXRmb3JtIjogIm1hYy15b3NlbWl0ZSIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJj aGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFt ZXMiOiBbImJvdDE5NCJdCiAgICAgICAgICAgICAgICAgICAgIH0sCkBAIC0yNDksNyArMjQ2LDYg QEAKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgewogICAgICAg ICAgICAgICAgICAgICAgICJuYW1lIjogIkdUSyBMaW51eCA2NC1iaXQgUmVsZWFzZSAoUGVyZiki LCAidHlwZSI6ICJEb3dubG9hZEFuZFBlcmZUZXN0V2ViS2l0MiIsICJidWlsZGRpciI6ICJndGst bGludXgtNjQtcmVsZWFzZS1wZXJmLXRlc3RzIiwKLSAgICAgICAgICAgICAgICAgICAgICAiaXNf Y2xlYW4iOiB0cnVlLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJndGsiLCAi Y29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLAog ICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJndGstbGludXgtc2xhdmUtOCJd CiAgICAgICAgICAgICAgICAgICAgIH0sCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcJKHJldmlz aW9uIDE3NzUzMykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL21hc3Rlci5jZmcJKHdvcmtpbmcgY29weSkKQEAgLTE2MSw2ICsxNjEsMTUgQEAgY2xh c3MgQ2xlYW5CdWlsZElmU2NoZWR1bGVkKHNoZWxsLkNvbXBpbAogICAgICAgICAgICAgcmV0dXJu IFNLSVBQRUQKICAgICAgICAgcmV0dXJuIHNoZWxsLkNvbXBpbGUuc3RhcnQoc2VsZikKIAorY2xh c3MgQ2xlYW5CdWlsZFVuY29uZGl0aW9uYWxseShzaGVsbC5Db21waWxlKToKKyAgICBuYW1lID0g ImRlbGV0ZSBXZWJLaXRCdWlsZCBkaXJlY3RvcnkiCisgICAgZGVzY3JpcHRpb24gPSBbImRlbGV0 aW5nIFdlYktpdEJ1aWxkIGRpcmVjdG9yeSJdCisgICAgZGVzY3JpcHRpb25Eb25lID0gWyJkZWxl dGVkIFdlYktpdEJ1aWxkIGRpcmVjdG9yeSJdCisgICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4v VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvY2xlYW4tYnVpbGQiLCBXaXRoUHJvcGVydGllcygiLS1w bGF0Zm9ybT0lKGZ1bGxQbGF0Zm9ybSlzIiksIFdpdGhQcm9wZXJ0aWVzKCItLSUoY29uZmlndXJh dGlvbilzIildCisKKyAgICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAgIHJldHVybiBzaGVsbC5D b21waWxlLnN0YXJ0KHNlbGYpCisKIGNsYXNzIERlbGV0ZVN0YWxlQnVpbGRGaWxlcyhzaGVsbC5D b21waWxlKToKICAgICBuYW1lID0gImRlbGV0ZSBzdGFsZSBidWlsZCBmaWxlcyIKICAgICBkZXNj cmlwdGlvbiA9IFsiZGVsZXRpbmcgc3RhbGUgYnVpbGQgZmlsZXMiXQpAQCAtOTIyLDYgKzkzMSw3 IEBAIGNsYXNzIEJ1aWxkQW5kUGVyZlRlc3RXZWJLaXQyRmFjdG9yeShGYWMKIGNsYXNzIERvd25s b2FkQW5kUGVyZlRlc3RGYWN0b3J5KEZhY3RvcnkpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBw bGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYWRkaXRpb25hbEFyZ3VtZW50 cz1Ob25lLCBTVk5NaXJyb3I9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBGYWN0b3J5Ll9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwg YWRkaXRpb25hbEFyZ3VtZW50cywgU1ZOTWlycm9yLCAqKmt3YXJncykKKyAgICAgICAgc2VsZi5h ZGRTdGVwKENsZWFuQnVpbGRVbmNvbmRpdGlvbmFsbHkoKSkKICAgICAgICAgc2VsZi5hZGRTdGVw KERvd25sb2FkQnVpbHRQcm9kdWN0KCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChFeHRyYWN0QnVp bHRQcm9kdWN0KCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChSdW5BbmRVcGxvYWRQZXJmVGVzdHMo KSkKQEAgLTkyOSw2ICs5MzksNyBAQCBjbGFzcyBEb3dubG9hZEFuZFBlcmZUZXN0RmFjdG9yeShG YWN0b3J5CiBjbGFzcyBEb3dubG9hZEFuZFBlcmZUZXN0V2ViS2l0MkZhY3RvcnkoRmFjdG9yeSk6 CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmVzLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIFNWTk1pcnJvcj1Ob25lLCAqKmt3YXJn cyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnRzLCBTVk5NaXJyb3Is ICoqa3dhcmdzKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ2xlYW5CdWlsZFVuY29uZGl0aW9uYWxs eSgpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoRG93bmxvYWRCdWlsdFByb2R1Y3QoKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKEV4dHJhY3RCdWlsdFByb2R1Y3QoKSkKICAgICAgICAgc2VsZi5hZGRT dGVwKFJ1bkFuZFVwbG9hZFBlcmZUZXN0c1dlYktpdDIoKSkK