Changeset 121122 in webkit

Timestamp:

Jun 24, 2012, 4:07:31 PM (14 years ago)

Author:

mitz@apple.com

Message:

Made debug-{minibrowser,safari,test-runner} work with LLDB.

Reviewed by Sam Weinig.

• Scripts/debug-minibrowser: Pass INCLUDE_OPTIONS_FOR_DEBUGGING to

printHelpAndExitForRunAndDebugWebKitAppIfNeeded().

• Scripts/debug-safari: Ditto.
• Scripts/debug-test-runner: Ditto.
• Scripts/webkitdirs.pm:

(debugger): Added. Calls determineDebugger() if needed and returns the chosen debugger.
(determineDebugger): Added. Sets the debugger to "lldb" if the --use-lldb switch is present,
and to "gdb" otherwise.
(printHelpAndExitForRunAndDebugWebKitAppIfNeeded): Changed to print help for the
--target-web-process and --use-lldb switches if passed INCLUDE_OPTIONS_FOR_DEBUGGING.
(execMacWebKitAppForDebugging): Changed to use the chosen debugger.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/debug-minibrowser (modified) (1 diff)
• Scripts/debug-safari (modified) (1 diff)
• Scripts/debug-test-runner (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (8 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-24  Dan Bernstein  <mitz@apple.com>
+
+        Made debug-{minibrowser,safari,test-runner} work with LLDB.
+
+        Reviewed by Sam Weinig.
+
+        * Scripts/debug-minibrowser: Pass INCLUDE_OPTIONS_FOR_DEBUGGING to
+        printHelpAndExitForRunAndDebugWebKitAppIfNeeded().
+        * Scripts/debug-safari: Ditto.
+        * Scripts/debug-test-runner: Ditto.
+        * Scripts/webkitdirs.pm:
+        (debugger): Added. Calls determineDebugger() if needed and returns the chosen debugger.
+        (determineDebugger): Added. Sets the debugger to "lldb" if the --use-lldb switch is present,
+        and to "gdb" otherwise.
+        (printHelpAndExitForRunAndDebugWebKitAppIfNeeded): Changed to print help for the
+        --target-web-process and --use-lldb switches if passed INCLUDE_OPTIONS_FOR_DEBUGGING.
+        (execMacWebKitAppForDebugging): Changed to use the chosen debugger.
+
 2012-06-24  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/debug-minibrowser

@@ -34 +34 @@
 use webkitdirs;
 
-printHelpAndExitForRunAndDebugWebKitAppIfNeeded();
+printHelpAndExitForRunAndDebugWebKitAppIfNeeded(INCLUDE_OPTIONS_FOR_DEBUGGING);
 
 setConfiguration();

trunk/Tools/Scripts/debug-safari

@@ -34 +34 @@
 use webkitdirs;
 
-printHelpAndExitForRunAndDebugWebKitAppIfNeeded();
+printHelpAndExitForRunAndDebugWebKitAppIfNeeded(INCLUDE_OPTIONS_FOR_DEBUGGING);
 
 setConfiguration();

trunk/Tools/Scripts/debug-test-runner

@@ -31 +31 @@
 use webkitdirs;
 
-printHelpAndExitForRunAndDebugWebKitAppIfNeeded();
+printHelpAndExitForRunAndDebugWebKitAppIfNeeded(INCLUDE_OPTIONS_FOR_DEBUGGING);
 
 setConfiguration();

trunk/Tools/Scripts/webkitdirs.pm

@@ -72 +72 @@
 
 use constant USE_OPEN_COMMAND => 1; # Used in runMacWebKitApp().
+use constant INCLUDE_OPTIONS_FOR_DEBUGGING => 1;
 
 our @EXPORT_OK;
@@ -84 +85 @@
 my $sourceDir;
 my $currentSVNRevision;
+my $debugger;
 my $nmPath;
 my $osXVersion;
@@ -1403 +1405 @@
 }
 
+sub debugger
+{
+    determineDebugger();
+    return $debugger;
+}
+
+sub determineDebugger
+{
+    return if defined($debugger);
+    if (checkForArgumentAndRemoveFromARGV("--use-lldb")) {
+        $debugger = "lldb";
+    } else {
+        $debugger = "gdb";
+    }
+}
+
 sub appendToEnvironmentVariableList
 {
@@ -2598 +2616 @@
 }
 
-sub printHelpAndExitForRunAndDebugWebKitAppIfNeeded()
+sub printHelpAndExitForRunAndDebugWebKitAppIfNeeded
 {
     return unless checkForArgumentAndRemoveFromARGV("--help");
+
+    my ($includeOptionsForDebugging) = @_;
+
     print STDERR <<EOF;
 Usage: @{[basename($0)]} [options] [args ...]
@@ -2607 +2628 @@
   --guard-malloc        Enable Guard Malloc (Mac OS X only)
 EOF
+
+    if ($includeOptionsForDebugging) {
+        print STDERR <<EOF;
+  --target-web-process  Debug the web process
+  --use-lldb            Use LLDB
+EOF
+    }
+
     exit(1);
 }
@@ -2639 +2668 @@
 {
     my ($appPath) = @_;
-
-    my $gdbPath = `xcrun -find gdb`;
-    chomp $gdbPath;
-    die "Can't find gdb executable. Is gdb installed?\n" unless -x $gdbPath;
+    my $architectureSwitch;
+    my $argumentsSeparator;
+
+    if (debugger() eq "lldb") {
+        $architectureSwitch = "--arch";
+        $argumentsSeparator = "--";
+    } elsif (debugger() eq "gdb") {
+        $architectureSwitch = "-arch";
+        $argumentsSeparator = "--args";
+    } else {
+        die "Unknown debugger $debugger.\n";
+    }
+
+    my $debuggerPath = `xcrun -find $debugger`;
+    chomp $debuggerPath;
+    die "Can't find the $debugger executable.\n" unless -x $debuggerPath;
 
     my $productDir = productDir();
@@ -2650 +2691 @@
     setUpGuardMallocIfNeeded();
 
-    my @architectureFlags = ("-arch", architecture());
+    my @architectureFlags = ($architectureSwitch, architecture());
     if (!shouldTargetWebProcess()) {
-        print "Starting @{[basename($appPath)]} under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
-        exec { $gdbPath } $gdbPath, @architectureFlags, "--args", $appPath, argumentsForRunAndDebugMacWebKitApp() or die;
+        print "Starting @{[basename($appPath)]} under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
+        exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSeparator, $appPath, argumentsForRunAndDebugMacWebKitApp() or die;
     } else {
         my $webProcessShimPath = File::Spec->catfile($productDir, "WebProcessShim.dylib");
@@ -2661 +2702 @@
         appendToEnvironmentVariableList("DYLD_INSERT_LIBRARIES", $webProcessShimPath);
 
-        print "Starting WebProcess under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
-        exec { $gdbPath } $gdbPath, @architectureFlags, "--args", $webProcessPath, $webKit2ExecutablePath, "-type", "webprocess", "-client-executable", $appPath or die;
+        print "Starting WebProcess under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
+        exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSeparator, $webProcessPath, $webKit2ExecutablePath, "-type", "webprocess", "-client-executable", $appPath or die;
     }
 }