Reviewed by OMG BETH

        * Scripts/run-testkjs:
        - pipe STDERR to /dev/null by default; new --verbose option overrides
        this behavior
        - set DYLD_FRAMEWORK_PATH to the webkit-configured path
        - output run command in a format that can be copied and pasted into the
        terminal to run manually

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 045c4c9846a0f64d92c1f429e71fad416b445766..66f910a76741a5b260800355b48abeea18a3b723 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by OMG BETH
+
+        * Scripts/run-testkjs:
+        - pipe STDERR to /dev/null by default; new --verbose option overrides
+        this behavior
+        - set DYLD_FRAMEWORK_PATH to the webkit-configured path
+        - output run command in a format that can be copied and pasted into the
+        terminal to run manually
+
 2006-04-03  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by harrison

diff --git a/WebKitTools/Scripts/run-testkjs b/WebKitTools/Scripts/run-testkjs
index 8f78e5dc48a6b1fd2ac5687ad13eacd5f0c88c64..9f65e9caabc07409a10419172237eac6974c2e5a 100755 (executable)
--- a/WebKitTools/Scripts/run-testkjs
+++ b/WebKitTools/Scripts/run-testkjs
@@ -35,16 +35,24 @@ use lib $FindBin::Bin;
 use Getopt::Long;
 use webkitdirs;
 
-my $usage = "Usage: run-testkjs [-c|--count run_count] file1 [file2...]";
+my $usage = "Usage: run-testkjs [--count run_count] [--verbose] file1 [file2...]";
 
 my $count = 1;
-GetOptions("count|c=i" => \$count);
+my $verbose = 0;
+GetOptions("count|c=i" => \$count,
+           "verbose|v" => \$verbose);
 die "$usage\n" if (@ARGV < 1);
 
-my $testkjs = productDir() . "/testkjs";
+my $testkjs = productDir() . "/testkjs @ARGV";
+$testkjs .= " 2> /dev/null" unless $verbose;
 
-print STDERR "Running $count times: \"$testkjs @ARGV\"\n"; 
+my $dyld = productDir();
+
+$ENV{"DYLD_FRAMEWORK_PATH"} = $dyld;
+print STDERR "Running $count time(s): DYLD_FRAMEWORK_PATH=$dyld $testkjs\n";
 while ($count--) {
-    system($testkjs, @ARGV) and last;
+    if (system("$testkjs") != 0) {
+        last;
+    }
 }