145319 2015-05-22 14:09:42 -0700 [iOS] Cannot run run-webkit-tests with public SDK; LayoutTestRelay fails to build 2015-06-11 15:31:28 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified OS X 10.10 RESOLVED FIXED P2 Normal --- 1 dusek dbates beidson dbates ddkilzer oldest_to_newest 1096948 0 dusek 2015-05-22 14:09:42 -0700 Steps to reproduce: 1. Checkout webkit 2. Tools/Scripts/build-webkit --debug --ios-simulator 3. Tools/Scripts/run-webkit-tests --debug --ios-simulator Expected Results: Tests would run. Actual Results: Tests do not start to run due to LayoutTestRelay missing, which fails to compile due to CoreSimulator/CoreSimulator.h missing: $ Tools/Scripts/run-webkit-tests --debug --ios-simulator Using port 'ios-simulator-wk2' Test configuration: <, x86_64, debug> Placing test results in /path/to/webkit/WebKitBuild/Debug-iphonesimulator/layout-test-results Baseline search path: ios-simulator-wk2 -> ios-simulator -> wk2 -> generic Using Debug build Pixel tests disabled Regular timeout: 30000, slow test timeout: 150000 Command line: /path/to/webkit/WebKitBuild/Debug/LayoutTestRelay -runtime com.apple.CoreSimulator.SimRuntime.iOS-8-3 -deviceType com.apple.CoreSimulator.SimDeviceType.iPhone-5s -suffix 0 -productDir /path/to/webkit/WebKitBuild/Debug-iphonesimulator -app /path/to/webkit/WebKitBuild/Debug-iphonesimulator/WebKitTestRunnerApp.app -- - --lint-test-files warnings: LayoutTests/TestExpectations:526 More specific entry for js/regress-141098.html on line LayoutTests/TestExpectations:526 overrides line LayoutTests/TestExpectations:520. js/regress-141098.html Found 39665 tests; running 33918, skipping 5747. Failed to run "['Tools/Scripts/build-layouttestrelay', '--debug']" exit_code: 65 cwd: /path/to/webkit 2015-05-22 22:49:54.084 xcodebuild[37287:1390676] [MT] PluginLoading: Required plug-in compatibility UUID E969541F-E6F9-4D25-8158-72DC3545A6C6 for plug-in at path '~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/VVDocumenter-Xcode.xcplugin' not present in DVTPlugInCompatibilityUUIDs 2015-05-22 22:49:54.085 xcodebuild[37287:1390676] [MT] PluginLoading: Required plug-in compatibility UUID E969541F-E6F9-4D25-8158-72DC3545A6C6 for plug-in at path '~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/Lin.xcplugin' not present in DVTPlugInCompatibilityUUIDs 2015-05-22 22:49:54.086 xcodebuild[37287:1390676] [MT] PluginLoading: Required plug-in compatibility UUID E969541F-E6F9-4D25-8158-72DC3545A6C6 for plug-in at path '~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/ClangFormat.xcplugin' not present in DVTPlugInCompatibilityUUIDs 2015-05-22 22:49:54.086 xcodebuild[37287:1390676] [MT] PluginLoading: Required plug-in compatibility UUID E969541F-E6F9-4D25-8158-72DC3545A6C6 for plug-in at path '~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/Alcatraz.xcplugin' not present in DVTPlugInCompatibilityUUIDs 2015-05-22 22:49:54.087 xcodebuild[37287:1390676] [MT] PluginLoading: Required plug-in compatibility UUID E969541F-E6F9-4D25-8158-72DC3545A6C6 for plug-in at path '~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/AdjustFontSize.xcplugin' not present in DVTPlugInCompatibilityUUIDs Build settings from command line: ARCHS = x86_64 OBJROOT = /path/to/webkit/WebKitBuild SHARED_PRECOMPS_DIR = /path/to/webkit/WebKitBuild/PrecompiledHeaders SYMROOT = /path/to/webkit/WebKitBuild === BUILD TARGET LayoutTestRelay OF PROJECT LayoutTestRelay WITH CONFIGURATION Debug === Check dependencies CompileC /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTRelayController.o LayoutTestRelay/LTRelayController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler cd /path/to/webkit/Tools/LayoutTestRelay 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=gnu99 -fobjc-arc -Wno-trigraphs -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-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 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -DNDEBUG -DENABLE_DASHBOARD_SUPPORT -DWEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wno-deprecated-declarations -mmacosx-version-min=10.10 -g -fvisibility=hidden -Wno-sign-conversion -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/LayoutTestRelay.hmap -I/path/to/webkit/WebKitBuild/Debug/include -I/path/to/webkit/WebKitBuild/Debug/usr/local/include -I/ForwardingHeaders -I/path/to/webkit/Tools/LayoutTestRelay/../../Source/JavaScriptCore/icu -I/usr/local/include/WebCoreTestSupport -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/DerivedSources/x86_64 -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/DerivedSources -Wall -W -Wno-unused-parameter -Wundef -F/path/to/webkit/WebKitBuild/Debug -F/Applications/Xcode.app/Contents/Developer/Library/PrivateFrameworks -MMD -MT dependencies -MF /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTRelayController.d --serialize-diagnostics /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTRelayController.dia -c /path/to/webkit/Tools/LayoutTestRelay/LayoutTestRelay/LTRelayController.m -o /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTRelayController.o CompileC /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTPipeRelay.o LayoutTestRelay/LTPipeRelay.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler cd /path/to/webkit/Tools/LayoutTestRelay 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=gnu99 -fobjc-arc -Wno-trigraphs -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-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 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -DNDEBUG -DENABLE_DASHBOARD_SUPPORT -DWEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wno-deprecated-declarations -mmacosx-version-min=10.10 -g -fvisibility=hidden -Wno-sign-conversion -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/LayoutTestRelay.hmap -I/path/to/webkit/WebKitBuild/Debug/include -I/path/to/webkit/WebKitBuild/Debug/usr/local/include -I/ForwardingHeaders -I/path/to/webkit/Tools/LayoutTestRelay/../../Source/JavaScriptCore/icu -I/usr/local/include/WebCoreTestSupport -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/DerivedSources/x86_64 -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/DerivedSources -Wall -W -Wno-unused-parameter -Wundef -F/path/to/webkit/WebKitBuild/Debug -F/Applications/Xcode.app/Contents/Developer/Library/PrivateFrameworks -MMD -MT dependencies -MF /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTPipeRelay.d --serialize-diagnostics /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTPipeRelay.dia -c /path/to/webkit/Tools/LayoutTestRelay/LayoutTestRelay/LTPipeRelay.m -o /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/LTPipeRelay.o CompileC /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/main.o LayoutTestRelay/main.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler cd /path/to/webkit/Tools/LayoutTestRelay 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=gnu99 -fobjc-arc -Wno-trigraphs -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-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 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -DNDEBUG -DENABLE_DASHBOARD_SUPPORT -DWEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wno-deprecated-declarations -mmacosx-version-min=10.10 -g -fvisibility=hidden -Wno-sign-conversion -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/LayoutTestRelay.hmap -I/path/to/webkit/WebKitBuild/Debug/include -I/path/to/webkit/WebKitBuild/Debug/usr/local/include -I/ForwardingHeaders -I/path/to/webkit/Tools/LayoutTestRelay/../../Source/JavaScriptCore/icu -I/usr/local/include/WebCoreTestSupport -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/DerivedSources/x86_64 -I/path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/DerivedSources -Wall -W -Wno-unused-parameter -Wundef -F/path/to/webkit/WebKitBuild/Debug -F/Applications/Xcode.app/Contents/Developer/Library/PrivateFrameworks -MMD -MT dependencies -MF /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/main.d --serialize-diagnostics /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/main.dia -c /path/to/webkit/Tools/LayoutTestRelay/LayoutTestRelay/main.m -o /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/main.o /path/to/webkit/Tools/LayoutTestRelay/LayoutTestRelay/main.m:28:9: fatal error: 'CoreSimulator/CoreSimulator.h' file not found #import <CoreSimulator/CoreSimulator.h> ^ 1 error generated. ** BUILD FAILED ** The following build commands failed: CompileC /path/to/webkit/WebKitBuild/LayoutTestRelay.build/Debug/LayoutTestRelay.build/Objects-normal/x86_64/main.o LayoutTestRelay/main.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (1 failure) Build check failed Configuration: $ sw_vers ProductName: Mac OS X ProductVersion: 10.10.3 BuildVersion: 14D136 $ clang -v Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) Target: x86_64-apple-darwin14.3.0 Thread model: posix Xcode: 6.3.2 (6D2105) WebKit: r182888 (37f81cd45f2296206e45ea101e912f8cf273f390) 1097089 1 dusek 2015-05-23 07:02:50 -0700 Obviously forgot to mention one step in Steps reproduce, between 1. and 2.: 1.b.: sudo Tools/Scripts/configure-xcode-for-ios-development 1097096 2 dusek 2015-05-23 08:10:49 -0700 Finally, for the record, building LayoutTestRelay fails with identical error when building manually with this command-line: Tools/Scripts/build-layouttestrelay --debug --ios-simulator 1101190 3 254697 dbates 2015-06-10 18:13:22 -0700 Created attachment 254697 Patch 1101409 4 dusek 2015-06-11 13:58:25 -0700 I can confirm that after applying the patch, the issue is no longer present, i.e. the tests run: $ Tools/Scripts/run-webkit-tests --debug --ios-simulator LayoutTests/fast/events/pageshow-pagehide-on-back-cached.html Using port 'ios-simulator-wk2' Test configuration: <, x86_64, debug> Placing test results in path/to/webkit/WebKitBuild/Debug-iphonesimulator/layout-test-results Baseline search path: ios-simulator-wk2 -> ios-simulator -> wk2 -> generic Using Debug build Pixel tests disabled Regular timeout: 30000, slow test timeout: 150000 Command line: path/to/webkit/WebKitBuild/Debug/LayoutTestRelay -runtime com.apple.CoreSimulator.SimRuntime.iOS-8-3 -deviceType com.apple.CoreSimulator.SimDeviceType.iPhone-5s -suffix 0 -productDir path/to/webkit/WebKitBuild/Debug-iphonesimulator -app path/to/webkit/WebKitBuild/Debug-iphonesimulator/WebKitTestRunnerApp.app -- - --lint-test-files warnings: LayoutTests/platform/ios-simulator/TestExpectations:241 Path does not exist. compositing/animation/filling-animation-overlap-at-end.html LayoutTests/platform/ios-simulator/TestExpectations:242 Path does not exist. compositing/animation/filling-animation-overlap.html LayoutTests/platform/ios-simulator/TestExpectations:2647 Path does not exist. fast/dom/timer-throttle-on-scrolling-iframe-away.html Found 1 test; running 1, skipping 0. Running 1 WebKitTestRunnerApp.app. The test ran as expected. $ <shell prompt> 1101428 5 254697 ddkilzer 2015-06-11 15:28:10 -0700 Comment on attachment 254697 Patch r=me 1101430 6 dbates 2015-06-11 15:31:28 -0700 Committed r185478: <http://trac.webkit.org/changeset/185478> 254697 2015-06-10 18:13:22 -0700 2015-06-11 15:28:10 -0700 Patch bug-145319-20150610181249.patch text/plain 6543 dbates SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTQ0MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE1LTA2LTEwICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4K KworICAgICAgICBbaU9TXSBDYW5ub3QgcnVuIHJ1bi13ZWJraXQtdGVzdHMgd2l0aCBwdWJsaWMg U0RLOyBMYXlvdXRUZXN0UmVsYXkgZmFpbHMgdG8gYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTMxOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBTUEkgd3JhcHBlciBoZWFkZXIgZm9yIENv cmVTaW11bGF0b3IgYW5kIHVwZGF0ZSB0aGUgc291cmNlIGZpbGVzIHRvIHJlZmVyZW5jZQorICAg ICAgICBpdCBpbnN0ZWFkIG9mIGRpcmVjdGx5IHJlZmVyZW5jaW5nIHRoZSBDb3JlU2ltdWxhdG9y IGhlYWRlci4KKworICAgICAgICAqIExheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBMYXlvdXRUZXN0UmVsYXkvTGF5b3V0 VGVzdFJlbGF5L0NvcmVTaW11bGF0b3JTUEkuaDogQWRkZWQuCisgICAgICAgICogTGF5b3V0VGVz dFJlbGF5L0xheW91dFRlc3RSZWxheS9MVFJlbGF5Q29udHJvbGxlci5tOgorICAgICAgICAqIExh eW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkvbWFpbi5tOgorCiAyMDE1LTA2LTEwICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0NvbnRl bnQgRXh0ZW5zaW9uc10gTWFrZSBtYXggTkZBIHNpemUgYW5kIG1heCBydWxlIGNvdW50IHVzZXIg ZGVmYXVsdHMuCkluZGV4OiBUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5Lnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvTGF5b3V0VGVzdFJl bGF5L0xheW91dFRlc3RSZWxheS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAx ODUzNjYpCisrKyBUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5Lnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKIAkJMkU4 RDNGMDMxOTg4MUZFMjAwNEY2Q0MyIC8qIExUUGlwZVJlbGF5LmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExU UGlwZVJlbGF5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJFOEQzRjA0MTk4ODI0 MDYwMDRGNkNDMiAvKiBMVFJlbGF5Q29udHJvbGxlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBMVFJlbGF5Q29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQkyRThEM0YwNTE5ODgyNDA2MDA0RjZDQzIgLyogTFRSZWxheUNvbnRyb2xsZXIubSAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5vYmpjOyBwYXRoID0gTFRSZWxheUNvbnRyb2xsZXIubTsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJQ0UxRkJDMTUxQjI5MEU3OTAwMDEzNkY1IC8qIENv cmVTaW11bGF0b3JTUEkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ29yZVNp bXVsYXRvclNQSS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogLyogRW5kIFBCWEZpbGVS ZWZlcmVuY2Ugc2VjdGlvbiAqLwogCiAvKiBCZWdpbiBQQlhGcmFtZXdvcmtzQnVpbGRQaGFzZSBz ZWN0aW9uICovCkBAIC02OSw2ICs3MCw3IEBACiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxk cmVuID0gKAogCQkJCTJFOEQzRUY3MTk4ODFENDMwMDRGNkNDMiAvKiBtYWluLm0gKi8sCisJCQkJ Q0UxRkJDMTUxQjI5MEU3OTAwMDEzNkY1IC8qIENvcmVTaW11bGF0b3JTUEkuaCAqLywKIAkJCQky RThEM0YwMDE5ODgxRjI5MDA0RjZDQzIgLyogTFRSZWxheS5oICovLAogCQkJCTJFOEQzRjAxMTk4 ODFGRDAwMDRGNkNDMiAvKiBMVFBpcGVSZWxheS5tICovLAogCQkJCTJFOEQzRjAzMTk4ODFGRTIw MDRGNkNDMiAvKiBMVFBpcGVSZWxheS5oICovLApJbmRleDogVG9vbHMvTGF5b3V0VGVzdFJlbGF5 L0xheW91dFRlc3RSZWxheS9Db3JlU2ltdWxhdG9yU1BJLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv TGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxheS9Db3JlU2ltdWxhdG9yU1BJLmgJKHJldmlz aW9uIDApCisrKyBUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5L0NvcmVTaW11 bGF0b3JTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDY2IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor I2lmIF9faGFzX2luY2x1ZGUoPENvcmVTaW11bGF0b3IvQ29yZVNpbXVsYXRvci5oPikKKworI2lt cG9ydCA8Q29yZVNpbXVsYXRvci9Db3JlU2ltdWxhdG9yLmg+CisKKyNlbHNlCisKKyNpbmNsdWRl IDxGb3VuZGF0aW9uL0ZvdW5kYXRpb24uaD4KKworI2RlZmluZSBrU2ltRGV2aWNlTGF1bmNoQXBw bGljYXRpb25Bcmd1bWVudHMgQCJhcmd1bWVudHMiCisjZGVmaW5lIGtTaW1EZXZpY2VMYXVuY2hB cHBsaWNhdGlvbkVudmlyb25tZW50IEAiZW52aXJvbm1lbnQiCisKK3R5cGVkZWYgTlNfRU5VTShO U1VJbnRlZ2VyLCBTaW1EZXZpY2VTdGF0ZSkgeworICAgIFNpbURldmljZVN0YXRlQ3JlYXRpbmcg PSAwLAorfTsKKworQGludGVyZmFjZSBTaW1EZXZpY2VUeXBlIDogTlNPYmplY3QKKysgKE5TRGlj dGlvbmFyeSAqKXN1cHBvcnRlZERldmljZVR5cGVzQnlJZGVudGlmaWVyOworQHByb3BlcnR5IChy ZWFkb25seSwgY29weSkgTlNTdHJpbmcgKmlkZW50aWZpZXI7CitAZW5kCisKK0BpbnRlcmZhY2Ug U2ltUnVudGltZSA6IE5TT2JqZWN0CisrIChOU0RpY3Rpb25hcnkgKilzdXBwb3J0ZWRSdW50aW1l c0J5SWRlbnRpZmllcjsKK0BlbmQKKworQGludGVyZmFjZSBTaW1EZXZpY2UgOiBOU09iamVjdAor LSAoQk9PTClpbnN0YWxsQXBwbGljYXRpb246KE5TVVJMICopaW5zdGFsbFVSTCB3aXRoT3B0aW9u czooTlNEaWN0aW9uYXJ5ICopb3B0aW9ucyBlcnJvcjooTlNFcnJvciAqKillcnJvcjsKKy0gKHBp ZF90KWxhdW5jaEFwcGxpY2F0aW9uV2l0aElEOihOU1N0cmluZyAqKWJ1bmRsZUlEIG9wdGlvbnM6 KE5TRGljdGlvbmFyeSAqKW9wdGlvbnMgZXJyb3I6KE5TRXJyb3IgKiopZXJyb3I7CitAcHJvcGVy dHkgKHJlYWRvbmx5LCByZXRhaW4pIFNpbURldmljZVR5cGUgKmRldmljZVR5cGU7CitAcHJvcGVy dHkgKHJlYWRvbmx5LCByZXRhaW4pIFNpbVJ1bnRpbWUgKnJ1bnRpbWU7CitAcHJvcGVydHkgKHJl YWRvbmx5LCBhc3NpZ24pIFNpbURldmljZVN0YXRlIHN0YXRlOworQHByb3BlcnR5IChyZWFkb25s eSwgY29weSkgTlNTdHJpbmcgKm5hbWU7CitAZW5kCisKK0BpbnRlcmZhY2UgU2ltRGV2aWNlU2V0 IDogTlNPYmplY3QKKysgKFNpbURldmljZVNldCAqKWRlZmF1bHRTZXQ7CistIChTaW1EZXZpY2Ug KiljcmVhdGVEZXZpY2VXaXRoVHlwZTooU2ltRGV2aWNlVHlwZSAqKWRldmljZVR5cGUgcnVudGlt ZTooU2ltUnVudGltZSAqKXJ1bnRpbWUgbmFtZTooTlNTdHJpbmcgKiluYW1lIGVycm9yOihOU0Vy cm9yICoqKWVycm9yOworQHByb3BlcnR5IChyZWFkb25seSwgY29weSkgTlNBcnJheSAqZGV2aWNl czsKKworQGVuZAorCisjZW5kaWYKSW5kZXg6IFRvb2xzL0xheW91dFRlc3RSZWxheS9MYXlvdXRU ZXN0UmVsYXkvTFRSZWxheUNvbnRyb2xsZXIubQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9MYXlvdXRU ZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5L0xUUmVsYXlDb250cm9sbGVyLm0JKHJldmlzaW9uIDE4 NTM2NikKKysrIFRvb2xzL0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkvTFRSZWxheUNv bnRyb2xsZXIubQkod29ya2luZyBjb3B5KQpAQCAtMjQsMTAgKzI0LDEwIEBACiAgKi8KIAogI2lt cG9ydCAiTFRSZWxheUNvbnRyb2xsZXIuaCIKLSNpbXBvcnQgIkxUUGlwZVJlbGF5LmgiCiAKKyNp bXBvcnQgIkNvcmVTaW11bGF0b3JTUEkuaCIKKyNpbXBvcnQgIkxUUGlwZVJlbGF5LmgiCiAjaW1w b3J0IDxBcHBLaXQvQXBwS2l0Lmg+Ci0jaW1wb3J0IDxDb3JlU2ltdWxhdG9yL0NvcmVTaW11bGF0 b3IuaD4KIAogQGludGVyZmFjZSBMVFJlbGF5Q29udHJvbGxlciAoKQogQHByb3BlcnR5IChyZWFk b25seSwgc3Ryb25nKSBkaXNwYXRjaF9zb3VyY2VfdCBzdGFuZGFyZElucHV0RGlzcGF0Y2hTb3Vy Y2U7CkluZGV4OiBUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5L21haW4ubQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5L21haW4u bQkocmV2aXNpb24gMTg1MzY2KQorKysgVG9vbHMvTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RS ZWxheS9tYWluLm0JKHdvcmtpbmcgY29weSkKQEAgLTIzLDkgKzIzLDggQEAKICAqIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisjaW1wb3J0ICJDb3JlU2ltdWxhdG9yU1BJ LmgiCiAjaW1wb3J0ICJMVFJlbGF5Q29udHJvbGxlci5oIgotCi0jaW1wb3J0IDxDb3JlU2ltdWxh dG9yL0NvcmVTaW11bGF0b3IuaD4KICNpbXBvcnQgPEZvdW5kYXRpb24vRm91bmRhdGlvbi5oPgog CiBzdGF0aWMgTFRSZWxheUNvbnRyb2xsZXIgKnJlbGF5Q29udHJvbGxlcjsK