Reviewed by Tim Hatcher.

        * Scripts/gdb-safari: Set DYLD_FRAMEWORK_PATH inside gdb instead of setting it in gdb's environment
        to work around what seems to be a bug in some versions of gdb.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c3b46eb3beb002ffcb46ec1441834dac08794946..1d3038eb644a55fb6801f6a018078339c1670618 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-29  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        * Scripts/gdb-safari: Set DYLD_FRAMEWORK_PATH inside gdb instead of setting it in gdb's environment
+        to work around what seems to be a bug in some versions of gdb.
+
 2006-08-16  Tim Omernick  <timo@apple.com>
 
         Reviewed by John Sullivan.

diff --git a/WebKitTools/Scripts/gdb-safari b/WebKitTools/Scripts/gdb-safari
index be5f5a0af89b689b665c0bcab8e8eb69380a2c65..026856c59453fbf27b3bd104d94f7e29d682ded5 100755 (executable)
--- a/WebKitTools/Scripts/gdb-safari
+++ b/WebKitTools/Scripts/gdb-safari
@@ -33,6 +33,7 @@ use Getopt::Long;
 use FindBin;
 use lib $FindBin::Bin;
 use webkitdirs;
+use File::Temp qw/:mktemp/;
 
 setConfiguration();
 my $productDir = productDir();
@@ -45,8 +46,13 @@ die "Can't find gdb executable. Is gdb installed?\n" unless -x $gdbPath;
 # Check to see that all the frameworks are built.
 checkFrameworks();
 
-# Set up DYLD_FRAMEWORK_PATH to point to the product directory.
-$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
+# Put a command to set DYLD_FRAMEWORK_PATH in a temp file.
+my ($fh, $path) = mkstemp("/tmp/gdb-safari-XXXX");
+print $fh "set env DYLD_FRAMEWORK_PATH $productDir\n";
 
+# Start up Safari.
 print "Start Safari under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
-exec $gdbPath, $safariPath or die;
+exec $gdbPath, "-x", $path, $safariPath or die;
+
+# Delete the temporary file.
+unlink0($fh, $path) or die "Error unlinking file $path safely";