JavaScriptCore:
authormjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Jun 2008 10:55:28 +0000 (10:55 +0000)
committermjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Jun 2008 10:55:28 +0000 (10:55 +0000)
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

18 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj [moved from JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj with 95% similarity]
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/jscore.bkl
JavaScriptCore/kjs/Shell.cpp [moved from JavaScriptCore/kjs/testkjs.cpp with 98% similarity]
JavaScriptCore/kjs/jsc.pro [moved from JavaScriptCore/kjs/testkjs.pro with 95% similarity]
JavaScriptCore/tests/mozilla/expected.html
JavaScriptCore/tests/mozilla/js1_2/Array/tostring_1.js
JavaScriptCore/tests/mozilla/js1_2/Array/tostring_2.js
JavaScriptCore/tests/mozilla/jsDriver.pl
WebKitTools/ChangeLog
WebKitTools/Scripts/build-jsc [moved from WebKitTools/Scripts/build-testkjs with 95% similarity]
WebKitTools/Scripts/run-javascriptcore-tests
WebKitTools/Scripts/run-jsc [moved from WebKitTools/Scripts/run-testkjs with 86% similarity]
WebKitTools/Scripts/run-sunspider
WebKitTools/Scripts/sunspider-compare-results

index aacdd7b3b123b35bbff81de9c12d3298b10edcfe..53f1a527cf897f014f4f34dd0ccb606d70edd1a7 100644 (file)
@@ -1,3 +1,29 @@
+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.
 2008-06-15  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 
         Reviewed by Maciej.
index 0a479c26c8823cee693e56b5a4effeaae0de8f57..2a009dbec82fe4c39ace3f00ba1d4ac844544c30 100644 (file)
@@ -150,7 +150,7 @@ JavaScriptCore/pcre/chartables.c: $(srcdir)/JavaScriptCore/pcre/dftables
 
 noinst_PROGRAMS += \
        Programs/minidom \
 
 noinst_PROGRAMS += \
        Programs/minidom \
-       Programs/testkjs
+       Programs/jsc
 
 # minidom
 Programs_minidom_SOURCES = \
 
 # minidom
 Programs_minidom_SOURCES = \
@@ -181,14 +181,14 @@ Programs_minidom_LDADD = \
         libJavaScriptCore.la \
         -lstdc++
 
         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)
 
        $(global_cppflags) \
        $(javascriptcore_cppflags)
 
-Programs_testkjs_CXXFLAGS = \
+Programs_jsc_CXXFLAGS = \
        -fno-strict-aliasing \
        -O2 \
        $(global_cxxflags) \
        -fno-strict-aliasing \
        -O2 \
        $(global_cxxflags) \
@@ -196,7 +196,7 @@ Programs_testkjs_CXXFLAGS = \
        $(GLOBALDEPS_CFLAGS) \
        $(UNICODE_CFLAGS)
 
        $(GLOBALDEPS_CFLAGS) \
        $(UNICODE_CFLAGS)
 
-Programs_testkjs_LDADD = \
+Programs_jsc_LDADD = \
        libJavaScriptCore.la
 
 # Clean rules for JavaScriptCore
        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 \
        JavaScriptCore/kjs/regexp_object.lut.h \
        JavaScriptCore/kjs/string_object.lut.h \
        JavaScriptCore/pcre/chartables.c \
-       Programs/testkjs \
+       Programs/jsc \
        Programs/minidom
        Programs/minidom
index 14a53f8981d04ad62659b11d0cae176415048da6..0fbc787fb5c53c0418b81d27979db88d6d0d3ab0 100644 (file)
@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScrip
                {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}\r
        EndProjectSection\r
 EndProject\r
                {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testkjs", "testkjs\testkjs.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}\r
        ProjectSection(ProjectDependencies) = postProject\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}\r
similarity index 95%
rename from JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
rename to JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
index 8bf30f6043671db6ef6cfbf77b11bee5e57eceb4..e05f7585b3dabcb58e54543d92ce1321da544925 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="testkjs"\r
+       Name="jsc"\r
        ProjectGUID="{C59E5129-B453-49B7-A52B-1E104715F76E}"\r
        ProjectGUID="{C59E5129-B453-49B7-A52B-1E104715F76E}"\r
