Commit 13202588 authored by mjs@apple.com's avatar mjs@apple.com

JavaScriptCore:

2008-06-15  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by Oliver.
        
        - rename testkjs to jsc

        * GNUmakefile.am:
        * JavaScriptCore.vcproj/JavaScriptCore.sln:
        * JavaScriptCore.vcproj/jsc: Added.
        * JavaScriptCore.vcproj/jsc/jsc.vcproj: Copied from JavaScriptCore.vcproj/testkjs/testkjs.vcproj.
        * JavaScriptCore.vcproj/testkjs: Removed.
        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Removed.
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * jscore.bkl:
        * kjs/Shell.cpp: Copied from kjs/testkjs.cpp.
        (main):
        (printUsageStatement):
        (jscmain):
        * kjs/jsc.pro: Copied from kjs/testkjs.pro.
        * kjs/testkjs.cpp: Removed.
        * kjs/testkjs.pro: Removed.
        * tests/mozilla/expected.html:
        * tests/mozilla/js1_2/Array/tostring_1.js:
        * tests/mozilla/js1_2/Array/tostring_2.js:
        * tests/mozilla/jsDriver.pl:

WebKitTools:

2008-06-15  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by Oliver.
        
        - rename testkjs to jsc

        * Scripts/build-jsc: Copied from Scripts/build-testkjs.
        * Scripts/build-testkjs: Removed.
        * Scripts/run-javascriptcore-tests:
        * Scripts/run-jsc: Copied from Scripts/run-testkjs.
        * Scripts/run-sunspider:
        * Scripts/run-testkjs: Removed.
        * Scripts/sunspider-compare-results:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0ce29fde
