[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

aroben at apple.com aroben at apple.com
Wed Dec 22 16:13:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 2946d79a51063a6aaf2731cb9a7f69918dee9cbc
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 20:47:26 2010 +0000

    Fix run-javascriptcore-tests when there's a space in the path to testapi
    
    Reviewed by Sam Weinig.
    
    * Scripts/run-javascriptcore-tests: Use an indirect object when calling
    system() to force it to interpret spaces in the path correctly.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72428 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2b5f086..7e1862b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-11-19  Adam Roben  <aroben at apple.com>
 
+        Fix run-javascriptcore-tests when there's a space in the path to
+        testapi
+
+        Reviewed by Sam Weinig.
+
+        * Scripts/run-javascriptcore-tests: Use an indirect object when calling
+        system() to force it to interpret spaces in the path correctly.
+
+2010-11-19  Adam Roben  <aroben at apple.com>
+
         Update scripts for .exe name changes after r72327
 
         As of r72327, the "_debug" suffix is only used in Debug_All builds.
diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
index 8e8c2ef..cbf8cbc 100755
--- a/WebKitTools/Scripts/run-javascriptcore-tests
+++ b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -116,7 +116,10 @@ sub testapiPath($)
 if (isAppleMacWebKit() || isAppleWinWebKit()) {
     chdirWebKit();
     chdir($productDir) or die;
-    my $testapiResult = system testapiPath($productDir);
+    my $path = testapiPath($productDir);
+    # Use an "indirect object" so that system() won't get confused if the path
+    # contains spaces (see perldoc -f exec).
+    my $testapiResult = system { $path } $path;
     exit exitStatus($testapiResult)  if $testapiResult;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list