-       RootNamespace="testkjs"\r
+       RootNamespace="jsc"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
        </References>\r
        <Files>\r
                <File\r
        </References>\r
        <Files>\r
                <File\r
-                       RelativePath="..\..\kjs\testkjs.cpp"\r
+                       RelativePath="..\..\kjs\Shell.cpp"\r
                        >\r
                </File>\r
        </Files>\r
                        >\r
                </File>\r
        </Files>\r
index 6ba83c02554f5b5490093a70bcaa51669ba1492c..ed1ea892f4062f249262ca336cf3845a2024fd8f 100644 (file)
                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 */; };
                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, ); }; };
                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, ); }; };
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 932F5BDA0822A1C700736975;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 932F5BDA0822A1C700736975;
-                       remoteInfo = "testkjs (Upgraded)";
+                       remoteInfo = "jsc (Upgraded)";
                };
 /* End PBXContainerItemProxy section */
 
                };
 /* End PBXContainerItemProxy section */
 
                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>"; };
                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>"; };
                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>"; };
                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; };
                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; };
                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; };
                        isa = PBXGroup;
                        children = (
                                932F5BD90822A1C700736975 /* JavaScriptCore.framework */,
                        isa = PBXGroup;
                        children = (
                                932F5BD90822A1C700736975 /* JavaScriptCore.framework */,
-                               932F5BE10822A1C700736975 /* testkjs */,
+                               932F5BE10822A1C700736975 /* jsc */,
                                14BD59BF0A3E8F9000BAF59C /* testapi */,
                                141211200A48793C00480255 /* minidom */,
                        );
                                14BD59BF0A3E8F9000BAF59C /* testapi */,
                                141211200A48793C00480255 /* minidom */,
                        );
                                144005170A531CB50005F061 /* minidom */,
                                14BD5A2D0A3E91F600BAF59C /* testapi.c */,
                                14D857740A4696C80032146C /* testapi.js */,
                                144005170A531CB50005F061 /* minidom */,
                                14BD5A2D0A3E91F600BAF59C /* testapi.c */,
                                14D857740A4696C80032146C /* testapi.js */,
-                               45E12D8806A49B0F00E9DF84 /* testkjs.cpp */,
+                               45E12D8806A49B0F00E9DF84 /* Shell.cpp */,
                        );
                        name = tests;
                        path = API;
                        );
                        name = tests;
                        path = API;
                        productReference = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */;
                        productType = "com.apple.product-type.framework";
                };
                        productReference = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */;
                        productType = "com.apple.product-type.framework";
                };
-               932F5BDA0822A1C700736975 /* testkjs */ = {
+               932F5BDA0822A1C700736975 /* jsc */ = {
                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "testkjs" */;
+                       buildConfigurationList = 149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "jsc" */;
                        buildPhases = (
                                932F5BDC0822A1C700736975 /* Sources */,
                                932F5BDE0822A1C700736975 /* Frameworks */,
                        buildPhases = (
                                932F5BDC0822A1C700736975 /* Sources */,
                                932F5BDE0822A1C700736975 /* Frameworks */,
                        dependencies = (
                                14270B0C0A451DA40080EEEA /* PBXTargetDependency */,
                        );
                        dependencies = (
                                14270B0C0A451DA40080EEEA /* PBXTargetDependency */,
                        );
-                       name = testkjs;
+                       name = jsc;
                        productInstallPath = /usr/local/bin;
                        productInstallPath = /usr/local/bin;
-                       productName = testkjs;
-                       productReference = 932F5BE10822A1C700736975 /* testkjs */;
+                       productName = jsc;
+                       productReference = 932F5BE10822A1C700736975 /* jsc */;
                        productType = "com.apple.product-type.tool";
                };
 /* End PBXNativeTarget section */
                        productType = "com.apple.product-type.tool";
                };
 /* End PBXNativeTarget section */
                                65FB3F6609D11E9100F49DEB /* Derived Sources */,
                                1412111F0A48793C00480255 /* minidom */,
                                14BD59BE0A3E8F9000BAF59C /* testapi */,
                                65FB3F6609D11E9100F49DEB /* Derived Sources */,
                                1412111F0A48793C00480255 /* minidom */,
                                14BD59BE0A3E8F9000BAF59C /* testapi */,
-                               932F5BDA0822A1C700736975 /* testkjs */,
+                               932F5BDA0822A1C700736975 /* jsc */,
                        );
                };
 /* End PBXProject section */
                        );
                };
 /* End PBXProject section */
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               932F5BDD0822A1C700736975 /* testkjs.cpp in Sources */,
+                               932F5BDD0822A1C700736975 /* Shell.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                };
                932F5BE90822A1C700736975 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                932F5BE90822A1C700736975 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 932F5BDA0822A1C700736975 /* testkjs */;
