1 files changed, 5 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
index fb4c388..cbf8cbc 100755
--- a/WebKitTools/Scripts/run-javascriptcore-tests
+++ b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -108,7 +108,7 @@ sub testapiPath($)
 {
     my ($productDir) = @_;
     my $jscName = "testapi";
-    $jscName .= "_debug"  if (isCygwin() && ($configuration eq "Debug"));
+    $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
     return "$productDir/$jscName";
 }
 
@@ -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;
 }