2008-06-15 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- rename testkjs to jsc
* GNUmakefile.am:
* JavaScriptCore.vcproj/JavaScriptCore.sln:
* JavaScriptCore.vcproj/jsc: Added.
* JavaScriptCore.vcproj/jsc/jsc.vcproj: Copied from JavaScriptCore.vcproj/testkjs/testkjs.vcproj.
* JavaScriptCore.vcproj/testkjs: Removed.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Removed.
* JavaScriptCore.xcodeproj/project.pbxproj:
* jscore.bkl:
* kjs/Shell.cpp: Copied from kjs/testkjs.cpp.
(main):
(printUsageStatement):
(jscmain):
* kjs/jsc.pro: Copied from kjs/testkjs.pro.
* kjs/testkjs.cpp: Removed.
* kjs/testkjs.pro: Removed.
* tests/mozilla/expected.html:
* tests/mozilla/js1_2/Array/tostring_1.js:
* tests/mozilla/js1_2/Array/tostring_2.js:
* tests/mozilla/jsDriver.pl:
2008-06-15 Cameron Zwarich <cwzwarich@uwaterloo.ca>
Reviewed by Maciej.
......
......@@ -150,7 +150,7 @@ JavaScriptCore/pcre/chartables.c: $(srcdir)/JavaScriptCore/pcre/dftables
noinst_PROGRAMS += \
Programs/minidom \
Programs/testkjs
Programs/jsc
# minidom
Programs_minidom_SOURCES = \
......@@ -181,14 +181,14 @@ Programs_minidom_LDADD = \
libJavaScriptCore.la \
-lstdc++
# testkjs
Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp
# jsc
Programs_jsc_SOURCES = JavaScriptCore/kjs/Shell.cpp
Programs_testkjs_CPPFLAGS = \
Programs_jsc_CPPFLAGS = \
$(global_cppflags) \
$(javascriptcore_cppflags)
Programs_testkjs_CXXFLAGS = \
Programs_jsc_CXXFLAGS = \
-fno-strict-aliasing \
-O2 \
$(global_cxxflags) \
......@@ -196,7 +196,7 @@ Programs_testkjs_CXXFLAGS = \
$(GLOBALDEPS_CFLAGS) \
$(UNICODE_CFLAGS)
Programs_testkjs_LDADD = \
Programs_jsc_LDADD = \
libJavaScriptCore.la
# Clean rules for JavaScriptCore
......@@ -208,5 +208,5 @@ CLEANFILES += \
JavaScriptCore/kjs/regexp_object.lut.h \
JavaScriptCore/kjs/string_object.lut.h \
JavaScriptCore/pcre/chartables.c \
Programs/testkjs \
Programs/jsc \
Programs/minidom
......@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScrip
{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testkjs", "testkjs\testkjs.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"
ProjectSection(ProjectDependencies) = postProject
{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
{011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
......
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="testkjs"
Name="jsc"
ProjectGUID="{C59E5129-B453-49B7-A52B-1E104715F76E}"
RootNamespace="testkjs"
RootNamespace="jsc"
Keyword="Win32Proj"
>
<Platforms>
......@@ -228,7 +228,7 @@
</References>
<Files>
<File
RelativePath="..\..\kjs\testkjs.cpp"
RelativePath="..\..\kjs\Shell.cpp"
>
</File>
</Files>
......
......@@ -197,7 +197,7 @@
932F5BD50822A1C700736975 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
932F5BD60822A1C700736975 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EC0705C86C9A00E6DF1B /* libobjc.dylib */; };
932F5BD70822A1C700736975 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9322A00306C341D3009067BB /* libicucore.dylib */; };
932F5BDD0822A1C700736975 /* testkjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E12D8806A49B0F00E9DF84 /* testkjs.cpp */; };
932F5BDD0822A1C700736975 /* Shell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E12D8806A49B0F00E9DF84 /* Shell.cpp */; };
932F5BEA0822A1C700736975 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
932FC11D0824A6A3005B3C75 /* create_hash_table in Headers */ = {isa = PBXBuildFile; fileRef = F692A8540255597D01FF60F7 /* create_hash_table */; settings = {ATTRIBUTES = (Private, ); }; };
935AF46C09E9D9DB00ACD1D8 /* Forward.h in Headers */ = {isa = PBXBuildFile; fileRef = 935AF46909E9D9DB00ACD1D8 /* Forward.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -373,7 +373,7 @@
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 932F5BDA0822A1C700736975;
remoteInfo = "testkjs (Upgraded)";
remoteInfo = "jsc (Upgraded)";
};
/* End PBXContainerItemProxy section */
......@@ -461,7 +461,7 @@
1C9051450BA9E8A70081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScript.h; sourceTree = "<group>"; };
1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
45E12D8806A49B0F00E9DF84 /* testkjs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testkjs.cpp; path = ../kjs/testkjs.cpp; sourceTree = "<group>"; tabWidth = 4; };
45E12D8806A49B0F00E9DF84 /* Shell.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Shell.cpp; path = ../kjs/Shell.cpp; sourceTree = "<group>"; tabWidth = 4; };
5186111D0CC824830081412B /* Deque.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Deque.h; sourceTree = "<group>"; };
51F0EB6105C86C6B00E6DF1B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
51F0EC0705C86C9A00E6DF1B /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = /usr/lib/libobjc.dylib; sourceTree = "<absolute>"; };
......@@ -537,7 +537,7 @@
9322A00306C341D3009067BB /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
932F5BD80822A1C700736975 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
932F5BD90822A1C700736975 /* JavaScriptCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
932F5BE10822A1C700736975 /* testkjs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testkjs; sourceTree = BUILT_PRODUCTS_DIR; };
932F5BE10822A1C700736975 /* jsc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jsc; sourceTree = BUILT_PRODUCTS_DIR; };
933A3499038AE7C6008635CE /* grammar.y */ = {isa = PBXFileReference; explicitFileType = sourcecode.yacc; fileEncoding = 4; indentWidth = 4; path = grammar.y; sourceTree = "<group>"; tabWidth = 8; };
933A349A038AE7C6008635CE /* identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = identifier.h; sourceTree = "<group>"; tabWidth = 8; };
933A349D038AE80F008635CE /* identifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = identifier.cpp; sourceTree = "<group>"; tabWidth = 8; };
......@@ -699,7 +699,7 @@
isa = PBXGroup;
children = (
932F5BD90822A1C700736975 /* JavaScriptCore.framework */,
932F5BE10822A1C700736975 /* testkjs */,
932F5BE10822A1C700736975 /* jsc */,
14BD59BF0A3E8F9000BAF59C /* testapi */,
141211200A48793C00480255 /* minidom */,
);
......@@ -761,7 +761,7 @@
144005170A531CB50005F061 /* minidom */,
14BD5A2D0A3E91F600BAF59C /* testapi.c */,
14D857740A4696C80032146C /* testapi.js */,
45E12D8806A49B0F00E9DF84 /* testkjs.cpp */,
45E12D8806A49B0F00E9DF84 /* Shell.cpp */,
);
name = tests;
path = API;
......@@ -1379,9 +1379,9 @@
productReference = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */;
productType = "com.apple.product-type.framework";
};
932F5BDA0822A1C700736975 /* testkjs */ = {
932F5BDA0822A1C700736975 /* jsc */ = {
isa = PBXNativeTarget;
buildConfigurationList = 149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "testkjs" */;
buildConfigurationList = 149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "jsc" */;
buildPhases = (
932F5BDC0822A1C700736975 /* Sources */,
932F5BDE0822A1C700736975 /* Frameworks */,
......@@ -1393,10 +1393,10 @@
dependencies = (
14270B0C0A451DA40080EEEA /* PBXTargetDependency */,
);
name = testkjs;
name = jsc;
productInstallPath = /usr/local/bin;
productName = testkjs;
productReference = 932F5BE10822A1C700736975 /* testkjs */;
productName = jsc;
productReference = 932F5BE10822A1C700736975 /* jsc */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */
......@@ -1417,7 +1417,7 @@
65FB3F6609D11E9100F49DEB /* Derived Sources */,
1412111F0A48793C00480255 /* minidom */,
14BD59BE0A3E8F9000BAF59C /* testapi */,
932F5BDA0822A1C700736975 /* testkjs */,
932F5BDA0822A1C700736975 /* jsc */,
);
};
/* End PBXProject section */
......@@ -1588,7 +1588,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
932F5BDD0822A1C700736975 /* testkjs.cpp in Sources */,
932F5BDD0822A1C700736975 /* Shell.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -1632,7 +1632,7 @@
};
932F5BE90822A1C700736975 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 932F5BDA0822A1C700736975 /* testkjs */;
target = 932F5BDA0822A1C700736975 /* jsc */;
targetProxy = 932F5BE80822A1C700736975 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
......@@ -1691,21 +1691,21 @@
149C276808902AFE008A9EFC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = testkjs;
PRODUCT_NAME = jsc;
};
name = Debug;
};
149C276908902AFE008A9EFC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = testkjs;
PRODUCT_NAME = jsc;
};
name = Release;
};
149C276B08902AFE008A9EFC /* Production */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = testkjs;
PRODUCT_NAME = jsc;
};
name = Production;
};
......@@ -1822,7 +1822,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "testkjs" */ = {
149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "jsc" */ = {
isa = XCConfigurationList;
buildConfigurations = (
149C276808902AFE008A9EFC /* Debug */,
......
......@@ -77,7 +77,7 @@ JavaScriptCore Bakefile project file.
</template>
<exe id="testkjs" template="icu,jscore,pthreads">
<exe id="jsc" template="icu,jscore,pthreads">
<cxx-rtti>off</cxx-rtti>
<cxx-exceptions>off</cxx-exceptions>
<debug-info>on</debug-info>
......@@ -90,7 +90,7 @@ JavaScriptCore Bakefile project file.
<include>$(WK_ROOT)/JavaScriptCore/VM</include>
<include>$(WK_ROOT)/JavaScriptCore/wtf</include>
<dirname>$(WKOUTPUTDIR)</dirname>
<sources>$(SRCDIR)/kjs/testkjs.cpp</sources>
<sources>$(SRCDIR)/kjs/Shell.cpp</sources>
<if cond="FORMAT=='gnu'">
<ldflags>$(WKOUTPUTDIR)/libjscore.a</ldflags>
</if>
......
......@@ -269,7 +269,7 @@ JSValue* functionQuit(ExecState*, JSObject*, const List&)
// Use SEH for Release builds only to get rid of the crash report dialog
// (luckily the same tests fail in Release and Debug builds so far). Need to
// be in a separate main function because the kjsmain function requires object
// be in a separate main function because the jscmain function requires object
// unwinding.
#if PLATFORM(WIN_OS) && !defined(_DEBUG)
......@@ -280,7 +280,7 @@ JSValue* functionQuit(ExecState*, JSObject*, const List&)
#define EXCEPT(x)
#endif
int kjsmain(int argc, char** argv);
int jscmain(int argc, char** argv);
int main(int argc, char** argv)
{
......@@ -295,7 +295,7 @@ int main(int argc, char** argv)
int res = 0;
TRY
res = kjsmain(argc, argv);
res = jscmain(argc, argv);
EXCEPT(res = 3)
return res;
}
......@@ -377,7 +377,7 @@ static void runInteractive(GlobalObject* globalObject)
static void printUsageStatement()
{
fprintf(stderr, "Usage: testkjs [options] [files] [-- arguments]\n");
fprintf(stderr, "Usage: jsc [options] [files] [-- arguments]\n");
fprintf(stderr, " -d Dumps bytecode (debug builds only)\n");
fprintf(stderr, " -f Specifies a source file (deprecated)\n");
fprintf(stderr, " -h|--help Prints this help message\n");
......@@ -436,7 +436,7 @@ static void parseArguments(int argc, char** argv, Options& options)
options.arguments.append(argv[i]);
}
int kjsmain(int argc, char** argv)
int jscmain(int argc, char** argv)
{
initializeThreading();
......
TEMPLATE = app
TARGET = testkjs
TARGET = jsc
DESTDIR = ..
SOURCES = testkjs.cpp
SOURCES = Shell.cpp
QT -= gui
DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS
INCLUDEPATH += $$PWD/.. \
......
<html><head>
<title>Test results, kjs</title>
<title>Test results, squirrelfish</title>
</head>
<body bgcolor='white'>
<a name='tippy_top'></a>
<h2>Test results, kjs</h2><br>
<h2>Test results, squirrelfish</h2><br>
<p class='results_summary'>
Test List: All tests<br>
Skip List: (none)<br>
1135 test(s) selected, 1127 test(s) completed, 51 failures reported (4.52% failed)<br>
Engine command line: /Volumes/Big/ggaren/build/Debug/testkjs <br>
Engine command line: /Volumes/Big/ggaren/build/Debug/jsc <br>
OS type: Darwin il0301e-dhcp191.apple.com 9.2.0 Darwin Kernel Version 9.2.0: Tue Feb 5 16:13:22 PST 2008; root:xnu-1228.3.13~1/RELEASE_I386 i386<br>
Testcase execution time: 1 minutes, 50 seconds.<br>
Tests completed on Thu Mar 6 13:53:55 2008.<br><br>
......@@ -557,7 +557,7 @@ STATUS: See https://bugzilla.mozilla.org/show_bug.cgi?id=304828<br>
<pre>
<a name='retest_list'></a>
<h2>Retest List</h2><br>
# Retest List, kjs, generated Thu Mar 6 13:53:55 2008.
# Retest List, squirrelfish, generated Thu Mar 6 13:53:55 2008.
# Original test base was: All tests.
# 1127 of 1135 test(s) were completed, 51 failures reported.
ecma/TypeConversion/9.3.1-3.js
......@@ -610,4 +610,4 @@ js1_5/Scope/scope-001.js
js1_6/Regress/regress-301574.js
js1_6/Regress/regress-309242.js
js1_6/Regress/regress-314887.js
js1_6/String/regress-306591.js
\ No newline at end of file
js1_6/String/regress-306591.js
......@@ -45,7 +45,7 @@
/* This test assumes that if version() exists, it can set the JavaScript
* interpreter to an arbitrary version. To prevent unhandled exceptions in
* other tests, testkjs implements version() as a stub function, but
* other tests, jsc implements version() as a stub function, but
* JavaScriptCore doesn't support setting the JavaScript engine's version.
* Commenting out the following lines forces the test to expect JavaScript
......
......@@ -44,7 +44,7 @@
/* This test assumes that if version() exists, it can set the JavaScript
* interpreter to an arbitrary version. To prevent unhandled exceptions in
* other tests, testkjs implements version() as a stub function, but
* other tests, jsc implements version() as a stub function, but
* JavaScriptCore doesn't support setting the JavaScript engine's version.
* Commenting out the following lines forces the test to expect JavaScript
......
......@@ -480,7 +480,7 @@ sub usage {
"(-c|--classpath) Classpath (Rhino only.)\n" .
"(-e|--engine) <type> ... Specify the type of engine(s) to test.\n" .
" <type> is one or more of\n" .
" (kjs|smopt|smdebug|lcopt|lcdebug|xpcshell|" .
" (squirrelfish|smopt|smdebug|lcopt|lcdebug|xpcshell|" .
"rhino|rhinoi|rhinoms|rhinomsi|rhino9|rhinoms9).\n" .
"(-f|--file) <file> Redirect output to file named <file>.\n" .
" (default is " .
......@@ -553,9 +553,9 @@ sub get_engine_command {
} elsif ($opt_engine_type =~ /^ep(opt|debug)$/) {
&dd ("getting epimetheus engine command.");
$retval = &get_ep_engine_command;
} elsif ($opt_engine_type eq "kjs") {
&dd ("getting kjs engine command.");
$retval = &get_kjs_engine_command;
} elsif ($opt_engine_type eq "squirrelfish") {
&dd ("getting squirrelfish engine command.");
$retval = &get_squirrelfish_engine_command;
} else {
die ("Unknown engine type selected, '$opt_engine_type'.\n");
......@@ -633,9 +633,9 @@ sub get_xpc_engine_command {
}
#
# get the shell command used to run kjs
# get the shell command used to run squirrelfish
#
sub get_kjs_engine_command {
sub get_squirrelfish_engine_command {
my $retval;
if ($opt_shell_path) {
......@@ -644,7 +644,7 @@ sub get_kjs_engine_command {
# 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";
die "Please specify a full path to the squirrelfish testing engine";
}
return $retval;
......
2008-06-15 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- rename testkjs to jsc
* Scripts/build-jsc: Copied from Scripts/build-testkjs.
* Scripts/build-testkjs: Removed.
* Scripts/run-javascriptcore-tests:
* Scripts/run-jsc: Copied from Scripts/run-testkjs.
* Scripts/run-sunspider:
* Scripts/run-testkjs: Removed.
* Scripts/sunspider-compare-results:
2008-06-14 Darin Adler <darin@apple.com>
* Scripts/do-webcore-rename: Moved planned renames into a separate hash
......
......@@ -42,7 +42,7 @@ my @options = XcodeOptions();
chdir "JavaScriptCore" or die "Can't find JavaScriptCore directory to build from";
my $result;
if (isOSX()) {
$result = system "sh", "-c", 'xcodebuild -project JavaScriptCore.xcodeproj -target testkjs "$@" | grep -v setenv && exit ${PIPESTATUS[0]}', "xcodebuild", @options, @ARGV;
$result = system "sh", "-c", 'xcodebuild -project JavaScriptCore.xcodeproj -target jsc "$@" | grep -v setenv && exit ${PIPESTATUS[0]}', "xcodebuild", @options, @ARGV;
} elsif (isCygwin()) {
$result = buildVisualStudioProject("JavaScriptCore.vcproj/JavaScriptCore.sln");
} elsif (isQt() or isGtk() or isWx()) {
......
......@@ -84,9 +84,9 @@ if(!defined($root)){
push(@xcodeArgs, "--gtk") if isGtk();
push(@xcodeArgs, "--wx") if isWx();
my $buildResult = system "perl", "WebKitTools/Scripts/build-testkjs", @xcodeArgs;
my $buildResult = system "perl", "WebKitTools/Scripts/build-jsc", @xcodeArgs;
if ($buildResult) {
print STDERR "Compiling testkjs failed!\n";
print STDERR "Compiling jsc failed!\n";
exit exitStatus($buildResult);
}
}
......@@ -102,15 +102,15 @@ $productDir .= "/Programs" if isGtk();
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
setPathForRunningWebKitApp(\%ENV) if isCygwin();
sub testKJSPath($)
sub jscPath($)
{
my ($productDir) = @_;
my $testkjsName = "testkjs";
$testkjsName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
return "$productDir/$testkjsName";
my $jscName = "jsc";
$jscName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
return "$productDir/$jscName";
}
my $result = system "perl", "jsDriver.pl", "-e", "kjs", "-s", testKJSPath($productDir), "-f", "actual.html", @jsArgs;
my $result = system "perl", "jsDriver.pl", "-e", "squirrelfish", "-s", jscPath($productDir), "-f", "actual.html", @jsArgs;
exit exitStatus($result) if $result;
my %failures;
......
......@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# This script runs a list of scripts through testkjs a specified number of times.
# This script runs a list of scripts through jsc a specified number of times.
use strict;
use warnings;
......@@ -35,7 +35,7 @@ use lib $FindBin::Bin;
use Getopt::Long;
use webkitdirs;
my $usage = "Usage: run-testkjs [--count run_count] [--verbose] shell_file [file2...]";
my $usage = "Usage: run-jsc [--count run_count] [--verbose] shell_file [file2...]";
my $count = 1;
my $verbose = 0;
......@@ -43,15 +43,15 @@ GetOptions("count|c=i" => \$count,
"verbose|v" => \$verbose);
die "$usage\n" if (@ARGV < 1);
my $testkjs = productDir() . "/testkjs @ARGV";
$testkjs .= " 2> /dev/null" unless $verbose;
my $jsc = productDir() . "/jsc @ARGV";
$jsc .= " 2> /dev/null" unless $verbose;
my $dyld = productDir();
$ENV{"DYLD_FRAMEWORK_PATH"} = $dyld;
print STDERR "Running $count time(s): DYLD_FRAMEWORK_PATH=$dyld $testkjs\n";
print STDERR "Running $count time(s): DYLD_FRAMEWORK_PATH=$dyld $jsc\n";
while ($count--) {
if (system("$testkjs") != 0) {
if (system("$jsc") != 0) {
last;
}
}
......
......@@ -75,15 +75,15 @@ if ($showHelp) {
exit 1;
}
sub buildTestKJS
sub buildJSC
{
if (!defined($root)){
push(@ARGV, "--" . $configuration);
chdirWebKit();
my $buildResult = system "WebKitTools/Scripts/build-testkjs", @ARGV;
my $buildResult = system "WebKitTools/Scripts/build-jsc", @ARGV;
if ($buildResult) {
print STDERR "Compiling testkjs failed!\n";
print STDERR "Compiling jsc failed!\n";
exit exitStatus($buildResult);
}
}
......@@ -97,15 +97,15 @@ sub setupEnvironmentForExecution($)
# FIXME: Other platforms may wish to augment this method to use LD_LIBRARY_PATH, etc.
}
sub testKJSPath($)
sub jscPath($)
{
my ($productDir) = @_;
my $testkjsName = "testkjs";
$testkjsName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
return "$productDir/$testkjsName";
my $jscName = "jsc";
$jscName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
return "$productDir/$jscName";
}
buildTestKJS();
buildJSC();
chdirWebKit();
chdir("SunSpider");
......@@ -115,7 +115,7 @@ my $productDir = productDir();
$productDir .= "/JavaScriptCore" if (isQt() or isGtk());
setupEnvironmentForExecution($productDir);
my @args = ("--shell", testKJSPath($productDir), "--runs", $testRuns);
my @args = ("--shell", jscPath($productDir), "--runs", $testRuns);
# This code could be removed if we chose to pass extra args to sunspider instead of Xcode
push @args, "--set-baseline" if $setBaseline;
push @args, "--shark" if $runShark;
......
......@@ -57,13 +57,13 @@ if ($showHelp) {
@ARGV = map { File::Spec->rel2abs($_) } @ARGV;
sub buildTestKJS
sub buildJSC
{
if (!defined($root)){
chdirWebKit();
my $buildResult = system "WebKitTools/Scripts/build-testkjs", "--" . $configuration;
my $buildResult = system "WebKitTools/Scripts/build-jsc", "--" . $configuration;
if ($buildResult) {
print STDERR "Compiling testkjs failed!\n";
print STDERR "Compiling jsc failed!\n";
exit WEXITSTATUS($buildResult);
}
}
......@@ -77,15 +77,15 @@ sub setupEnvironmentForExecution($)
# FIXME: Other platforms may wish to augment this method to use LD_LIBRARY_PATH, etc.
}
sub testKJSPath($)
sub jscPath($)
{
my ($productDir) = @_;
my $testkjsName = "testkjs";
$testkjsName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
return "$productDir/$testkjsName";
my $jscName = "jsc";
$jscName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
return "$productDir/$jscName";
}
buildTestKJS();
buildJSC();
chdirWebKit();
chdir("SunSpider");
......@@ -95,7 +95,7 @@ my $productDir = productDir();
$productDir .= "/JavaScriptCore" if (isQt() or isGtk());
setupEnvironmentForExecution($productDir);
my @args = ("--shell", testKJSPath($productDir));
my @args = ("--shell", jscPath($productDir));
# This code could be removed if we chose to pass extra args to sunspider instead of Xcode
exec "./sunspider-compare-results", @args, @ARGV;
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