+                       target = 932F5BDA0822A1C700736975 /* jsc */;
                        targetProxy = 932F5BE80822A1C700736975 /* PBXContainerItemProxy */;
                };
 /* End PBXTargetDependency section */
                        targetProxy = 932F5BE80822A1C700736975 /* PBXContainerItemProxy */;
                };
 /* End PBXTargetDependency section */
                149C276808902AFE008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                149C276808902AFE008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = testkjs;
+                               PRODUCT_NAME = jsc;
                        };
                        name = Debug;
                };
                149C276908902AFE008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Debug;
                };
                149C276908902AFE008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = testkjs;
+                               PRODUCT_NAME = jsc;
                        };
                        name = Release;
                };
                149C276B08902AFE008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Release;
                };
                149C276B08902AFE008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = testkjs;
+                               PRODUCT_NAME = jsc;
                        };
                        name = Production;
                };
                        };
                        name = Production;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
-               149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "testkjs" */ = {
+               149C276708902AFE008A9EFC /* Build configuration list for PBXNativeTarget "jsc" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                149C276808902AFE008A9EFC /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                149C276808902AFE008A9EFC /* Debug */,
index 9e9369464bdb0d08274576354fcc5c7aa27c2861..8963fcf02002f03acd45cb516fdc11083f8fd5a0 100644 (file)
@@ -77,7 +77,7 @@ JavaScriptCore Bakefile project file.
 
     </template>
     
 
     </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>
         <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>
         <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>
         <if cond="FORMAT=='gnu'">
             <ldflags>$(WKOUTPUTDIR)/libjscore.a</ldflags>
         </if>
similarity index 98%
rename from JavaScriptCore/kjs/testkjs.cpp
rename to JavaScriptCore/kjs/Shell.cpp
index 2809da8040f25acc460a532ac04a22b3f3b703e2..2c8b7351a5a273a2c8aa9fe761af534c9d3e0f17 100644 (file)
@@ -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
 
 // 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)
 // unwinding.
 
 #if PLATFORM(WIN_OS) && !defined(_DEBUG)
@@ -280,7 +280,7 @@ JSValue* functionQuit(ExecState*, JSObject*, const List&)
 #define EXCEPT(x)
 #endif
 
 #define EXCEPT(x)
 #endif
 
-int kjsmain(int argc, char** argv);
+int jscmain(int argc, char** argv);
 
 int main(int argc, char** argv)
 {
 
 int main(int argc, char** argv)
 {
@@ -295,7 +295,7 @@ int main(int argc, char** argv)
 
     int res = 0;
     TRY
 
     int res = 0;
     TRY
-        res = kjsmain(argc, argv);
+        res = jscmain(argc, argv);
     EXCEPT(res = 3)
     return res;
 }
     EXCEPT(res = 3)
     return res;
 }
@@ -377,7 +377,7 @@ static void runInteractive(GlobalObject* globalObject)
 
 static void printUsageStatement()
 {
 
 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");
     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]);
 }
 
         options.arguments.append(argv[i]);
 }
 
