Commit e06a18a8 authored by aroben@apple.com's avatar aroben@apple.com
Browse files

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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34180 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8a315128
2008-05-28 Adam Roben <aroben@apple.com>
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 <andersca@apple.com>
 
Reviewed by Oliver.
......
......@@ -173,10 +173,7 @@ sub execute_tests {
# (only check for their existance if the suite or test_dir has changed
# 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");
if (-f $path) {
......@@ -642,7 +639,10 @@ sub get_kjs_engine_command {
my $retval;
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";
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment