Bug 187218 – [WPE][GTK] flatpakutils.py should respect set-webkit-configuration build type

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Michael Catanzaro]

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

[Philippe Normand]

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.

[Thibault Saunier]

> 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.

[Michael Catanzaro]

(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.

[Michael Catanzaro]

OK, I see the flatpak script is mounting release build stuff by mistake... good catch Philippe :)

[Thibault Saunier]

`set-webkit-configuration --debug`

Never heard of it, so we are not handling that thing I guess :-)

[Michael Catanzaro]

Created attachment 344019 [details]
Patch

[Michael Catanzaro]

Comment on attachment 344019 [details]
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.

[Thibault Saunier]

Comment on attachment 344019 [details]
Patch

Looks good to me, I don't have the power to r+ yet though :-)

[Michael Catanzaro]

Created attachment 344025 [details]
Patch

[Michael Catanzaro]

(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

[Daniel Bates]

Comment on attachment 344025 [details]
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?

[Michael Catanzaro]

(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.

[Michael Catanzaro]

(In reply to Michael Catanzaro from comment #12)
> Oh definitely, let me try to use that.

Much better this way!

[Michael Catanzaro]

Created attachment 344114 [details]
Patch

[Philippe Normand]

Comment on attachment 344114 [details]
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"

[Philippe Normand]

Comment on attachment 344114 [details]
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

[Michael Catanzaro]

(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

[Michael Catanzaro]

Created attachment 344116 [details]
Patch

[Michael Catanzaro]

(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.

[WebKit Commit Bot]

Comment on attachment 344116 [details]
Patch

Clearing flags on attachment: 344116

Committed r233428: <https://trac.webkit.org/changeset/233428>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.