2008-06-07 Cameron Zwarich <cwzwarich@uwaterloo.ca>

        Reviewed by Dan Bernstein.

        Bug 17928: testkjs shouldn't require "-f"
        <https://bugs.webkit.org/show_bug.cgi?id=17928>

        * kjs/testkjs.cpp:
        (printUsageStatement):
        (parseArguments):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@34437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2652ba677dbe93f06cf90bf3c29dbac3de71cc73..748bbbb1aaa20bf4a11b2c8fcb89fb4e99f62b05 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2008-06-07  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Dan Bernstein.
+
+        Bug 17928: testkjs shouldn't require "-f"
+        <https://bugs.webkit.org/show_bug.cgi?id=17928>
+
+        * kjs/testkjs.cpp:
+        (printUsageStatement):
+        (parseArguments):
+
 2008-06-07  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 
         Reviewed by Eric.

diff --git a/JavaScriptCore/kjs/testkjs.cpp b/JavaScriptCore/kjs/testkjs.cpp
index e24d5696e44bf5e2c1ab8914c015e580637c582e..bdd859b8d8e38f3647b9327de447eff425fe34b2 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.cpp
+++ b/JavaScriptCore/kjs/testkjs.cpp
@@ -326,13 +326,17 @@ static bool runWithScripts(const Vector<UString>& fileNames, Vector<UString>& ar
 
 static void printUsageStatement()
 {
-    fprintf(stderr, "Usage: testkjs -f file1 [-f file2...][-p][-- arguments...]\n");
+    fprintf(stderr, "Usage: testkjs [options] [files] [-- arguments]\n");
+    fprintf(stderr, "  -f  Specifies a source file (deprecated)\n");
+    fprintf(stderr, "  -p  Prints formatted source code\n");
+    fprintf(stderr, "  -d  Dumps bytecode (debug builds only)\n");
+    fprintf(stderr, "  -s  Installs signal handlers that exit on a crash (Unix platforms only)\n");
     exit(-1);
 }
 
 static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, Vector<UString>& arguments, bool& prettyPrint, bool& dump)
 {
-    if (argc < 3)
+    if (argc < 2)
         printUsageStatement();
 
     int i = 1;
@@ -365,9 +369,12 @@ static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, Ve
             ++i;
             break;
         }
-        break;
+        fileNames.append(argv[i]);
     }
-
+    
+    if (fileNames.isEmpty())
+        printUsageStatement();
+    
     for (; i < argc; ++i)
         arguments.append(argv[i]);
 }