Changeset 122350 in webkit

Timestamp:

Jul 11, 2012 11:45:10 AM (12 years ago)

Author:

mrowe@apple.com

Message:

<​http://webkit.org/b/90835> Teach bisect-builds to work with a Safari.app that has entitlements.

Reviewed by Dan Bernstein.

• Scripts/bisect-builds: Use safariPathFromSafariBundle to determine which binary within the application

should be invoked.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bisect-builds (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-09  Mark Rowe  <mrowe@apple.com>
+
+        <http://webkit.org/b/90835> Teach bisect-builds to work with a Safari.app that has entitlements.
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/bisect-builds: Use safariPathFromSafariBundle to determine which binary within the application
+        should be invoked.
+
 2012-07-11  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Tools/Scripts/bisect-builds

@@ -44 +44 @@
 use File::Spec;
 use File::Temp qw(tempfile);
+use FindBin;
 use Getopt::Long;
 use Time::HiRes qw(usleep);
+
+use lib $FindBin::Bin;
+use webkitdirs qw(safariPathFromSafariBundle);
 
 sub createTempFile($);
@@ -120 +124 @@
 $nightlyDownloadDirectory = glob($nightlyDownloadDirectory) if $nightlyDownloadDirectory =~ /^~/;
 $safariPath = glob($safariPath) if $safariPath =~ /^~/;
-$safariPath = File::Spec->catdir($safariPath, "Contents/MacOS/Safari") if $safariPath =~ m#\.app/*#;
+$safariPath = safariPathFromSafariBundle($safariPath) if $safariPath =~ m#\.app/*#;
 
 $nightlyDownloadDirectory = File::Spec->catdir($nightlyDownloadDirectory, $branch);