Changeset 34180 in webkit for trunk/JavaScriptCore

Timestamp:

May 28, 2008, 1:13:53 PM (17 years ago)

Author:

Adam Roben

Message:

Fix JavaScriptCore tests on OS X

We were quoting the path to testkjs too late, after it had already
been combined with spaces and other options.

• tests/mozilla/jsDriver.pl: (top level): Move path quoting from here... (sub get_kjs_engine_command): ...to here.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• tests/mozilla/jsDriver.pl (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-28  Adam Roben  <[email protected]>
+
+        Fix JavaScriptCore tests on OS X
+
+        We were quoting the path to testkjs too late, after it had already
+        been combined with spaces and other options.
+
+        * tests/mozilla/jsDriver.pl:
+        (top level): Move path quoting from here...
+        (sub get_kjs_engine_command): ...to here.
+
 2008-05-28  Anders Carlsson  <[email protected]>
 

trunk/JavaScriptCore/tests/mozilla/jsDriver.pl

@@ -174 +174 @@
 # since the last time we looked.)
         if ($last_suite ne $suite || $last_test_dir ne $test_dir) {
-            # FIXME: Quoting the path this way won't work with paths with
-            # quotes in them. A better fix would be to use the multi-parameter
-            # version of open(), but that doesn't work on ActiveState Perl.
-            $shell_command = "\"" . &xp_path($engine_command) . "\" -s ";
+            $shell_command = &xp_path($engine_command) . " -s ";
             
             $path = &xp_path($opt_suite_path . $suite . "/shell.js");
@@ -643 +640 @@
     
     if ($opt_shell_path) {
-        $retval = $opt_shell_path;
+        # FIXME: Quoting the path this way won't work with paths with quotes in
+        # them. A better fix would be to use the multi-parameter version of
+        # open(), but that doesn't work on ActiveState Perl.
+        $retval = "\"" . $opt_shell_path . "\"";
     } else {
         die "Please specify a full path to the kjs testing engine";