Attachment 359495 Details for Bug 193576 – Patch

[patch] Patch

bug-193576-20190118184342.patch (text/plain), 3.38 KB, created by Adrian Perez on 2019-01-18 08:43:44 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2019-01-18 08:43:44 PST

Size: 3.38 KB

patch

obsolete

>Subversion Revision: 240148
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 79bf80cf3acae85ae451db92e3f569da23e5ee6a..d6f51d32be3eaaf0dc7add34b2ab3b1b44d4d095 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-18  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [GTK][WPE] Make debug-test-runner work
>+        https://bugs.webkit.org/show_bug.cgi?id=193576
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitdirs.pm:
>+        (wrapperPrefixIfNeeded): Only add the wrapper prefix when not running inside a Flatpak sandbox.
>+        (setupUnixWebKitEnvironment): Added, sets TEST_RUNNER_INJECTED_BUNDLE_FILENAME and
>+        TEST_RUNNER_TEST_PLUGIN_PATH in the environment.
>+        (execUnixAppForDebugging): Added.
>+        (debugWebKitTestRunner): Alternatively, use execUnixAppForDebugging() for the WPE and GTK+ ports.
>+
> 2019-01-18  Charlie Turner  <cturner@igalia.com>
> 
>         [GStreamer][EME][ClearKey] Request keys from CDMInstance rather than passing via bus messages
>diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
>index d6eed6e1cb0e23cd6cf1c19d6c1b3ca01246a479..a5b69fd5ca985d90f5dbe010059844d0cbbe720a 100755
>--- a/Tools/Scripts/webkitdirs.pm
>+++ b/Tools/Scripts/webkitdirs.pm
>@@ -88,6 +88,7 @@ BEGIN {
>        &sdkPlatformDirectory
>        &setConfiguration
>        &setupMacWebKitEnvironment
>+       &setupUnixWebKitEnvironment
>        &sharedCommandLineOptions
>        &sharedCommandLineOptionsUsage
>        &shutDownIOSSimulatorDevice
>@@ -2068,7 +2069,7 @@ sub wrapperPrefixIfNeeded()
>     if (isAppleCocoaWebKit()) {
>         return ("xcrun");
>     }
>-    if (-e getJhbuildPath()) {
>+    if (shouldUseJhbuild() and ! shouldUseFlatpak()) {
>         my @prefix = (File::Spec->catfile(sourceDir(), "Tools", "jhbuild", "jhbuild-wrapper"));
>         if (isGtk()) {
>             push(@prefix, "--gtk");
>@@ -2491,6 +2492,14 @@ sub setupMacWebKitEnvironment($)
>     setUpGuardMallocIfNeeded();
> }
> 
>+sub setupUnixWebKitEnvironment($)
>+{
>+    my ($productDir) = @_;
>+
>+    $ENV{TEST_RUNNER_INJECTED_BUNDLE_FILENAME} = File::Spec->catfile($productDir, "lib", "libTestRunnerInjectedBundle.so");
>+    $ENV{TEST_RUNNER_TEST_PLUGIN_PATH} = File::Spec->catdir($productDir, "lib", "plugins");
>+}
>+
> sub setupIOSWebKitEnvironment($)
> {
>     my ($dyldFrameworkPath) = @_;
>@@ -2829,6 +2838,24 @@ sub execMacWebKitAppForDebugging($)
>     exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSeparator, $appPath, argumentsForRunAndDebugMacWebKitApp() or die;
> }
> 
>+sub execUnixAppForDebugging($)
>+{
>+    my ($appPath) = @_;
>+
>+    my $debuggerPath = `which gdb | head -1`;
>+    chomp $debuggerPath;
>+    die "Can't find the gdb executable.\n" unless -x $debuggerPath;
>+
>+    my $productDir = productDir();
>+    setupUnixWebKitEnvironment($productDir);
>+
>+    my @cmdline = wrapperPrefixIfNeeded();
>+    push @cmdline, $debuggerPath, "--args", $appPath;
>+
>+    print "Starting @{[basename($appPath)]} under gdb with build WebKit in $productDir.\n";
>+    exec @cmdline, @ARGV or die;
>+}
>+
> sub debugSafari
> {
>     if (isAppleMacWebKit()) {
>@@ -2892,6 +2919,8 @@ sub debugWebKitTestRunner
> {
>     if (isAppleMacWebKit()) {
>         execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "WebKitTestRunner"));
>+    } elsif (isGtk() or isWPE()) {
>+        execUnixAppForDebugging(File::Spec->catfile(productDir(), "bin", "WebKitTestRunner"));
>     }
> 
>     return 1;

Actions: View | Formatted Diff | Diff

Attachments on bug 193576: 359495 | 376917