187218 2018-06-30 07:00:20 -0700 [WPE][GTK] flatpakutils.py should respect set-webkit-configuration build type 2018-07-02 12:02:27 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=186771 P2 Normal --- 1 mcatanzaro mcatanzaro bugs-noreply calvaris commit-queue dbates mcatanzaro pnormand tsaunier oldest_to_newest 1438160 0 mcatanzaro 2018-06-30 07:00:20 -0700 I've deleted my old JHBuild-based build directory and created a new one using update-webkitgtk-flatpak. I tried running layout tests without much luck. WebKitTestRunner crashes once for every test run. There's no obvious way to get a coredump for the crash. $ run-webkit-tests --gtk http/tests/mime/asan-crash-downloading-file.html Running in sandbox: "flatpak" "build" "--die-with-parent" "--bind-mount=/run/host//tmp=/tmp" "--bind-mount=/app/webkit=/home/mcatanzaro/Projects/WebKit" "--bind-mount=/app/webkit/WebKitBuild/Release=/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/Release" "--env=LANG=en_US.UTF-8" "--env=WEBKIT_TOP_LEVEL=/app/" "--env=WAYLAND_DISPLAY=wayland-0" "--env=TEST_RUNNER_INJECTED_BUNDLE_FILENAME=/app/webkit/lib/libTestRunnerInjectedBundle.so" "--env=DISPLAY=:0" "--share=ipc" "--socket=wayland" "--share=network" "--socket=pulseaudio" "--system-talk-name=org.freedesktop.GeoClue2" "--filesystem=host" "--socket=system-bus" "--talk-name=org.freedesktop.Flatpak" "--env=GST_PRESET_PATH=/app/share/gstreamer-1.0/presets/" "/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/FlatpakTreeRelease" "/app/webkit/Tools/Scripts/run-webkit-tests" "--gtk" "http/tests/mime/asan-crash-downloading-file.html" Using port 'gtk-wk2' Test configuration: <, x86, debug> Placing test results in /app/webkit/WebKitBuild/Debug/layout-test-results Baseline search path: platform/gtk -> platform/wk2 -> generic Using Debug build Pixel tests disabled Regular timeout: 30000, slow test timeout: 150000 Command line: /app/webkit/WebKitBuild/Debug/bin/WebKitTestRunner - Found 1 test; running 1, skipping 0. Running 1 test Running 1 WebKitTestRunner. [1/1] http/tests/mime/asan-crash-downloading-file.html failed unexpectedly (WebKitTestRunner crashed [pid=39]) 0 tests ran as expected, 1 didn't: ScriptError raised: Failed to run "['Tools/Scripts/run-minibrowser', '--debug', '--gtk', u'file:///app/webkit/WebKitBuild/Debug/layout-test-results/results.html']" exit_code: 127 cwd: /app/webkit Traceback (most recent call last): File "/app/webkit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 85, in main run_details = run(port, options, args, stderr) File "/app/webkit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 447, in run run_details = manager.run(args) File "/app/webkit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 268, in run return self._end_test_run(start_time, end_time, initial_results, retry_results, enabled_pixel_tests_in_retry) File "/app/webkit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 323, in _end_test_run self._port.show_results_html_file(results_path) File "/app/webkit/Tools/Scripts/webkitpy/port/gtk.py", line 229, in show_results_html_file self._run_script("run-minibrowser", [path.abspath_to_uri(self.host.platform, results_filename)]) File "/app/webkit/Tools/Scripts/webkitpy/port/base.py", line 1488, in _run_script output = self._executive.run_command(run_script_command, cwd=self.webkit_base(), decode_output=decode_output, env=env) File "/app/webkit/Tools/Scripts/webkitpy/common/system/executive.py", line 412, in run_command (error_handler or self.default_error_handler)(script_error) File "/app/webkit/Tools/Scripts/webkitpy/common/system/abstractexecutive.py", line 97, in default_error_handler raise error ScriptError: Failed to run "['Tools/Scripts/run-minibrowser', '--debug', '--gtk', u'file:///app/webkit/WebKitBuild/Debug/layout-test-results/results.html']" exit_code: 127 cwd: /app/webkit Command '['flatpak', 'build', '--die-with-parent', '--bind-mount=/run/host//tmp=/tmp', '--bind-mount=/app/webkit=/home/mcatanzaro/Projects/WebKit', '--bind-mount=/app/webkit/WebKitBuild/Release=/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/Release', '--env=LANG=en_US.UTF-8', '--env=WEBKIT_TOP_LEVEL=/app/', '--env=WAYLAND_DISPLAY=wayland-0', '--env=TEST_RUNNER_INJECTED_BUNDLE_FILENAME=/app/webkit/lib/libTestRunnerInjectedBundle.so', '--env=DISPLAY=:0', '--share=ipc', '--socket=wayland', '--share=network', '--socket=pulseaudio', '--system-talk-name=org.freedesktop.GeoClue2', '--filesystem=host', '--socket=system-bus', '--talk-name=org.freedesktop.Flatpak', '--env=GST_PRESET_PATH=/app/share/gstreamer-1.0/presets/', '/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/FlatpakTreeRelease', 'sh', '/run/host//tmp/tmpjjJ3aK']' returned non-zero exit status 254 1438162 1 pnormand 2018-06-30 07:06:12 -0700 Looks like an inconsistency between release/debug build. You call run-webkit-tests without --debug but the harness seems to launch the debug build things. 1438166 2 tsaunier 2018-06-30 07:59:10 -0700 > I tried running layout tests without much luck. WebKitTestRunner crashes once for every test run. There's no obvious way to get a coredump for the crash. webkit-flatpak --gdb Should do. 1438182 3 mcatanzaro 2018-06-30 11:08:31 -0700 (In reply to Philippe Normand from comment #1) > Looks like an inconsistency between release/debug build. You call > run-webkit-tests without --debug but the harness seems to launch the debug > build things. It launches debug build things because I have run 'set-webkit-configuration --debug' to ensure that I don't have to pass --debug manually (I always want debug). (In reply to Thibault Saunier from comment #2) > webkit-flatpak --gdb > > Should do. I'll try this later. 1438184 4 mcatanzaro 2018-06-30 11:10:58 -0700 OK, I see the flatpak script is mounting release build stuff by mistake... good catch Philippe :) 1438186 5 tsaunier 2018-06-30 11:44:39 -0700 `set-webkit-configuration --debug` Never heard of it, so we are not handling that thing I guess :-) 1438194 6 344019 mcatanzaro 2018-06-30 13:01:41 -0700 Created attachment 344019 Patch 1438195 7 344019 mcatanzaro 2018-06-30 13:03:38 -0700 Comment on attachment 344019 Patch Wait a sec, I just realized I tested this patch while using jhbuild rather than flatpak, let me make try again and sure it actually works. 1438196 8 344019 tsaunier 2018-06-30 13:06:55 -0700 Comment on attachment 344019 Patch Looks good to me, I don't have the power to r+ yet though :-) 1438223 9 344025 mcatanzaro 2018-06-30 15:43:38 -0700 Created attachment 344025 Patch 1438225 10 mcatanzaro 2018-06-30 15:58:14 -0700 (In reply to Michael Catanzaro from comment #9) > Created attachment 344025 [details] > Patch This patch works. Next problem is: $ build-webkit --gtk Building flatpak based environment Building webkit Running in sandbox: "flatpak" "build" "--die-with-parent" "--bind-mount=/run/host//tmp=/tmp" "--bind-mount=/app/webkit=/home/mcatanzaro/Projects/WebKit" "--bind-mount=/app/webkit/WebKitBuild/Debug=/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/Debug" "--env=LANG=en_US.UTF-8" "--env=WEBKIT_TOP_LEVEL=/app/" "--env=WAYLAND_DISPLAY=wayland-0" "--env=TEST_RUNNER_INJECTED_BUNDLE_FILENAME=/app/webkit/lib/libTestRunnerInjectedBundle.so" "--env=DISPLAY=:0" "--share=ipc" "--socket=x11" "--socket=wayland" "--device=all" "--share=network" "--socket=pulseaudio" "--system-talk-name=org.freedesktop.GeoClue2" "--filesystem=host" "--socket=system-bus" "--talk-name=org.freedesktop.Flatpak" "--env=GST_PRESET_PATH=/app/share/gstreamer-1.0/presets/" "/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/FlatpakTreeDebug" "/app/webkit/Tools/Scripts/build-webkit" "--debug" "--gtk" "--prefix=/app" + cmake -DPORT="GTK" -DCMAKE_INSTALL_PREFIX="/app" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DENABLE_ADDRESS_SANITIZER=ON -G Ninja -DDEVELOPER_MODE=ON -DENABLE_EXPERIMENTAL_FEATURES=ON "/app/webkit" -- The C compiler identification is GNU 6.2.0 -- The CXX compiler identification is GNU 6.2.0 -- Check for working C compiler: /usr/bin/cc -- Check for working C compiler: /usr/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- The CMake build type is: Debug -- Found Gperf: /usr/bin/gperf (Required is at least version "3.0.1") -- Found Perl: /usr/bin/perl (found suitable version "5.22.1", minimum required is "5.10.0") -- Found PerlModules_JSON::PP: TRUE -- Found PerlModules: TRUE found components: JSON::PP -- Found PythonInterp: /usr/bin/python2.7 (found suitable version "2.7.12", minimum required is "2.7.0") -- Found Ruby: /usr/bin/ruby (found suitable version "2.2.0", minimum required is "1.9") -- Performing Test C_COMPILER_SUPPORTS_-fno-strict-aliasing -- Performing Test C_COMPILER_SUPPORTS_-fno-strict-aliasing - Success -- Performing Test CXX_COMPILER_SUPPORTS_-fno-strict-aliasing -- Performing Test CXX_COMPILER_SUPPORTS_-fno-strict-aliasing - Success -- Performing Test C_COMPILER_SUPPORTS_-fno-exceptions -- Performing Test C_COMPILER_SUPPORTS_-fno-exceptions - Success -- Performing Test CXX_COMPILER_SUPPORTS_-fno-exceptions -- Performing Test CXX_COMPILER_SUPPORTS_-fno-exceptions - Success -- Performing Test CXX_COMPILER_SUPPORTS_-fno-rtti -- Performing Test CXX_COMPILER_SUPPORTS_-fno-rtti - Success -- Performing Test CXX_COMPILER_SUPPORTS_CXX17 -- Performing Test CXX_COMPILER_SUPPORTS_CXX17 - Success -- Performing Test CXX_COMPILER_SUPPORTS_-std=c++17 -- Performing Test CXX_COMPILER_SUPPORTS_-std=c++17 - Success -- Performing Test C_COMPILER_SUPPORTS_-Wall -- Performing Test C_COMPILER_SUPPORTS_-Wall - Success -- Performing Test C_COMPILER_SUPPORTS_-Wextra -- Performing Test C_COMPILER_SUPPORTS_-Wextra - Success -- Performing Test C_COMPILER_SUPPORTS_-Wcast-align -- Performing Test C_COMPILER_SUPPORTS_-Wcast-align - Success -- Performing Test C_COMPILER_SUPPORTS_-Wformat-security -- Performing Test C_COMPILER_SUPPORTS_-Wformat-security - Success -- Performing Test C_COMPILER_SUPPORTS_-Wmissing-format-attribute -- Performing Test C_COMPILER_SUPPORTS_-Wmissing-format-attribute - Success -- Performing Test C_COMPILER_SUPPORTS_-Wpointer-arith -- Performing Test C_COMPILER_SUPPORTS_-Wpointer-arith - Success -- Performing Test C_COMPILER_SUPPORTS_-Wundef -- Performing Test C_COMPILER_SUPPORTS_-Wundef - Success -- Performing Test C_COMPILER_SUPPORTS_-Wwrite-strings -- Performing Test C_COMPILER_SUPPORTS_-Wwrite-strings - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wall -- Performing Test CXX_COMPILER_SUPPORTS_-Wall - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wextra -- Performing Test CXX_COMPILER_SUPPORTS_-Wextra - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wcast-align -- Performing Test CXX_COMPILER_SUPPORTS_-Wcast-align - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wformat-security -- Performing Test CXX_COMPILER_SUPPORTS_-Wformat-security - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wmissing-format-attribute -- Performing Test CXX_COMPILER_SUPPORTS_-Wmissing-format-attribute - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wpointer-arith -- Performing Test CXX_COMPILER_SUPPORTS_-Wpointer-arith - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wundef -- Performing Test CXX_COMPILER_SUPPORTS_-Wundef - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wwrite-strings -- Performing Test CXX_COMPILER_SUPPORTS_-Wwrite-strings - Success -- Performing Test C_COMPILER_SUPPORTS_-Qunused-arguments -- Performing Test C_COMPILER_SUPPORTS_-Qunused-arguments - Failed -- Performing Test C_COMPILER_SUPPORTS_-Wno-maybe-uninitialized -- Performing Test C_COMPILER_SUPPORTS_-Wno-maybe-uninitialized - Success -- Performing Test C_COMPILER_SUPPORTS_-Wno-noexcept-type -- Performing Test C_COMPILER_SUPPORTS_-Wno-noexcept-type - Failed -- Performing Test C_COMPILER_SUPPORTS_-Wno-parentheses-equality -- Performing Test C_COMPILER_SUPPORTS_-Wno-parentheses-equality - Failed -- Performing Test CXX_COMPILER_SUPPORTS_-Qunused-arguments -- Performing Test CXX_COMPILER_SUPPORTS_-Qunused-arguments - Failed -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-maybe-uninitialized -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-maybe-uninitialized - Success -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-noexcept-type -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-noexcept-type - Failed -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-parentheses-equality -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-parentheses-equality - Failed -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-attributes -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-attributes - Success -- Performing Test C_COMPILER_SUPPORTS_-Wno-expansion-to-defined -- Performing Test C_COMPILER_SUPPORTS_-Wno-expansion-to-defined - Failed -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-expansion-to-defined -- Performing Test CXX_COMPILER_SUPPORTS_-Wno-expansion-to-defined - Failed -- Performing Test C_COMPILER_SUPPORTS_-fcolor-diagnostics -- Performing Test C_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed -- Performing Test C_COMPILER_SUPPORTS_-fdiagnostics-color=always -- Performing Test C_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success -- Performing Test C_COMPILER_SUPPORTS_-fno-omit-frame-pointer -- Performing Test C_COMPILER_SUPPORTS_-fno-omit-frame-pointer - Success -- Performing Test C_COMPILER_SUPPORTS_-fno-optimize-sibling-calls -- Performing Test C_COMPILER_SUPPORTS_-fno-optimize-sibling-calls - Success -- Performing Test CXX_COMPILER_SUPPORTS_-fno-omit-frame-pointer -- Performing Test CXX_COMPILER_SUPPORTS_-fno-omit-frame-pointer - Success -- Performing Test CXX_COMPILER_SUPPORTS_-fno-optimize-sibling-calls -- Performing Test CXX_COMPILER_SUPPORTS_-fno-optimize-sibling-calls - Success -- Performing Test ATOMIC_INT64_IS_BUILTIN -- Performing Test ATOMIC_INT64_IS_BUILTIN - Failed -- Performing Test ATOMIC_INT64_REQUIRES_LIBATOMIC -- Performing Test ATOMIC_INT64_REQUIRES_LIBATOMIC - Failed -- Performing Test CXX_COMPILER_SUPPORTS_GSPLIT_DWARF -- Performing Test CXX_COMPILER_SUPPORTS_GSPLIT_DWARF - Failed -- Looking for features.h -- Looking for features.h - not found -- Looking for errno.h -- Looking for errno.h - not found -- Looking for langinfo.h -- Looking for langinfo.h - not found -- Looking for sys/mman.h -- Looking for sys/mman.h - not found -- Looking for pthread_np.h -- Looking for pthread_np.h - not found -- Looking for strings.h -- Looking for strings.h - not found -- Looking for sys/param.h -- Looking for sys/param.h - not found -- Looking for sys/time.h -- Looking for sys/time.h - not found -- Looking for sys/timeb.h -- Looking for sys/timeb.h - not found -- Looking for _aligned_malloc -- Looking for _aligned_malloc - not found -- Looking for IsDebuggerPresent -- Looking for IsDebuggerPresent - not found -- Looking for localtime_r -- Looking for localtime_r - not found -- Looking for strnstr -- Looking for strnstr - not found -- Looking for timegm -- Looking for timegm - not found -- Looking for vasprintf -- Looking for vasprintf - not found -- Looking for regexec -- Looking for regexec - not found -- Looking for SIGTRAP -- Looking for SIGTRAP - not found -- Performing Test HAVE_STAT_BIRTHTIME_value -- Performing Test HAVE_STAT_BIRTHTIME_value - Failed -- Performing Test HAVE_TM_GMTOFF_value -- Performing Test HAVE_TM_GMTOFF_value - Failed -- Performing Test HAVE_TM_ZONE_value -- Performing Test HAVE_TM_ZONE_value - Failed -- Looking for sys/types.h -- Looking for sys/types.h - not found -- Looking for stdint.h -- Looking for stdint.h - not found -- Looking for stddef.h -- Looking for stddef.h - not found -- Check size of __int128_t -- Check size of __int128_t - failed -- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.1") -- Found Cairo: /usr/include/cairo (found suitable version "1.15.10", minimum required is "1.10.2") -- Checking for module 'fontconfig' -- Found fontconfig, version 2.13.0 -- Found Fontconfig: /usr/lib/libfontconfig.so (Required is at least version "2.8.0") -- Checking for module 'freetype2' -- Found freetype2, version 22.0.16 -- Found Freetype2: /usr/include/freetype2/freetype;/usr/include/freetype2 (Required is at least version "2.4.2") -- Found LibGcrypt: /app/lib/libgcrypt.so (found suitable version "1.7.6", minimum required is "1.6.0") -- Checking for module 'gtk+-3.0' -- Found gtk+-3.0, version 3.22.30 -- Checking for module 'gtk+-quartz-3.0' -- No package 'gtk+-quartz-3.0' found -- Checking for module 'gtk+-x11-3.0' -- Found gtk+-x11-3.0, version 3.22.30 -- Checking for module 'gtk+-wayland-3.0' -- Found gtk+-wayland-3.0, version 3.22.30 -- Found GTK3: /usr/include/gtk-3.0;/usr/include/at-spi2-atk/2.0;/usr/include/at-spi-2.0;/usr/include/dbus-1.0;/usr/lib/dbus-1.0/include;/usr/include/gtk-3.0;/usr/include/gio-unix-2.0/;/usr/include/cairo;/usr/include/libdrm;/usr/include/pango-1.0;/usr/include/atk-1.0;/usr/include/cairo;/usr/include/pixman-1;/usr/include/uuid;/usr/include/freetype2;/usr/include/harfbuzz;/usr/include/libpng16;/usr/include/gdk-pixbuf-2.0;/usr/include/libpng16;/usr/include/glib-2.0;/usr/lib/glib-2.0/include (Required is at least version "3.6.0") -- Checking for module 'gdk-3.0' -- Found gdk-3.0, version 3.22.30 -- Found GDK3: /usr/include/gtk-3.0;/usr/include/gio-unix-2.0/;/usr/include/cairo;/usr/include/libdrm;/usr/include/pango-1.0;/usr/include/gdk-pixbuf-2.0;/usr/include/libpng16;/usr/include/cairo;/usr/include/pixman-1;/usr/include/uuid;/usr/include/freetype2;/usr/include/harfbuzz;/usr/include/libpng16;/usr/include/glib-2.0;/usr/lib/glib-2.0/include (Required is at least version "3.6.0") -- Found Harfbuzz: /usr/include/harfbuzz (found version "1.4.8") -- Checking for module 'icu-uc' -- Found icu-uc, version 57.1 -- Checking for module 'icu-i18n' -- Found icu-i18n, version 57.1 -- Found ICU header files in /usr/include -- Found ICU libraries: /usr/lib/libicuuc.so -- Found ICU internationaliation libraries: /usr/lib/libicui18n.so -- Found ICU data libraries: /usr/lib/libicudata.so -- Found JPEG: /usr/lib/libjpeg.so -- Found LibSoup: /usr/include/libsoup-2.4 (found suitable version "2.62.1", minimum required is "2.42.0") -- Found LibXml2: /usr/lib/libxml2.so (found suitable version "2.9.4", minimum required is "2.8.0") -- Found ZLIB: /usr/lib/libz.so (found version "1.2.8") -- Found PNG: /usr/lib/libpng.so (found version "1.6.24") -- Checking for module 'sqlite3' -- Found sqlite3, version 3.14.1 -- Found Sqlite: /usr/include -- Looking for pthread.h -- Looking for pthread.h - not found CMake Error at /usr/share/cmake-3.7/Modules/FindPackageHandleStandardArgs.cmake:138 (message): Could NOT find Threads (missing: Threads_FOUND) Call Stack (most recent call first): /usr/share/cmake-3.7/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE) /usr/share/cmake-3.7/Modules/FindThreads.cmake:212 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) Source/cmake/OptionsGTK.cmake:33 (find_package) Source/cmake/WebKitCommon.cmake:61 (include) CMakeLists.txt:154 (include) -- Configuring incomplete, errors occurred! See also "/app/webkit/WebKitBuild/Debug/CMakeFiles/CMakeOutput.log". See also "/app/webkit/WebKitBuild/Debug/CMakeFiles/CMakeError.log". Command '['flatpak', 'build', '--die-with-parent', '--bind-mount=/run/host//tmp=/tmp', '--bind-mount=/app/webkit=/home/mcatanzaro/Projects/WebKit', '--bind-mount=/app/webkit/WebKitBuild/Debug=/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/Debug', '--env=LANG=en_US.UTF-8', '--env=WEBKIT_TOP_LEVEL=/app/', '--env=WAYLAND_DISPLAY=wayland-0', '--env=TEST_RUNNER_INJECTED_BUNDLE_FILENAME=/app/webkit/lib/libTestRunnerInjectedBundle.so', '--env=DISPLAY=:0', '--share=ipc', '--socket=x11', '--socket=wayland', '--device=all', '--share=network', '--socket=pulseaudio', '--system-talk-name=org.freedesktop.GeoClue2', '--filesystem=host', '--socket=system-bus', '--talk-name=org.freedesktop.Flatpak', '--env=GST_PRESET_PATH=/app/share/gstreamer-1.0/presets/', '/home/mcatanzaro/Projects/WebKit/WebKitBuild/GTK/FlatpakTreeDebug', 'sh', '/run/host//tmp/tmp8bLcDe']' returned non-zero exit status 1 1438284 11 344025 dbates 2018-06-30 23:18:32 -0700 Comment on attachment 344025 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344025&action=review > Tools/flatpak/flatpakutils.py:449 > + help="Compile with Debug configuration, also installs Sdk debug symbols.", Sdk => SDK Maybe a better way to write this help message would be: Compile with Debug configuration and install SDK debug symbols > Tools/flatpak/flatpakutils.py:554 > + def read_configuration(self, build_root): This code implements similar functionality that we have in webkitpy Config: <https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/port/config.py#L67>. Can we make use of it? If not, can you please explain why? If it turns out that we cannot use webkitpy and we need to implement this functionality in this script then can we please take a similar approach as webkitpy and call script webkit-build-directory instead of parsing the Configuration file? 1438320 12 mcatanzaro 2018-07-01 11:57:54 -0700 (In reply to Daniel Bates from comment #11) > This code implements similar functionality that we have in webkitpy Config: > <https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/port/ > config.py#L67>. Can we make use of it? If not, can you please explain why? > If it turns out that we cannot use webkitpy and we need to implement this > functionality in this script then can we please take a similar approach as > webkitpy and call script webkit-build-directory instead of parsing the > Configuration file? Oh definitely, let me try to use that. I looked at build-webkit to see if I could reuse the configuration-parsing code, but of course the answer was no, because that was a perl script. I should have checked to see what some python scripts were doing. 1438525 13 mcatanzaro 2018-07-02 10:15:51 -0700 (In reply to Michael Catanzaro from comment #12) > Oh definitely, let me try to use that. Much better this way! 1438526 14 344114 mcatanzaro 2018-07-02 10:16:26 -0700 Created attachment 344114 Patch 1438530 15 344114 pnormand 2018-07-02 10:19:34 -0700 Comment on attachment 344114 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344114&action=review > Tools/flatpak/flatpakutils.py:561 > + self.debug = True if port.default_configuration() == "Debug" else False Can simply be self.debug = port.default_configuration() == "Debug" 1438534 16 344114 pnormand 2018-07-02 10:25:26 -0700 Comment on attachment 344114 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344114&action=review > Tools/flatpak/flatpakutils.py:521 > + self.release = False Why is this one needed? Seems redundant because there's self.debug already 1438543 17 mcatanzaro 2018-07-02 10:42:18 -0700 (In reply to Philippe Normand from comment #15) > Can simply be self.debug = port.default_configuration() == "Debug" OK (In reply to Philippe Normand from comment #16) > Why is this one needed? Seems redundant because there's self.debug already Like our other scripts, this script has a --release flag that needs to be respected 1438544 18 344116 mcatanzaro 2018-07-02 10:43:41 -0700 Created attachment 344116 Patch 1438545 19 mcatanzaro 2018-07-02 10:44:34 -0700 (In reply to Michael Catanzaro from comment #17) > Like our other scripts, this script has a --release flag that needs to be > respected i.e. the Configuration file should only be inspected if neither --release nor --debug has been passed. 1438576 20 344116 commit-queue 2018-07-02 12:02:25 -0700 Comment on attachment 344116 Patch Clearing flags on attachment: 344116 Committed r233428: <https://trac.webkit.org/changeset/233428> 1438577 21 commit-queue 2018-07-02 12:02:27 -0700 All reviewed patches have been landed. Closing bug. 344019 2018-06-30 13:01:41 -0700 2018-06-30 15:43:36 -0700 Patch bug-187218-20180630150140.patch text/plain 4729 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjA3YjZiNGQ5ODRhZGYyZmE4NmFhYzkwNzI3MzVkYmIy YWJmNjBlMC4uNmVjN2E3YThjN2Y0YmE1MDAyYzA2MmYwMmVjZTk2NWM4NWVkZmE2YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE4LTA2LTMwICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv bT4KKworICAgICAgICBbV1BFXVtHVEtdIGZsYXRwYWt1dGlscy5weSBzaG91bGQgcmVzcGVjdCBz ZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gYnVpbGQgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MjE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhZCB0aGUgYnVpbGQgdHlwZSBmcm9tIFdlYktp dEJ1aWxkL0NvbmZpZ3VyYXRpb24gYW5kIHJlc3BlY3QgaXQsIGlmIHRoZSBidWlsZCB0eXBlIGlz IG5vdAorICAgICAgICBwYXNzZWQgb24gdGhlIGNvbW1hbmQgbGluZS4KKworICAgICAgICAqIGZs YXRwYWsvZmxhdHBha3V0aWxzLnB5OgorICAgICAgICAoV2Via2l0RmxhdHBhay5sb2FkX2Zyb21f YXJncyk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLl9faW5pdF9fKToKKyAgICAgICAgKFdlYmtp dEZsYXRwYWsucmVhZF9jb25maWd1cmF0aW9uKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuY2xl YW5fYXJncyk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnNldHVwX2Rldl9lbnYpOgorCiAyMDE4 LTA2LTMwICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KIAogICAgICAg ICBNYWtlIGNoZWNrX2ZsYXRwYWsoKSBub3QgdmVyYm9zZSB3aGVuIG9ubHkgdHJ5aW5nIHRvIHJ1 biBjb21tYW5kIGluc2lkZSBmbGF0cGFrCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFrL2ZsYXRw YWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4IGUzYmNhMDlm YzQ4OTc5ZTVkN2I5YTc0NTBiZjdmNDE3MDZmNjFjOGEuLjRjOWE2ZDZmNzk3NzEyNThjZTMyNTg1 YTNlMmIyMjRlMGFlNTQ0MDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxz LnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBAIC00NDYsNyArNDQ2LDcg QEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1l bnRQYXJzZXIocHJvZz0id2Via2l0LWZsYXRwYWsiKQogICAgICAgICBnZW5lcmFsID0gcGFyc2Vy LmFkZF9hcmd1bWVudF9ncm91cCgiR2VuZXJhbCIpCiAgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3Vt ZW50KCItLWRlYnVnIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJDb21waWxl IHdpdGggRGVidWcgY29uZmlndXJhdGlvbiwgYWxzbyBpbnN0YWxscyBTZGsgZGVidWcgc3ltYm9s ZXMuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJDb21waWxlIHdpdGggRGVi dWcgY29uZmlndXJhdGlvbiwgYWxzbyBpbnN0YWxscyBTZGsgZGVidWcgc3ltYm9scy4iLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIpCiAgICAgICAgIGdl bmVyYWwuYWRkX2FyZ3VtZW50KCItLXJlbGVhc2UiLCBoZWxwPSJDb21waWxlIHdpdGggUmVsZWFz ZSBjb25maWd1cmF0aW9uLiIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIpCiAgICAgICAgIGdlbmVyYWwu YWRkX2FyZ3VtZW50KCctLXBsYXRmb3JtJywgYWN0aW9uPSdzdG9yZScsIGhlbHA9J1BsYXRmb3Jt IHRvIHVzZSAoZS5nLiwgIm1hYy1saW9uIiknKSwKQEAgLTUxNiw2ICs1MTYsNyBAQCBjbGFzcyBX ZWJraXRGbGF0cGFrOgogCiAgICAgICAgIHNlbGYubm9fZmxhdHBha191cGRhdGUgPSBGYWxzZQog ICAgICAgICBzZWxmLmRlYnVnID0gRmFsc2UKKyAgICAgICAgc2VsZi5yZWxlYXNlID0gRmFsc2UK ICAgICAgICAgc2VsZi5jbGVhbiA9IEZhbHNlCiAgICAgICAgIHNlbGYucnVuX3Rlc3RzID0gTm9u ZQogICAgICAgICBzZWxmLnNvdXJjZV9yb290ID0gb3MucGF0aC5ub3JtcGF0aChvcy5wYXRoLmFi c3BhdGgob3MucGF0aC5qb2luKHNjcmlwdGRpciwgJy4uLy4uLycpKSkKQEAgLTU1MCw3ICs1NTEs MjUgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgc2VsZi5jbWFrZWFyZ3MgPSAiIgog ICAgICAgICBzZWxmLm1ha2VhcmdzID0gIiIKIAorICAgIGRlZiByZWFkX2NvbmZpZ3VyYXRpb24o c2VsZiwgYnVpbGRfcm9vdCk6CisgICAgICAgIGlmIG5vdCBzZWxmLmRlYnVnIGFuZCBub3Qgc2Vs Zi5yZWxlYXNlOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIHdpdGggb3Blbihv cy5wYXRoLmpvaW4oYnVpbGRfcm9vdCwgJ0NvbmZpZ3VyYXRpb24nKSkgYXMgY29uZmlnOgorICAg ICAgICAgICAgICAgICAgICBmb3IgbGluZSBpbiBjb25maWc6CisgICAgICAgICAgICAgICAgICAg ICAgICBpZiBsaW5lID09ICdSZWxlYXNlJzoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBz ZWxmLnJlbGVhc2UgPSBUcnVlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuCisg ICAgICAgICAgICAgICAgICAgICAgICBlbGlmIGxpbmUgPT0gJ0RlYnVnJzoKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLmRlYnVnID0gVHJ1ZQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJldHVybgorICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3I6CisgICAgICAgICAgICAg ICAgcGFzcworICAgICAgICBzZWxmLnJlbGVhc2UgPSBUcnVlCisKICAgICBkZWYgY2xlYW5fYXJn cyhzZWxmKToKKyAgICAgICAgYnVpbGRfcm9vdCA9IG9zLnBhdGguam9pbihzZWxmLnNvdXJjZV9y b290LCAnV2ViS2l0QnVpbGQnKQorICAgICAgICBzZWxmLnJlYWRfY29uZmlndXJhdGlvbihidWls ZF9yb290KQorCiAgICAgICAgIHNlbGYucGxhdGZvcm0gPSBzZWxmLnBsYXRmb3JtLnVwcGVyKCkK ICAgICAgICAgc2VsZi5idWlsZF90eXBlID0gIkRlYnVnIiBpZiBzZWxmLmRlYnVnIGVsc2UgIlJl bGVhc2UiCiAgICAgICAgIGlmIHNlbGYuZ2RiIGlzIE5vbmUgYW5kICctLWdkYicgaW4gc3lzLmFy Z3Y6CkBAIC01NjUsNyArNTg0LDYgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgc2Vs Zi5tYW5pZmVzdF9wYXRoID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihzY3JpcHRkaXIs ICcuLi9mbGF0cGFrL29yZy53ZWJraXQuV2ViS2l0LnlhbWwnKSkKICAgICAgICAgc2VsZi5idWls ZF9uYW1lID0gc2VsZi5uYW1lICsgIi1nZW5lcmF0ZWQiCiAKLSAgICAgICAgYnVpbGRfcm9vdCA9 IG9zLnBhdGguam9pbihzZWxmLnNvdXJjZV9yb290LCAnV2ViS2l0QnVpbGQnKQogICAgICAgICBz ZWxmLmZsYXRwYWtfYnVpbGRfcGF0aCA9IG9zLnBhdGguam9pbihidWlsZF9yb290LCBzZWxmLnBs YXRmb3JtLCAiRmxhdHBha1RyZWUiICsgc2VsZi5idWlsZF90eXBlKQogICAgICAgICBzZWxmLmNh Y2hlX3BhdGggPSBvcy5wYXRoLmpvaW4oYnVpbGRfcm9vdCwgIkZsYXRwYWtDYWNoZSIpCiAgICAg ICAgIHNlbGYuYnVpbGRfcGF0aCA9IG9zLnBhdGguam9pbihidWlsZF9yb290LCBzZWxmLnBsYXRm b3JtLCBzZWxmLmJ1aWxkX3R5cGUpCkBAIC03NDIsNyArNzYwLDcgQEAgY2xhc3MgV2Via2l0Rmxh dHBhazoKIAogICAgICAgICBpZiBzZWxmLmJ1aWxkX3dlYmtpdDoKICAgICAgICAgICAgIGJ1aWxk ZXIgPSBbb3MucGF0aC5qb2luKHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwgJ1Rvb2xzL1Njcmlw dHMvYnVpbGQtd2Via2l0JyksCi0gICAgICAgICAgICAgICAgIi0tZGVidWciIGlmIHNlbGYuZGVi dWcgIGVsc2UgIi0tcmVsZWFzZSIsICctLScgKyBzZWxmLnBsYXRmb3JtLmxvd2VyKCldCisgICAg ICAgICAgICAgICAgIi0tZGVidWciIGlmIHNlbGYuZGVidWcgZWxzZSAiLS1yZWxlYXNlIiwgJy0t JyArIHNlbGYucGxhdGZvcm0ubG93ZXIoKV0KICAgICAgICAgICAgIGlmIHNlbGYubWFrZWFyZ3M6 CiAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIi0tbWFrZWFyZ3M9JXMiICUgc2VsZi5t YWtlYXJncykKICAgICAgICAgICAgIGlmIHNlbGYuY21ha2VhcmdzOgpAQCAtNzU3LDcgKzc3NSw3 IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAKICAgICAgICAgaWYgc2VsZi5ydW5fdGVzdHMgaXMg bm90IE5vbmU6CiAgICAgICAgICAgICB0ZXN0X2xhdW5jaGVyID0gW29zLnBhdGguam9pbihzZWxm LnNhbmRib3hfc291cmNlX3Jvb3QsICdUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMnKSwK LSAgICAgICAgICAgICAgICAiLS1kZWJ1ZyIgaWYgc2VsZi5kZWJ1ZyAgZWxzZSAiLS1yZWxlYXNl IiwgJy0tJyArIHNlbGYucGxhdGZvcm0ubG93ZXIoKV0gKyBzZWxmLnJ1bl90ZXN0cworICAgICAg ICAgICAgICAgICItLWRlYnVnIiBpZiBzZWxmLmRlYnVnIGVsc2UgIi0tcmVsZWFzZSIsICctLScg KyBzZWxmLnBsYXRmb3JtLmxvd2VyKCldICsgc2VsZi5ydW5fdGVzdHMKICAgICAgICAgICAgIHJl dHVybiBzZWxmLnJ1bl9pbl9zYW5kYm94KCp0ZXN0X2xhdW5jaGVyKQogICAgICAgICBlbGlmIHNl bGYuZ2RiIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2dkYigpCg== 344025 2018-06-30 15:43:38 -0700 2018-07-02 10:16:24 -0700 Patch bug-187218-20180630174337.patch text/plain 4732 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzk2MWE3NjVjNDY2NWQ2MDZkMTY2MjVjOWU0YjdjOGQy NjI0MDBkMy4uYTQzMzVlMDA1M2U3NjQ2ODg1ZjZiZjYyZmFmZGFhYjM0NGFiMmVlNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE4LTA2LTMwICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv bT4KKworICAgICAgICBbV1BFXVtHVEtdIGZsYXRwYWt1dGlscy5weSBzaG91bGQgcmVzcGVjdCBz ZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gYnVpbGQgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MjE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhZCB0aGUgYnVpbGQgdHlwZSBmcm9tIFdlYktp dEJ1aWxkL0NvbmZpZ3VyYXRpb24gYW5kIHJlc3BlY3QgaXQsIGlmIHRoZSBidWlsZCB0eXBlIGlz IG5vdAorICAgICAgICBwYXNzZWQgb24gdGhlIGNvbW1hbmQgbGluZS4KKworICAgICAgICAqIGZs YXRwYWsvZmxhdHBha3V0aWxzLnB5OgorICAgICAgICAoV2Via2l0RmxhdHBhay5sb2FkX2Zyb21f YXJncyk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLl9faW5pdF9fKToKKyAgICAgICAgKFdlYmtp dEZsYXRwYWsucmVhZF9jb25maWd1cmF0aW9uKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuY2xl YW5fYXJncyk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnNldHVwX2Rldl9lbnYpOgorCiAyMDE4 LTA2LTMwICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAg ICAgICBbQ01ha2VdIGJ1aWxkLXdlYmtpdCBzaG91bGQgYmUgYWJsZSB0byBlbmFibGUgYWRkcmVz cyBzYW5pdGl6ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5IGIv VG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKaW5kZXggZTNiY2EwOWZjNDg5NzllNWQ3Yjlh NzQ1MGJmN2Y0MTcwNmY2MWM4YS4uMWE5ODg2NGYzYWEzOTIyZmViZWI3MmM2NDZjYzM4NjE1NmI3 OTUwMSAxMDA2NDQKLS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKKysrIGIvVG9v bHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKQEAgLTQ0Niw3ICs0NDYsNyBAQCBjbGFzcyBXZWJr aXRGbGF0cGFrOgogICAgICAgICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihwcm9n PSJ3ZWJraXQtZmxhdHBhayIpCiAgICAgICAgIGdlbmVyYWwgPSBwYXJzZXIuYWRkX2FyZ3VtZW50 X2dyb3VwKCJHZW5lcmFsIikKICAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi0tZGVidWci LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9IkNvbXBpbGUgd2l0aCBEZWJ1ZyBj b25maWd1cmF0aW9uLCBhbHNvIGluc3RhbGxzIFNkayBkZWJ1ZyBzeW1ib2xlcy4iLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGhlbHA9IkNvbXBpbGUgd2l0aCBEZWJ1ZyBjb25maWd1cmF0 aW9uLCBhbHNvIGluc3RhbGxzIFNkayBkZWJ1ZyBzeW1ib2xzLiIsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90cnVlIikKICAgICAgICAgZ2VuZXJhbC5hZGRfYXJn dW1lbnQoIi0tcmVsZWFzZSIsIGhlbHA9IkNvbXBpbGUgd2l0aCBSZWxlYXNlIGNvbmZpZ3VyYXRp b24uIiwgYWN0aW9uPSJzdG9yZV90cnVlIikKICAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQo Jy0tcGxhdGZvcm0nLCBhY3Rpb249J3N0b3JlJywgaGVscD0nUGxhdGZvcm0gdG8gdXNlIChlLmcu LCAibWFjLWxpb24iKScpLApAQCAtNTE2LDYgKzUxNiw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6 CiAKICAgICAgICAgc2VsZi5ub19mbGF0cGFrX3VwZGF0ZSA9IEZhbHNlCiAgICAgICAgIHNlbGYu ZGVidWcgPSBGYWxzZQorICAgICAgICBzZWxmLnJlbGVhc2UgPSBGYWxzZQogICAgICAgICBzZWxm LmNsZWFuID0gRmFsc2UKICAgICAgICAgc2VsZi5ydW5fdGVzdHMgPSBOb25lCiAgICAgICAgIHNl bGYuc291cmNlX3Jvb3QgPSBvcy5wYXRoLm5vcm1wYXRoKG9zLnBhdGguYWJzcGF0aChvcy5wYXRo LmpvaW4oc2NyaXB0ZGlyLCAnLi4vLi4vJykpKQpAQCAtNTUwLDcgKzU1MSwyNSBAQCBjbGFzcyBX ZWJraXRGbGF0cGFrOgogICAgICAgICBzZWxmLmNtYWtlYXJncyA9ICIiCiAgICAgICAgIHNlbGYu bWFrZWFyZ3MgPSAiIgogCisgICAgZGVmIHJlYWRfY29uZmlndXJhdGlvbihzZWxmLCBidWlsZF9y b290KToKKyAgICAgICAgaWYgbm90IHNlbGYuZGVidWcgYW5kIG5vdCBzZWxmLnJlbGVhc2U6Cisg ICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgd2l0aCBvcGVuKG9zLnBhdGguam9pbihi dWlsZF9yb290LCAnQ29uZmlndXJhdGlvbicpKSBhcyBjb25maWc6CisgICAgICAgICAgICAgICAg ICAgIGZvciBsaW5lIGluIGNvbmZpZzoKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIGxpbmUu c3RyaXAoKSA9PSAnUmVsZWFzZSc6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5y ZWxlYXNlID0gVHJ1ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybgorICAgICAg ICAgICAgICAgICAgICAgICAgZWxpZiBsaW5lLnN0cmlwKCkgPT0gJ0RlYnVnJzoKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLmRlYnVnID0gVHJ1ZQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybgorICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3I6CisgICAgICAgICAg ICAgICAgcGFzcworICAgICAgICBzZWxmLnJlbGVhc2UgPSBUcnVlCisKICAgICBkZWYgY2xlYW5f YXJncyhzZWxmKToKKyAgICAgICAgYnVpbGRfcm9vdCA9IG9zLnBhdGguam9pbihzZWxmLnNvdXJj ZV9yb290LCAnV2ViS2l0QnVpbGQnKQorICAgICAgICBzZWxmLnJlYWRfY29uZmlndXJhdGlvbihi dWlsZF9yb290KQorCiAgICAgICAgIHNlbGYucGxhdGZvcm0gPSBzZWxmLnBsYXRmb3JtLnVwcGVy KCkKICAgICAgICAgc2VsZi5idWlsZF90eXBlID0gIkRlYnVnIiBpZiBzZWxmLmRlYnVnIGVsc2Ug IlJlbGVhc2UiCiAgICAgICAgIGlmIHNlbGYuZ2RiIGlzIE5vbmUgYW5kICctLWdkYicgaW4gc3lz LmFyZ3Y6CkBAIC01NjUsNyArNTg0LDYgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAg c2VsZi5tYW5pZmVzdF9wYXRoID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihzY3JpcHRk aXIsICcuLi9mbGF0cGFrL29yZy53ZWJraXQuV2ViS2l0LnlhbWwnKSkKICAgICAgICAgc2VsZi5i dWlsZF9uYW1lID0gc2VsZi5uYW1lICsgIi1nZW5lcmF0ZWQiCiAKLSAgICAgICAgYnVpbGRfcm9v dCA9IG9zLnBhdGguam9pbihzZWxmLnNvdXJjZV9yb290LCAnV2ViS2l0QnVpbGQnKQogICAgICAg ICBzZWxmLmZsYXRwYWtfYnVpbGRfcGF0aCA9IG9zLnBhdGguam9pbihidWlsZF9yb290LCBzZWxm LnBsYXRmb3JtLCAiRmxhdHBha1RyZWUiICsgc2VsZi5idWlsZF90eXBlKQogICAgICAgICBzZWxm LmNhY2hlX3BhdGggPSBvcy5wYXRoLmpvaW4oYnVpbGRfcm9vdCwgIkZsYXRwYWtDYWNoZSIpCiAg ICAgICAgIHNlbGYuYnVpbGRfcGF0aCA9IG9zLnBhdGguam9pbihidWlsZF9yb290LCBzZWxmLnBs YXRmb3JtLCBzZWxmLmJ1aWxkX3R5cGUpCkBAIC03NDIsNyArNzYwLDcgQEAgY2xhc3MgV2Via2l0 RmxhdHBhazoKIAogICAgICAgICBpZiBzZWxmLmJ1aWxkX3dlYmtpdDoKICAgICAgICAgICAgIGJ1 aWxkZXIgPSBbb3MucGF0aC5qb2luKHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwgJ1Rvb2xzL1Nj cmlwdHMvYnVpbGQtd2Via2l0JyksCi0gICAgICAgICAgICAgICAgIi0tZGVidWciIGlmIHNlbGYu ZGVidWcgIGVsc2UgIi0tcmVsZWFzZSIsICctLScgKyBzZWxmLnBsYXRmb3JtLmxvd2VyKCldCisg ICAgICAgICAgICAgICAgIi0tZGVidWciIGlmIHNlbGYuZGVidWcgZWxzZSAiLS1yZWxlYXNlIiwg Jy0tJyArIHNlbGYucGxhdGZvcm0ubG93ZXIoKV0KICAgICAgICAgICAgIGlmIHNlbGYubWFrZWFy Z3M6CiAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIi0tbWFrZWFyZ3M9JXMiICUgc2Vs Zi5tYWtlYXJncykKICAgICAgICAgICAgIGlmIHNlbGYuY21ha2VhcmdzOgpAQCAtNzU3LDcgKzc3 NSw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAKICAgICAgICAgaWYgc2VsZi5ydW5fdGVzdHMg aXMgbm90IE5vbmU6CiAgICAgICAgICAgICB0ZXN0X2xhdW5jaGVyID0gW29zLnBhdGguam9pbihz ZWxmLnNhbmRib3hfc291cmNlX3Jvb3QsICdUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMn KSwKLSAgICAgICAgICAgICAgICAiLS1kZWJ1ZyIgaWYgc2VsZi5kZWJ1ZyAgZWxzZSAiLS1yZWxl YXNlIiwgJy0tJyArIHNlbGYucGxhdGZvcm0ubG93ZXIoKV0gKyBzZWxmLnJ1bl90ZXN0cworICAg ICAgICAgICAgICAgICItLWRlYnVnIiBpZiBzZWxmLmRlYnVnIGVsc2UgIi0tcmVsZWFzZSIsICct LScgKyBzZWxmLnBsYXRmb3JtLmxvd2VyKCldICsgc2VsZi5ydW5fdGVzdHMKICAgICAgICAgICAg IHJldHVybiBzZWxmLnJ1bl9pbl9zYW5kYm94KCp0ZXN0X2xhdW5jaGVyKQogICAgICAgICBlbGlm IHNlbGYuZ2RiIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2dkYigp Cg== 344114 2018-07-02 10:16:26 -0700 2018-07-02 10:43:39 -0700 Patch bug-187218-20180702121626.patch text/plain 2162 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGJlNzEzM2Y4YTkwNTU5OWZmYTdlZjI3N2JkN2U0Mjhm ZmQyNDU1OS4uZmU4MjIzZmRkYjk2MzgyZjUxNjFlZDIzNTM3YWMyZDlmMWZmOGM4MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE4LTA3LTAyICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv bT4KKworICAgICAgICBbV1BFXVtHVEtdIGZsYXRwYWt1dGlscy5weSBzaG91bGQgcmVzcGVjdCBz ZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gYnVpbGQgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MjE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgdGhlIHdlYmtpdHB5IENvbmZpZyBtb2R1 bGUsIGlmIHRoZSBidWlsZCB0eXBlIGlzIG5vdCBwYXNzZWQgb24gdGhlIGNvbW1hbmQgbGluZSwg d2UKKyAgICAgICAgcmVhZCBpdCBmcm9tIFdlYktpdEJ1aWxkL0NvbmZpZ3VyYXRpb24gYW5kIHJl c3BlY3QgaXQuCisKKyAgICAgICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAg KFdlYmtpdEZsYXRwYWsuX19pbml0X18pOgorICAgICAgICAoV2Via2l0RmxhdHBhay5jbGVhbl9h cmdzKToKKwogMjAxOC0wNy0wMiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW1dQRV0gQWRkIHRvdWNoIHN1cHBvcnQgdG8gV2luZG93Vmlld0JhY2tlbmQK ZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5IGIvVG9vbHMvZmxhdHBh ay9mbGF0cGFrdXRpbHMucHkKaW5kZXggZTNiY2EwOWZjNDg5NzllNWQ3YjlhNzQ1MGJmN2Y0MTcw NmY2MWM4YS4uMDg4MDAwOTgwZTkzYzg2YTA0ZGZkZGY5NGQwZmY5YTFkOGE2NTJjZSAxMDA2NDQK LS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKKysrIGIvVG9vbHMvZmxhdHBhay9m bGF0cGFrdXRpbHMucHkKQEAgLTI5LDYgKzI5LDkgQEAgaW1wb3J0IHN5cwogaW1wb3J0IHRlbXBm aWxlCiBpbXBvcnQgcmUKIAorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3Qg aW1wb3J0IFN5c3RlbUhvc3QKK2Zyb20gd2Via2l0cHkucG9ydC5mYWN0b3J5IGltcG9ydCBQb3J0 RmFjdG9yeQorCiB0cnk6CiAgICAgZnJvbSB1cmxsaWIucGFyc2UgaW1wb3J0IHVybHBhcnNlICAj IHB5bGludDogZGlzYWJsZT1FMDYxMQogZXhjZXB0IEltcG9ydEVycm9yOgpAQCAtNTE1LDYgKzUx OCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNlbGYuZmluaXNoX2FyZ3MgPSBO b25lCiAKICAgICAgICAgc2VsZi5ub19mbGF0cGFrX3VwZGF0ZSA9IEZhbHNlCisgICAgICAgIHNl bGYucmVsZWFzZSA9IEZhbHNlCiAgICAgICAgIHNlbGYuZGVidWcgPSBGYWxzZQogICAgICAgICBz ZWxmLmNsZWFuID0gRmFsc2UKICAgICAgICAgc2VsZi5ydW5fdGVzdHMgPSBOb25lCkBAIC01NTEs OCArNTU1LDE0IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNlbGYubWFrZWFyZ3Mg PSAiIgogCiAgICAgZGVmIGNsZWFuX2FyZ3Moc2VsZik6Ci0gICAgICAgIHNlbGYucGxhdGZvcm0g PSBzZWxmLnBsYXRmb3JtLnVwcGVyKCkKKyAgICAgICAgaWYgbm90IHNlbGYuZGVidWcgYW5kIG5v dCBzZWxmLnJlbGVhc2U6CisgICAgICAgICAgICBmYWN0b3J5ID0gUG9ydEZhY3RvcnkoU3lzdGVt SG9zdCgpKQorICAgICAgICAgICAgcG9ydCA9IGZhY3RvcnkuZ2V0KHNlbGYucGxhdGZvcm0pCisg ICAgICAgICAgICBzZWxmLmRlYnVnID0gVHJ1ZSBpZiBwb3J0LmRlZmF1bHRfY29uZmlndXJhdGlv bigpID09ICJEZWJ1ZyIgZWxzZSBGYWxzZQogICAgICAgICBzZWxmLmJ1aWxkX3R5cGUgPSAiRGVi dWciIGlmIHNlbGYuZGVidWcgZWxzZSAiUmVsZWFzZSIKKworICAgICAgICBzZWxmLnBsYXRmb3Jt ID0gc2VsZi5wbGF0Zm9ybS51cHBlcigpCisKICAgICAgICAgaWYgc2VsZi5nZGIgaXMgTm9uZSBh bmQgJy0tZ2RiJyBpbiBzeXMuYXJndjoKICAgICAgICAgICAgIHNlbGYuZ2RiID0gIiIKIAo= 344116 2018-07-02 10:43:41 -0700 2018-07-02 12:02:25 -0700 Patch bug-187218-20180702124340.patch text/plain 2143 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGJlNzEzM2Y4YTkwNTU5OWZmYTdlZjI3N2JkN2U0Mjhm ZmQyNDU1OS4uZmU4MjIzZmRkYjk2MzgyZjUxNjFlZDIzNTM3YWMyZDlmMWZmOGM4MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE4LTA3LTAyICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv bT4KKworICAgICAgICBbV1BFXVtHVEtdIGZsYXRwYWt1dGlscy5weSBzaG91bGQgcmVzcGVjdCBz ZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gYnVpbGQgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MjE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgdGhlIHdlYmtpdHB5IENvbmZpZyBtb2R1 bGUsIGlmIHRoZSBidWlsZCB0eXBlIGlzIG5vdCBwYXNzZWQgb24gdGhlIGNvbW1hbmQgbGluZSwg d2UKKyAgICAgICAgcmVhZCBpdCBmcm9tIFdlYktpdEJ1aWxkL0NvbmZpZ3VyYXRpb24gYW5kIHJl c3BlY3QgaXQuCisKKyAgICAgICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAg KFdlYmtpdEZsYXRwYWsuX19pbml0X18pOgorICAgICAgICAoV2Via2l0RmxhdHBhay5jbGVhbl9h cmdzKToKKwogMjAxOC0wNy0wMiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW1dQRV0gQWRkIHRvdWNoIHN1cHBvcnQgdG8gV2luZG93Vmlld0JhY2tlbmQK ZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5IGIvVG9vbHMvZmxhdHBh ay9mbGF0cGFrdXRpbHMucHkKaW5kZXggZTNiY2EwOWZjNDg5NzllNWQ3YjlhNzQ1MGJmN2Y0MTcw NmY2MWM4YS4uN2Q1YjViYWI4MDlmMzQzNjI5ZjY2ZjQ0ZTNhOWQ3NmQxMzgzODkwOCAxMDA2NDQK LS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKKysrIGIvVG9vbHMvZmxhdHBhay9m bGF0cGFrdXRpbHMucHkKQEAgLTI5LDYgKzI5LDkgQEAgaW1wb3J0IHN5cwogaW1wb3J0IHRlbXBm aWxlCiBpbXBvcnQgcmUKIAorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3Qg aW1wb3J0IFN5c3RlbUhvc3QKK2Zyb20gd2Via2l0cHkucG9ydC5mYWN0b3J5IGltcG9ydCBQb3J0 RmFjdG9yeQorCiB0cnk6CiAgICAgZnJvbSB1cmxsaWIucGFyc2UgaW1wb3J0IHVybHBhcnNlICAj IHB5bGludDogZGlzYWJsZT1FMDYxMQogZXhjZXB0IEltcG9ydEVycm9yOgpAQCAtNTE1LDYgKzUx OCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNlbGYuZmluaXNoX2FyZ3MgPSBO b25lCiAKICAgICAgICAgc2VsZi5ub19mbGF0cGFrX3VwZGF0ZSA9IEZhbHNlCisgICAgICAgIHNl bGYucmVsZWFzZSA9IEZhbHNlCiAgICAgICAgIHNlbGYuZGVidWcgPSBGYWxzZQogICAgICAgICBz ZWxmLmNsZWFuID0gRmFsc2UKICAgICAgICAgc2VsZi5ydW5fdGVzdHMgPSBOb25lCkBAIC01NTEs OCArNTU1LDE0IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIHNlbGYubWFrZWFyZ3Mg PSAiIgogCiAgICAgZGVmIGNsZWFuX2FyZ3Moc2VsZik6Ci0gICAgICAgIHNlbGYucGxhdGZvcm0g PSBzZWxmLnBsYXRmb3JtLnVwcGVyKCkKKyAgICAgICAgaWYgbm90IHNlbGYuZGVidWcgYW5kIG5v dCBzZWxmLnJlbGVhc2U6CisgICAgICAgICAgICBmYWN0b3J5ID0gUG9ydEZhY3RvcnkoU3lzdGVt SG9zdCgpKQorICAgICAgICAgICAgcG9ydCA9IGZhY3RvcnkuZ2V0KHNlbGYucGxhdGZvcm0pCisg ICAgICAgICAgICBzZWxmLmRlYnVnID0gcG9ydC5kZWZhdWx0X2NvbmZpZ3VyYXRpb24oKSA9PSAi RGVidWciCiAgICAgICAgIHNlbGYuYnVpbGRfdHlwZSA9ICJEZWJ1ZyIgaWYgc2VsZi5kZWJ1ZyBl bHNlICJSZWxlYXNlIgorCisgICAgICAgIHNlbGYucGxhdGZvcm0gPSBzZWxmLnBsYXRmb3JtLnVw cGVyKCkKKwogICAgICAgICBpZiBzZWxmLmdkYiBpcyBOb25lIGFuZCAnLS1nZGInIGluIHN5cy5h cmd2OgogICAgICAgICAgICAgc2VsZi5nZGIgPSAiIgogCg==