Commit 4f5f443a authored by darin's avatar darin

- fixed problem that was causing JavaScriptCore test to fail

          (except for people who had set DYLD_FRAMEWORK_PATH)

        * Scripts/run-javascriptcore-tests: Add code to set DYLD_FRAMEWORK_PATH.
        Add code to parse configuration parameter so you can pass --deployment if you like.
        * Scripts/run-webkit-tests: Add code to parse configuration parameter.

        * Scripts/update-javascriptcore-test-results: Add license header.

        * Scripts/webkitdirs.pm: Change code that reads configuration option to remove it
        from @ARGV. This lets us use this option in commands that take other options and
        pass them along to a subsequent tool.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@9901 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e860b5c4
2005-07-25 Darin Adler <darin@apple.com>
- fixed problem that was causing JavaScriptCore test to fail
(except for people who had set DYLD_FRAMEWORK_PATH)
* Scripts/run-javascriptcore-tests: Add code to set DYLD_FRAMEWORK_PATH.
Add code to parse configuration parameter so you can pass --deployment if you like.
* Scripts/run-webkit-tests: Add code to parse configuration parameter.
* Scripts/update-javascriptcore-test-results: Add license header.
* Scripts/webkitdirs.pm: Change code that reads configuration option to remove it
from @ARGV. This lets us use this option in commands that take other options and
pass them along to a subsequent tool.
2005-07-25 Darin Adler <darin@apple.com>
Reviewed by Geoff Garen.
......
......@@ -28,16 +28,19 @@
# Script to run the Web Kit Open Source Project JavaScriptCore tests (adapted from Mozilla).
use strict;
use FindBin;
use lib $FindBin::Bin;
use webkitdirs;
setConfiguration();
my $productDir = productDir();
chdirWebKit();
chdir "JavaScriptCore/tests/mozilla/" or die;
my $testkjs_path = productDir() . "/testkjs";
my $result = system "perl", "jsDriver.pl", "-L", "ecma/Date", "-e", "kjs", "-s", $testkjs_path, "-f", "actual.html", @ARGV;
chdir "JavaScriptCore/tests/mozilla" or die;
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
my $result = system "perl", "jsDriver.pl", "-L", "ecma/Date", "-e", "kjs", "-s", "$productDir/testkjs", "-f", "actual.html", @ARGV;
exit $result if $result;
......
......@@ -48,9 +48,11 @@ use webkitdirs;
# the number of tests that failed to run
# the number of tests that were run but had no expected results to compare against
chdirWebKit();
setConfiguration();
my $productDir = productDir();
chdirWebKit();
my $result = system "WebKitTools/Scripts/build-dumprendertree", @ARGV;
exit $result if $result;
......@@ -65,7 +67,7 @@ my $testDirectory = "$WebCoreDirectory/layout-tests";
my $testResultsDirectory = "/tmp/layout-test-results";
my $testResults = "$testResultsDirectory/results.html";
$ENV{"DYLD_FRAMEWORK_PATH"} = $productDir;
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
my @tests;
......
#!/usr/bin/perl -w
# Copyright (C) 2005 Apple Computer, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
# its contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
use strict;
use FindBin;
use lib $FindBin::Bin;
use webkitdirs;
chdirWebKit();
chdir "JavaScriptCore/tests/mozilla/" or die;
chdir "JavaScriptCore/tests/mozilla" or die;
open EXPECTED, "expected.html";
open EXPECTED, "expected.html" or die;
while (<EXPECTED>) {
last if /failures reported\.$/;
}
......@@ -19,7 +45,7 @@ while (<EXPECTED>) {
}
close EXPECTED;
open ACTUAL, "actual.html";
open ACTUAL, "actual.html" or die;
my $actual;
while (<ACTUAL>) {
$actual .= $_;
......
......@@ -125,19 +125,37 @@ sub XcodeOptions
return (@baseProductDirOption, "-configuration", $configuration);
}
sub passedConfiguration
my $passedConfiguration;
my $searchedForPassedConfiguration;
sub determinePassedConfiguration
{
for my $opt (@ARGV) {
return "Development" if $opt =~ /^--devel/i;
return "Deployment" if $opt =~ /^--deploy/i;
return if $searchedForPassedConfiguration;
$searchedForPassedConfiguration = 1;
for my $i (0 .. $#ARGV) {
if ($opt =~ /^--debug$/i || $opt =~ /^--devel/i) {
splice(@ARGV, $i, 1);
$passedConfiguration = "Development";
return;
}
if ($opt =~ /^--release$/i || $opt =~ /^--deploy/i) {
splice(@ARGV, $i, 1);
$passedConfiguration = "Deployment";
return;
}
}
return undef;
$passedConfiguration = undef;
}
sub passedConfiguration
{
determinePassedConfiguration();
return $passedConfiguration;
}
sub setConfiguration
{
my $passed = passedConfiguration();
$configuration = $passed if $passed;
determinePassedConfiguration();
$configuration = $passedConfiguration if $passedConfiguration;
}
# Locate Safari.
......
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