-int kjsmain(int argc, char** argv)
+int jscmain(int argc, char** argv)
 {
     initializeThreading();
 
 {
     initializeThreading();
 
similarity index 95%
rename from JavaScriptCore/kjs/testkjs.pro
rename to JavaScriptCore/kjs/jsc.pro
index 3886f20dda8cd4e524c73b5ff51aa94f6d93ede0..cc8d6cbf6669029c579270c7e4e5f6eb12e4003d 100644 (file)
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TEMPLATE = app
-TARGET = testkjs
+TARGET = jsc
 DESTDIR = ..
 DESTDIR = ..
-SOURCES = testkjs.cpp
+SOURCES = Shell.cpp
 QT -= gui
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
 INCLUDEPATH += $$PWD/.. \
 QT -= gui
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
 INCLUDEPATH += $$PWD/.. \
index ba9d72a0e1bc3953db5a780f3c1eaf0c4082d1e4..010ad10477aacab874a03c04ea5e6a3cfd778948 100644 (file)
@@ -1,14 +1,14 @@
 <html><head>
 <html><head>
-<title>Test results, kjs</title>
+<title>Test results, squirrelfish</title>
 </head>
 <body bgcolor='white'>
 <a name='tippy_top'></a>
 </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>
 <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>
 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>
 <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
 # 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/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
index 453d8ab7c596c8f953c494964996b1e8d2c96872..b74228e4c87854a54798a624d23050931b7e1f44 100644 (file)
@@ -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
 
     /* 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
      * JavaScriptCore doesn't support setting the JavaScript engine's version.
      
      * Commenting out the following lines forces the test to expect JavaScript
index ae9542bee32fb09002e3d5663fd429d8f26c4ad2..5ed7425bbfb43618a06ec76d03907ffebe193182 100644 (file)
@@ -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
 
     /* 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
      * JavaScriptCore doesn't support setting the JavaScript engine's version.
      
      * Commenting out the following lines forces the test to expect JavaScript
index b725db7c32598a0381417691c34f35fe51411957..b6276198f479690f6227df418a36bb4420958fb7 100644 (file)
@@ -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" .
      "(-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 " .
      "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 =~ /^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");
         
     } 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) {
     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 {
         # 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;
     }
     
     return $retval;
index 3d39cb48417a74f2e2574b7c22e420397a4dbb93..6b450b84a96453a3b7b15ad2a43d26bd6c00fc4f 100644 (file)
@@ -1,3 +1,17 @@
+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
 2008-06-14  Darin Adler  <darin@apple.com>
 
         * Scripts/do-webcore-rename: Moved planned renames into a separate hash
similarity index 95%
rename from WebKitTools/Scripts/build-testkjs
rename to WebKitTools/Scripts/build-jsc
index 5dc28ad2171ae79d86a9fef835929c4aa923541d..f258ea55c13495cbff02609a2ffeae620cc14428 100755 (executable)
@@ -42,7 +42,7 @@ my @options = XcodeOptions();
 chdir "JavaScriptCore" or die "Can't find JavaScriptCore directory to build from";
 my $result;
 if (isOSX()) {
 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()) {
 } elsif (isCygwin()) {
     $result = buildVisualStudioProject("JavaScriptCore.vcproj/JavaScriptCore.sln");
 } elsif (isQt() or isGtk() or isWx()) {
index 32f33508626b6228827983ad0698039c9ba355bf..6c8ced141b56a97287e3e29d261ab545dc1f39e2 100755 (executable)
@@ -84,9 +84,9 @@ if(!defined($root)){
     push(@xcodeArgs, "--gtk")  if isGtk();
     push(@xcodeArgs, "--wx")  if isWx();
 
     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) {
     if ($buildResult) {
-        print STDERR "Compiling testkjs failed!\n";
+        print STDERR "Compiling jsc failed!\n";
         exit exitStatus($buildResult);
     }
 }
         exit exitStatus($buildResult);
     }
 }
@@ -102,15 +102,15 @@ $productDir .= "/Programs" if isGtk();
 $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
 setPathForRunningWebKitApp(\%ENV) if isCygwin();
 
 $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
 setPathForRunningWebKitApp(\%ENV) if isCygwin();
 
-sub testKJSPath($)
+sub jscPath($)
 {
     my ($productDir) = @_;
 {
     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;
 exit exitStatus($result)  if $result;
 
 my %failures;
similarity index 86%
rename from WebKitTools/Scripts/run-testkjs
rename to WebKitTools/Scripts/run-jsc
index 5610badee6c6e64a00c544bcf4996b3a77000735..20dc5e8b50166ebf9bd52caa493415b3a51ac1d8 100755 (executable)
@@ -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.
 
 # (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;
 
 use strict;
 use warnings;
@@ -35,7 +35,7 @@ use lib $FindBin::Bin;
 use Getopt::Long;
 use webkitdirs;
 
 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;
 
 my $count = 1;
 my $verbose = 0;
@@ -43,15 +43,15 @@ GetOptions("count|c=i" => \$count,
            "verbose|v" => \$verbose);
 die "$usage\n" if (@ARGV < 1);
 
            "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;
 
 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--) {
 while ($count--) {
-    if (system("$testkjs") != 0) {
+    if (system("$jsc") != 0) {
         last;
     }
 }
         last;
     }
 }
index 3656881fe48228e08d7a3e8c5cb5553c34be86ff..e07f62871c4a4ebc7068c0ef1c35891b28f11c36 100755 (executable)
@@ -75,15 +75,15 @@ if ($showHelp) {
    exit 1;
 }
 
    exit 1;
 }
 
-sub buildTestKJS
+sub buildJSC
 {
     if (!defined($root)){
         push(@ARGV,  "--" . $configuration);
         
         chdirWebKit();
 {
     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) {
         if ($buildResult) {
-            print STDERR "Compiling testkjs failed!\n";
+            print STDERR "Compiling jsc failed!\n";
             exit exitStatus($buildResult);
         }
     }
             exit exitStatus($buildResult);
         }
     }
@@ -97,15 +97,15 @@ sub setupEnvironmentForExecution($)
     # FIXME: Other platforms may wish to augment this method to use LD_LIBRARY_PATH, etc.
 }
 
     # FIXME: Other platforms may wish to augment this method to use LD_LIBRARY_PATH, etc.
 }
 
-sub testKJSPath($)
+sub jscPath($)
 {
     my ($productDir) = @_;
 {
     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");
 
 chdirWebKit();
 chdir("SunSpider");
@@ -115,7 +115,7 @@ my $productDir = productDir();
 $productDir .= "/JavaScriptCore" if (isQt() or isGtk());
 
 setupEnvironmentForExecution($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;
 # 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;
index cf18aaea03c15d727c4b8a1c5696fe7281734225..ec0863a3b0cb04038c1074a423d2aaa7615abb79 100755 (executable)
@@ -57,13 +57,13 @@ if ($showHelp) {
 
 @ARGV = map { File::Spec->rel2abs($_) } @ARGV;
 
 
 @ARGV = map { File::Spec->rel2abs($_) } @ARGV;
 
-sub buildTestKJS
+sub buildJSC
 {
     if (!defined($root)){
         chdirWebKit();
 {
     if (!defined($root)){
         chdirWebKit();
-        my $buildResult = system "WebKitTools/Scripts/build-testkjs", "--" . $configuration;
+        my $buildResult = system "WebKitTools/Scripts/build-jsc", "--" . $configuration;
         if ($buildResult) {
         if ($buildResult) {
-            print STDERR "Compiling testkjs failed!\n";
+            print STDERR "Compiling jsc failed!\n";
             exit WEXITSTATUS($buildResult);
         }
     }
             exit WEXITSTATUS($buildResult);
         }
     }
@@ -77,15 +77,15 @@ sub setupEnvironmentForExecution($)
     # FIXME: Other platforms may wish to augment this method to use LD_LIBRARY_PATH, etc.
 }
 
     # FIXME: Other platforms may wish to augment this method to use LD_LIBRARY_PATH, etc.
 }
 
-sub testKJSPath($)
+sub jscPath($)
 {
     my ($productDir) = @_;
 {
     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");
 
 chdirWebKit();
 chdir("SunSpider");
@@ -95,7 +95,7 @@ my $productDir = productDir();
 $productDir .= "/JavaScriptCore" if (isQt() or isGtk());
 
 setupEnvironmentForExecution($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;
 # This code could be removed if we chose to pass extra args to sunspider instead of Xcode
 
 exec "./sunspider-compare-results", @args, @ARGV;