191692 2018-11-15 08:36:46 -0800 REGRESSION(r238016)[GTK][TestWebKitAPI][Ninja] TestJSC can't compile "Bytecodes.h: No such file or directory" 2018-11-19 08:27:32 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=182757 InRadar P2 Normal --- 1 mcatanzaro mcatanzaro aboya annulen bugs-noreply calvaris commit-queue don.olmstead fujii jeremyhu mcatanzaro pgriffis webkit-bug-importer oldest_to_newest 1478912 0 mcatanzaro 2018-11-15 08:36:46 -0800 I don't know why the bots are happy, but I can't build locally anymore. Problem is -IDerivedSources/JavaScriptCore/ is missing from the include path. [3037/4655] Building CXX object Tools/TestWebKitAPI...TestJSC.dir/Tests/JavaScriptCore/glib/TestJSC.cpp.o FAILED: Tools/TestWebKitAPI/CMakeFiles/TestJSC.dir/Tests/JavaScriptCore/glib/TestJSC.cpp.o /usr/lib64/ccache/c++ -DBUILDING_GTK__=1 -DBUILDING_WEBKIT2__ -DBUILDING_WITH_CMAKE=1 -DBWRAP_EXECUTABLE=\"/usr/bin/bwrap\" -DDBUS_PROXY_EXECUTABLE=\"/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/xdg-dbus-proxy\" -DGETTEXT_PACKAGE=\"WebKit2GTK-4.0\" -DGTEST_CREATE_SHARED_LIBRARY=1 -DGTEST_HAS_PTHREAD=1 -DGTEST_HAS_RTTI=0 -DHAVE_CONFIG_H=1 -DJSC_GLIB_API_ENABLED -DTEST_WEBKIT2_RESOURCES_DIR=\"/home/mcatanzaro/Projects/WebKit/Tools/TestWebKitAPI/Tests/WebKit\" -DWEBKITGTK_API_VERSION_STRING=\"4.0\" -DWEBKIT_SRC_DIR=\"/home/mcatanzaro/Projects/WebKit\" -IDerivedSources/ForwardingHeaders -IDerivedSources/ForwardingHeaders/JavaScriptCore -IDerivedSources/ForwardingHeaders/JavaScriptCore/glib -IDerivedSources/JavaScriptCore/javascriptcoregtk -I../../Source/WebKit/UIProcess/API/C/soup -I../../Source/WebKit/UIProcess/API/C/gtk -I../../Source/WebKit/UIProcess/API/gtk -I../../Tools/TestWebKitAPI -I. -I../../Source -I../../Source/JavaScriptCore -I../../Source/ThirdParty/gtest/include -I../../Source/WebKit/Platform/IPC -I../../Source/WebKit/Shared -I../../Source/WebKit/Shared/API -I../../Source/WebKit/Shared/API/c -I../../Source/WebKit/Shared/Plugins -I../../Source/WebKit/UIProcess -I../../Source/WebKit/UIProcess/API -I../../Source/WebKit/UIProcess/API/C -I../../Source/WebKit/WebProcess/InjectedBundle -I../../Source/WebKit/WebProcess/InjectedBundle/API/c -I../../Source/bmalloc -IDerivedSources -I../../Source/ThirdParty -isystem ../DependenciesGTK/Root/include/gtk-3.0 -isystem ../DependenciesGTK/Root/include/pango-1.0 -isystem ../DependenciesGTK/Root/include/glib-2.0 -isystem ../DependenciesGTK/Root/lib/glib-2.0/include -isystem ../DependenciesGTK/Root/include/cairo -isystem ../DependenciesGTK/Root/include/pixman-1 -isystem ../DependenciesGTK/Root/include/freetype2 -isystem /usr/include/libpng16 -isystem ../DependenciesGTK/Root/include/libxml2 -isystem /usr/include/libdrm -isystem ../DependenciesGTK/Root/include/harfbuzz -isystem ../DependenciesGTK/Root/include/gdk-pixbuf-2.0 -isystem ../DependenciesGTK/Root/include/gio-unix-2.0 -isystem ../DependenciesGTK/Root/include/atk-1.0 -isystem ../DependenciesGTK/Root/include/at-spi2-atk/2.0 -isystem ../DependenciesGTK/Root/include/at-spi-2.0 -isystem /usr/include/dbus-1.0 -isystem /usr/lib64/dbus-1.0/include -isystem ../DependenciesGTK/Root/include/libsoup-2.4 -fdiagnostics-color=always -Wextra -Wall -Wno-expansion-to-defined -Wno-noexcept-type -Wno-maybe-uninitialized -Wwrite-strings -Wundef -Wpointer-arith -Wmissing-format-attribute -Wformat-security -Wcast-align -fno-strict-aliasing -fno-exceptions -fno-rtti -std=c++14 -gsplit-dwarf -g -fPIE -Wno-sign-compare -Wno-undef -Wno-unused-parameter -MD -MT Tools/TestWebKitAPI/CMakeFiles/TestJSC.dir/Tests/JavaScriptCore/glib/TestJSC.cpp.o -MF Tools/TestWebKitAPI/CMakeFiles/TestJSC.dir/Tests/JavaScriptCore/glib/TestJSC.cpp.o.d -o Tools/TestWebKitAPI/CMakeFiles/TestJSC.dir/Tests/JavaScriptCore/glib/TestJSC.cpp.o -c ../../Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp In file included from DerivedSources/ForwardingHeaders/JavaScriptCore/Instruction.h:28, from DerivedSources/ForwardingHeaders/JavaScriptCore/InstructionStream.h:29, from DerivedSources/ForwardingHeaders/JavaScriptCore/UnlinkedCodeBlock.h:34, from DerivedSources/ForwardingHeaders/JavaScriptCore/ExecutableBase.h:34, from DerivedSources/ForwardingHeaders/JavaScriptCore/ScriptExecutable.h:28, from DerivedSources/ForwardingHeaders/JavaScriptCore/FunctionExecutable.h:29, from DerivedSources/ForwardingHeaders/JavaScriptCore/CallVariant.h:28, from DerivedSources/ForwardingHeaders/JavaScriptCore/CallEdge.h:28, from DerivedSources/ForwardingHeaders/JavaScriptCore/PolymorphicCallStubRoutine.h:30, from DerivedSources/ForwardingHeaders/JavaScriptCore/CallLinkInfo.h:31, from DerivedSources/ForwardingHeaders/JavaScriptCore/CodeBlock.h:35, from DerivedSources/ForwardingHeaders/JavaScriptCore/AssemblyHelpers.h:30, from DerivedSources/ForwardingHeaders/JavaScriptCore/CCallHelpers.h:30, from DerivedSources/ForwardingHeaders/JavaScriptCore/Snippet.h:31, from DerivedSources/ForwardingHeaders/JavaScriptCore/DOMJITCallDOMGetterSnippet.h:31, from DerivedSources/ForwardingHeaders/JavaScriptCore/DOMJITGetterSetter.h:28, from DerivedSources/ForwardingHeaders/JavaScriptCore/Lookup.h:26, from DerivedSources/ForwardingHeaders/JavaScriptCore/Lexer.h:25, from DerivedSources/ForwardingHeaders/JavaScriptCore/ParseInt.h:29, from DerivedSources/ForwardingHeaders/JavaScriptCore/JSBigInt.h:31, from DerivedSources/ForwardingHeaders/JavaScriptCore/JSCJSValueInlines.h:33, from DerivedSources/ForwardingHeaders/JavaScriptCore/APICast.h:31, from DerivedSources/ForwardingHeaders/JavaScriptCore/glib/jsc/JSCContextPrivate.h:22, from ../../Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:24: DerivedSources/ForwardingHeaders/JavaScriptCore/Opcode.h:32:10: fatal error: Bytecodes.h: No such file or directory #include "Bytecodes.h" ^~~~~~~~~~~~~ compilation terminated. 1478916 1 354937 mcatanzaro 2018-11-15 08:42:43 -0800 Created attachment 354937 Patch 1478917 2 mcatanzaro 2018-11-15 08:43:24 -0800 Dunno about this. It looks like the directory is listed under private include paths for a reason...? Don? 1478921 3 aboya 2018-11-15 08:48:06 -0800 Note this error is a flake in the build system. Often after retrying build a couple of times, it works. We'd rather not have to deal with that of course. Possibly related: https://bugs.webkit.org/show_bug.cgi?id=161477 1478933 4 don.olmstead 2018-11-15 09:10:02 -0800 I don't think this is the right fix. WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore TARGET_NAME JavaScriptCorePrivateForwardingHeaders FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS} DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_DIR}/JavaScriptCore ${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector FLATTENED ) Is in CMakeLists.txt and it should be copying the contents of that derived sources directory. TestWebKitAPI_DEPENDENCIES has JavaScriptCorePrivateForwardingHeaders as a dependency though so that should be happening. There might be a bug in what Fujii did with the copying of the dependencies. What happens if you just generate the project and then go into the build directory and do ninja TestJSC? 1478975 5 mcatanzaro 2018-11-15 10:56:29 -0800 (In reply to Don Olmstead from comment #4) > What happens if you just generate the project and then go into the build > directory and do ninja TestJSC? $ mkdir -p WebKitBuild/Debug $ cd WebKitBuild/Debug $ ../../Tools/jhbuild/jhbuild-wrapper --gtk run cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Debug -DDEVELOPER_MODE=ON -GNinja ../.. $ ../../Tools/jhbuild/jhbuild-wrapper --gtk run ninja TestJSC Without my patch, it fails as shown in comment #0. 1479002 6 mcatanzaro 2018-11-15 11:55:25 -0800 $ ../../Tools/jhbuild/jhbuild-wrapper --gtk run ninja JavaScriptCorePrivateForwardingHeaders ninja: no work to do. So it's getting executed properly. My guess is that it's perhaps running before Bytecodes.h is generated? 1479018 7 mcatanzaro 2018-11-15 12:10:09 -0800 Here's where the header is generated during my build: [1114/1352] cd /home/mcatanzaro/Projects/WebKit/WebKitBuild/Debug/Source/JavaScriptCore && /usr/bin/ruby /home/mcatanzaro/Projects/WebKit/Source/JavaScriptCore/generator/main.rb --bytecodes_h /home/mcatanzaro/Projects/WebKit/WebKitBuild/Debug/DerivedSources/JavaScriptCore/Bytecodes.h --init_bytecodes_asm /home/mcatanzaro/Projects/WebKit/WebKitBuild/Debug/DerivedSources/JavaScriptCore/InitBytecodes.asm --bytecode_structs_h /home/mcatanzaro/Projects/WebKit/WebKitBuild/Debug/DerivedSources/JavaScriptCore/BytecodeStructs.h --bytecode_indices_h /home/mcatanzaro/Projects/WebKit/WebKitBuild/Debug/DerivedSources/JavaScriptCore/BytecodeIndices.h /home/mcatanzaro/Projects/WebKit/Source/JavaScriptCore/bytecode/BytecodeList.rb But all of my JSC forwarding headers were already copied before this point. The last one was copied here: [1096/1352] cd /home/mcatanzaro/Projects/WebKit/WebKitBuild/Debug/DerivedSources && /usr/bin/cmake -E copy_if_different /home/mcatanzaro/Projects/WebKit/Source/JavaScriptCore/Scripts/make-js-file-arrays.py /home/mcatanzaro/Projects/WebKit/WebKitBuild/Debug/DerivedSources/ForwardingHeaders/JavaScriptCore/Scripts/make-js-file-arrays.py Note 1096 < 1114 So it seems to be a dependency issue. 1479019 8 don.olmstead 2018-11-15 12:13:11 -0800 I have a feeling that it'd be safer if we enumerated the DerivedSources headers that need to be copied so CMake understands all the dependencies. I'll let Fujii chime in there. 1479022 9 mcatanzaro 2018-11-15 12:17:37 -0800 *** Bug 161477 has been marked as a duplicate of this bug. *** 1479219 10 fujii 2018-11-15 18:31:41 -0800 This is the same issue with Bug 182757. This problem happens if a generated header is used as a forwarding header. There are two approach. 1. Explicitly list derived headers to copy (Bug 182757 Comment 5) 2. Introduce intermediate target between TestJSC and JavaScriptCore to ensure JavaScriptCore is finished. (Bug 182757 Comment 8) > +add_custom_target(pre-TestJSC) > +add_dependencies(TestJSC pre-TestJSC) > +add_dependencies(pre-TestJSC JavaScriptCore) I'll take a look more deeply today. 1479241 11 fujii 2018-11-15 20:04:04 -0800 I'm testing with Ubuntu 18.04.1 LTS. Here is the command to reproduce. > rm -rf WebKitBuild/Debug && ./Tools/Scripts/build-webkit --gtk --debug --cmakeargs=-DENABLE_BUBBLEWRAP_SANDBOX=OFF --makeargs=Tools/TestWebKitAPI/CMakeFiles/TestJSC.dir/Tests/JavaScriptCore/glib/TestJSC.cpp.o This has happened since trunk@238016 (Bug 191439) which adds '#include "Lexer.h"' in ParseInt.h. 1479275 12 355023 fujii 2018-11-15 22:15:38 -0800 Created attachment 355023 Patch 1479410 13 355023 mcatanzaro 2018-11-16 07:53:14 -0800 Comment on attachment 355023 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355023&action=review Wow, great investigation. Thanks Fujii. > Tools/TestWebKitAPI/PlatformGTK.cmake:137 > +# Add an intermediate target between TestJSC and JavaScriptCore to ensure derived headers are copied into the forwarding header directory. > +add_custom_target(pre-TestJSC) > +add_dependencies(TestJSC pre-TestJSC) > +add_dependencies(pre-TestJSC JavaScriptCore) Hmm. At a minimum, it would need to be done for PlatformWPE.cmake as well. I'm not sure why the custom target is required. If the JavaScriptCore target is built, then the pre-TestJSC target is immediately satisfied and then TestJSC is ready to run, right? Would it work if we remove the pre-TestJSC target and just use add_dependencies(TestJSC, JavaScriptCore)? Or is that not enough to ensure that the headers are copied? I fear we're going to have this same problem in other tests, on other ports. Maybe we could instead ensure the target is not linked until after the forwarding headers are copied? 1479411 14 mcatanzaro 2018-11-16 07:54:42 -0800 (In reply to Michael Catanzaro from comment #13) > I fear we're going to have this same problem in other tests, on other ports. I guess bug #182757 is evidence enough of that. 1479734 15 fujii 2018-11-16 16:26:10 -0800 (In reply to Michael Catanzaro from comment #13) > Hmm. At a minimum, it would need to be done for PlatformWPE.cmake as well. I will fix it next Monday. Feel free to take over the patch if someone can't wait. > I'm not sure why the custom target is required. It makes compile time dependency. > If the JavaScriptCore target > is built, then the pre-TestJSC target is immediately satisfied and then > TestJSC is ready to run, right? No. As I mentioned in the ChangeLog entry, it is "link time dependency which means compiling source files of TestJSC starts before the POST_BUILD event of JSC". > Would it work if we remove the pre-TestJSC > target and just use add_dependencies(TestJSC, JavaScriptCore)? I don't think so because TestJSC already has a dependency to JavaScriptCore. > Or is that > not enough to ensure that the headers are copied? It is possible by taking the approach#1. But, it had a problem for VS generator builds (Bug 182757 Comment 5). The CMake issue has been addressed(Bug 182757 Comment 36). I will try the approach#1. > I fear we're going to have this same problem in other tests, on other ports. Year. The approach#1 is the ideal solution. > Maybe we could instead ensure the target is not linked until after the > forwarding headers are copied? `linked`? This is a compilation error. It is compile time dependency issue. 1480105 16 355247 fujii 2018-11-18 19:56:39 -0800 Created attachment 355247 Patch 1480106 17 fujii 2018-11-18 19:59:45 -0800 (In reply to Michael Catanzaro from comment #14) > (In reply to Michael Catanzaro from comment #13) > > I fear we're going to have this same problem in other tests, on other ports. > > I guess bug #182757 is evidence enough of that. JavaScriptCore is the only target which is using WEBKIT_MAKE_FORWARDING_HEADERS and needs to copy derived headers at the moment. I hope I will fix this issue properly soon. 1480229 18 mcatanzaro 2018-11-19 08:01:34 -0800 Thanks! 1480235 19 355247 commit-queue 2018-11-19 08:26:48 -0800 Comment on attachment 355247 Patch Clearing flags on attachment: 355247 Committed r238374: <https://trac.webkit.org/changeset/238374> 1480236 20 commit-queue 2018-11-19 08:26:50 -0800 All reviewed patches have been landed. Closing bug. 1480237 21 webkit-bug-importer 2018-11-19 08:27:32 -0800 <rdar://problem/46169534> 354937 2018-11-15 08:42:43 -0800 2018-11-15 12:16:24 -0800 Patch bug-191692-20181115104242.patch text/plain 1668 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj ODk4MjRlYjViZjc2MjdhOGMxMDEwMjI5N2JiNDM3NmNlMjMwMzhmLi5mNGE5YzQyY2I5ZjdlYWUz NDFiMjYwNDBiMTcxMWI4OTUxZTJmMmU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxOC0xMS0xNSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CisKKyAgICAgICAgRGVyaXZlZFNvdXJjZXMvRm9yd2FyZGluZ0hlYWRlcnMvSmF2 YVNjcmlwdENvcmUvT3Bjb2RlLmg6MzI6MTA6IGZhdGFsIGVycm9yOiBCeXRlY29kZXMuaDogTm8g c3VjaCBmaWxlIG9yIGRpcmVjdG9yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkxNjkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRml4IHRoZSBidWlsZCBieSBhZGRpbmcgJHtERVJJVkVEX1NPVVJDRVNf SkFWQVNDUklQVENPUkVfRElSfSB0byB0aGUgcHVibGljIGluY2x1ZGUgcGF0aC4KKworICAgICAg ICAqIENNYWtlTGlzdHMudHh0OgorCiAyMDE4LTExLTE0ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGlu QGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHNjcmlwdHMgZm9yIERlcml2ZWQgYW5kIFVuaWZp ZWQgU291cmNlcyB0byBleHRlcm5hbCBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMu dHh0CmluZGV4IGFiODcyNTQwMmUxMGVjYWYxMzdhN2FmZDgyYjkxOWZlZjI4MmY5ZjEuLjAyY2Vj NmZlMzNiYmIwZTY3ZWVjMDQwYjI3MzdhOTQxNmFlYTcwZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Q01ha2VMaXN0cy50eHQKQEAgLTcsNiArNyw3IEBAIGxpc3QoQVBQRU5EIEphdmFTY3JpcHRDb3Jl X1VOSUZJRURfU09VUkNFX0xJU1RfRklMRVMKICkKIAogc2V0KEphdmFTY3JpcHRDb3JlX0lOQ0xV REVfRElSRUNUT1JJRVMKKyAgICAiJHtERVJJVkVEX1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElS fSIKICAgICAiJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfSIKICkKIApAQCAtNDMsNyArNDQsNiBA QCBzZXQoSmF2YVNjcmlwdENvcmVfUFJJVkFURV9JTkNMVURFX0RJUkVDVE9SSUVTCiAgICAgIiR7 SkFWQVNDUklQVENPUkVfRElSfS93YXNtIgogICAgICIke0pBVkFTQ1JJUFRDT1JFX0RJUn0vd2Fz bS9qcyIKICAgICAiJHtKQVZBU0NSSVBUQ09SRV9ESVJ9L3lhcnIiCi0gICAgIiR7REVSSVZFRF9T T1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0iCiAgICAgIiR7REVSSVZFRF9TT1VSQ0VTX0pBVkFT Q1JJUFRDT1JFX0RJUn0vaW5zcGVjdG9yIgogICAgICIke0RFUklWRURfU09VUkNFU19KQVZBU0NS SVBUQ09SRV9ESVJ9L3J1bnRpbWUiCiAgICAgIiR7REVSSVZFRF9TT1VSQ0VTX0pBVkFTQ1JJUFRD T1JFX0RJUn0veWFyciIK 355023 2018-11-15 22:15:38 -0800 2018-11-18 19:56:36 -0800 Patch bug-191692-20181116151537.patch text/plain 2450 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MjY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGE3NDAyOTg4NzRjNzVjNzIwYjE1NGFjY2IwMGExYzQz Yjc1NGRmNC4uMDMyNmNhYmIwNzlhZGJjNzY3Y2RhNWZmYzU2NTQ1ZTlhN2I5ZTA3NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE4LTExLTE1ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04ocjIzODAxNilbR1RLXVtUZXN0V2ViS2l0QVBJXVtOaW5q YV0gVGVzdEpTQyBjYW4ndCBjb21waWxlICJCeXRlY29kZXMuaDogTm8gc3VjaCBmaWxlIG9yIGRp cmVjdG9yeSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MTY5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IHIyMzgwMTYgYWRkZWQgYSBuZXcgI2luY2x1ZGUsIGFuZCByZXF1aXJlcyBKU0MncyBkZXJpdmVk IGhlYWRlcnMKKyAgICAgICAgdG8gYmUgY29waWVkIGludG8gdGhlIGZvcndhcmRpbmcgaGVhZGVy IGRpcmVjdG9yeS4KKworICAgICAgICBXRUJLSVRfTUFLRV9GT1JXQVJESU5HX0hFQURFUlMgaXMg dXNpbmcgUE9TVF9CVUlMRCBldmVudCB0byBjb3B5CisgICAgICAgIGRlcml2ZWQgaGVhZGVycyB0 byB0aGUgZm9yd2FyZGluZyBoZWFkZXIgZGlyZWN0b3J5LiBUaGlzIGlzIGRvbmUKKyAgICAgICAg YWZ0ZXIgbGlua2luZyBKU0MgbGlicmFyeS4KKworICAgICAgICBHVEsgcG9ydCBoYXMgVGVzdEpT QyB3aGljaCBoYXMgYSBkZXBlbmRlbmN5IHRvIEpTQyBzdGF0aWMgbGlicmFyeS4KKyAgICAgICAg QW5kLCB0aGlzIGRlcGVuZGVuY3kgaXMgYSBsaW5rIHRpbWUgZGVwZW5kZW5jeSB3aGljaCBtZWFu cworICAgICAgICBjb21waWxpbmcgc291cmNlIGZpbGVzIG9mIFRlc3RKU0Mgc3RhcnRzIGJlZm9y ZSB0aGUgUE9TVF9CVUlMRAorICAgICAgICBldmVudCBvZiBKU0MuIFRoZW4sIHJlcXVpcmVkIGhl YWRlciBjYW4ndCBiZSBmb3VuZC4KKworICAgICAgICBBZGQgYW4gaW50ZXJtZWRpYXRlIHRhcmdl dCBiZXR3ZWVuIFRlc3RKU0MgYW5kIEphdmFTY3JpcHRDb3JlIHRvCisgICAgICAgIGVuc3VyZSBk ZXJpdmVkIGhlYWRlcnMgYXJlIGNvcGllZCBpbnRvIHRoZSBmb3J3YXJkaW5nIGhlYWRlcgorICAg ICAgICBkaXJlY3RvcnkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1BsYXRmb3JtR1RLLmNt YWtlOiBBZGRlZCBhIG5ldyBjdXN0b20gdGFyZ2V0IHByZS1UZXN0SlNDLgorCiAyMDE4LTExLTE1 ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgV0tQ cmVmZXJlbmNlc1NldEZvbnRTbW9vdGhpbmdMZXZlbCBkb2Vzbid0IGFjdHVhbGx5IGRvIGFueXRo aW5nCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtR1RLLmNtYWtlIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybUdUSy5jbWFrZQppbmRleCA2NGNhNDAwNjZiODZm YWExZDE4MmQ3Mzk3Nzk5MjRjODExY2NkNDg0Li4yMGIxYjgyMmEzZjFiZGMwZjVkNzE1ODk0MzRl YjNmYzE0N2RkNDFhIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtR1RL LmNtYWtlCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTEz MSw2ICsxMzEsMTEgQEAgYWRkX3Rlc3QoVGVzdEpTQyAke1RFU1RXRUJLSVRBUElfUlVOVElNRV9P VVRQVVRfRElSRUNUT1JZfS9KYXZhU2NyaXB0Q29yZS9UZXN0SlMKIHNldF90ZXN0c19wcm9wZXJ0 aWVzKFRlc3RKU0MgUFJPUEVSVElFUyBUSU1FT1VUIDYwKQogc2V0X3RhcmdldF9wcm9wZXJ0aWVz KFRlc3RKU0MgUFJPUEVSVElFUyBSVU5USU1FX09VVFBVVF9ESVJFQ1RPUlkgJHtURVNUV0VCS0lU QVBJX1JVTlRJTUVfT1VUUFVUX0RJUkVDVE9SWX0vSmF2YVNjcmlwdENvcmUpCiAKKyMgQWRkIGFu IGludGVybWVkaWF0ZSB0YXJnZXQgYmV0d2VlbiBUZXN0SlNDIGFuZCBKYXZhU2NyaXB0Q29yZSB0 byBlbnN1cmUgZGVyaXZlZCBoZWFkZXJzIGFyZSBjb3BpZWQgaW50byB0aGUgZm9yd2FyZGluZyBo ZWFkZXIgZGlyZWN0b3J5LgorYWRkX2N1c3RvbV90YXJnZXQocHJlLVRlc3RKU0MpCithZGRfZGVw ZW5kZW5jaWVzKFRlc3RKU0MgcHJlLVRlc3RKU0MpCithZGRfZGVwZW5kZW5jaWVzKHByZS1UZXN0 SlNDIEphdmFTY3JpcHRDb3JlKQorCiBpZiAoQ09NUElMRVJfSVNfR0NDX09SX0NMQU5HKQogICAg IFdFQktJVF9BRERfVEFSR0VUX0NYWF9GTEFHUyhUZXN0V2ViS2l0IC1Xbm8tc2lnbi1jb21wYXJl CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLVduby11bmRlZgo= 355247 2018-11-18 19:56:39 -0800 2018-11-19 08:26:48 -0800 Patch bug-191692-20181119125638.patch text/plain 3416 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MzY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWEyYTMyNGExZGMwN2E5ZDIxZjM4NzhhNzc4Y2RhOGJi ZDY1NDk0NC4uNmIzYTNmZGJjZTY0MDNmYzViMmRlMjllYjFkMmUwMDAyMTkwM2ViMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDE4LTExLTE4ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04ocjIzODAxNilbR1RLXVtUZXN0V2ViS2l0QVBJXVtOaW5q YV0gVGVzdEpTQyBjYW4ndCBjb21waWxlICJCeXRlY29kZXMuaDogTm8gc3VjaCBmaWxlIG9yIGRp cmVjdG9yeSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MTY5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IHIyMzgwMTYgYWRkZWQgYSBuZXcgI2luY2x1ZGUsIGFuZCByZXF1aXJlcyBKU0MncyBkZXJpdmVk IGhlYWRlcnMKKyAgICAgICAgdG8gYmUgY29waWVkIGludG8gdGhlIGZvcndhcmRpbmcgaGVhZGVy IGRpcmVjdG9yeS4KKworICAgICAgICBXRUJLSVRfTUFLRV9GT1JXQVJESU5HX0hFQURFUlMgaXMg dXNpbmcgUE9TVF9CVUlMRCBldmVudCB0byBjb3B5CisgICAgICAgIGRlcml2ZWQgaGVhZGVycyB0 byB0aGUgZm9yd2FyZGluZyBoZWFkZXIgZGlyZWN0b3J5LiBUaGlzIGlzIGRvbmUKKyAgICAgICAg YWZ0ZXIgbGlua2luZyBKU0MgbGlicmFyeS4KKworICAgICAgICBHVEsgcG9ydCBoYXMgVGVzdEpT QyB3aGljaCBoYXMgYSBkZXBlbmRlbmN5IHRvIEpTQyBzdGF0aWMgbGlicmFyeS4KKyAgICAgICAg QW5kLCB0aGlzIGRlcGVuZGVuY3kgaXMgYSBsaW5rIHRpbWUgZGVwZW5kZW5jeSB3aGljaCBtZWFu cworICAgICAgICBjb21waWxpbmcgc291cmNlIGZpbGVzIG9mIFRlc3RKU0Mgc3RhcnRzIGJlZm9y ZSB0aGUgUE9TVF9CVUlMRAorICAgICAgICBldmVudCBvZiBKU0MuIFRodXMsIHJlcXVpcmVkIGhl YWRlciBjYW4ndCBiZSBmb3VuZC4KKworICAgICAgICBBZGQgYW4gaW50ZXJtZWRpYXRlIHRhcmdl dCBiZXR3ZWVuIFRlc3RKU0MgYW5kIEphdmFTY3JpcHRDb3JlIHRvCisgICAgICAgIGVuc3VyZSBk ZXJpdmVkIGhlYWRlcnMgYXJlIGNvcGllZCBpbnRvIHRoZSBmb3J3YXJkaW5nIGhlYWRlcgorICAg ICAgICBkaXJlY3RvcnkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1BsYXRmb3JtR1RLLmNt YWtlOiBBZGRlZCBhIG5ldyBjdXN0b20gdGFyZ2V0IHByZS1UZXN0SlNDLgorICAgICAgICAqIFRl c3RXZWJLaXRBUEkvUGxhdGZvcm1XUEUuY21ha2U6IERpdHRvLgorCiAyMDE4LTExLTE3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFJlbW92 ZSBhbGwgdXNhZ2VzIG9mIFVJSXRlbVByb3ZpZGVyLCBVSUl0ZW1Qcm92aWRlclJlYWRpbmcsIGFu ZCByZWxhdGVkIGNsYXNzZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZv cm1HVEsuY21ha2UgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4 IDY0Y2E0MDA2NmI4NmZhYTFkMTgyZDczOTc3OTkyNGM4MTFjY2Q0ODQuLmNlOTQxNzhlZWQ0MDg3 OWVlNWNkNjhkMWM1MTEzMGRiOTBlNzVkMjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybUdU Sy5jbWFrZQpAQCAtMTMxLDYgKzEzMSwxMCBAQCBhZGRfdGVzdChUZXN0SlNDICR7VEVTVFdFQktJ VEFQSV9SVU5USU1FX09VVFBVVF9ESVJFQ1RPUll9L0phdmFTY3JpcHRDb3JlL1Rlc3RKUwogc2V0 X3Rlc3RzX3Byb3BlcnRpZXMoVGVzdEpTQyBQUk9QRVJUSUVTIFRJTUVPVVQgNjApCiBzZXRfdGFy Z2V0X3Byb3BlcnRpZXMoVGVzdEpTQyBQUk9QRVJUSUVTIFJVTlRJTUVfT1VUUFVUX0RJUkVDVE9S WSAke1RFU1RXRUJLSVRBUElfUlVOVElNRV9PVVRQVVRfRElSRUNUT1JZfS9KYXZhU2NyaXB0Q29y ZSkKIAorIyBBZGQgYW4gaW50ZXJtZWRpYXRlIHRhcmdldCBiZXR3ZWVuIFRlc3RKU0MgYW5kIEph dmFTY3JpcHRDb3JlIHRvIGVuc3VyZSBkZXJpdmVkIGhlYWRlcnMgYXJlIGNvcGllZCBpbnRvIHRo ZSBmb3J3YXJkaW5nIGhlYWRlciBkaXJlY3RvcnkuCithZGRfY3VzdG9tX3RhcmdldChwcmUtVGVz dEpTQyBERVBFTkRTIEphdmFTY3JpcHRDb3JlKQorYWRkX2RlcGVuZGVuY2llcyhUZXN0SlNDIHBy ZS1UZXN0SlNDKQorCiBpZiAoQ09NUElMRVJfSVNfR0NDX09SX0NMQU5HKQogICAgIFdFQktJVF9B RERfVEFSR0VUX0NYWF9GTEFHUyhUZXN0V2ViS2l0IC1Xbm8tc2lnbi1jb21wYXJlCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLVduby11bmRlZgpkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVdQRS5jbWFrZSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvUGxhdGZvcm1XUEUuY21ha2UKaW5kZXggNWZiZmI0MDk0Nzg2OTk4MDgzYzBmMDQxZGYy MTJhYTgxNzZmZWY0Yy4uZDQwNWY2NmE1ZDYxYTg3YzQ3NzBhYjJiYzRhZmY3NjQxMGUwYTk2YiAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVdQRS5jbWFrZQorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtV1BFLmNtYWtlCkBAIC0xMTQsNiArMTE0LDEwIEBA IGFkZF9kZXBlbmRlbmNpZXMoVGVzdEpTQyAke1Rlc3RXZWJLaXRBUElfREVQRU5ERU5DSUVTfSkK IHNldF90ZXN0c19wcm9wZXJ0aWVzKFRlc3RKU0MgUFJPUEVSVElFUyBUSU1FT1VUIDYwKQogc2V0 X3RhcmdldF9wcm9wZXJ0aWVzKFRlc3RKU0MgUFJPUEVSVElFUyBSVU5USU1FX09VVFBVVF9ESVJF Q1RPUlkgJHtURVNUV0VCS0lUQVBJX1JVTlRJTUVfT1VUUFVUX0RJUkVDVE9SWX0vSmF2YVNjcmlw dENvcmUpCiAKKyMgQWRkIGFuIGludGVybWVkaWF0ZSB0YXJnZXQgYmV0d2VlbiBUZXN0SlNDIGFu ZCBKYXZhU2NyaXB0Q29yZSB0byBlbnN1cmUgZGVyaXZlZCBoZWFkZXJzIGFyZSBjb3BpZWQgaW50 byB0aGUgZm9yd2FyZGluZyBoZWFkZXIgZGlyZWN0b3J5LgorYWRkX2N1c3RvbV90YXJnZXQocHJl LVRlc3RKU0MgREVQRU5EUyBKYXZhU2NyaXB0Q29yZSkKK2FkZF9kZXBlbmRlbmNpZXMoVGVzdEpT QyBwcmUtVGVzdEpTQykKKwogaWYgKENPTVBJTEVSX0lTX0dDQ19PUl9DTEFORykKICAgICBXRUJL SVRfQUREX1RBUkdFVF9DWFhfRkxBR1MoVGVzdFdlYkNvcmUgLVduby1zaWduLWNvbXBhcmUKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLVduby11bmRlZgo=