Changeset 89136 in webkit

Timestamp:

Jun 17, 2011 8:06:29 AM (13 years ago)

Author:

dbates@webkit.org

Message:

2011-06-17 Daniel Bates <​dbates@rim.com>

Rubber-stamped by Eric Seidel.

Remove run-javascriptcore-tests --skip-build option; Instead add --build/no-build options
​https://bugs.webkit.org/show_bug.cgi?id=62767

Part 1 of 3

Towards renaming the option --skip-build to --no-build. Add --build/--no-build options to
run-javascriptcore-tests. Also, add a remark about these options to the usage message
printed by run-javascriptcore-tests.

We'll remove --skip-build in a follow up patch once the master buildbot picks up the changes.

• Scripts/run-javascriptcore-tests: Additionally, remove unnecessary initialization of $showHelp.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-17  Daniel Bates  <dbates@rim.com>
+
+        Rubber-stamped by Eric Seidel.
+
+        Remove run-javascriptcore-tests --skip-build option; Instead add --build/no-build options
+        https://bugs.webkit.org/show_bug.cgi?id=62767
+
+        Part 1 of 3
+
+        Towards renaming the option --skip-build to --no-build. Add --build/--no-build options to
+        run-javascriptcore-tests. Also, add a remark about these options to the usage message
+        printed by run-javascriptcore-tests.
+
+        We'll remove --skip-build in a follow up patch once the master buildbot picks up the changes.
+
+        * Scripts/run-javascriptcore-tests: Additionally, remove unnecessary initialization
+          of $showHelp.
+
 2011-06-17  Joone Hur  <joone.hur@collabora.co.uk>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -55 +55 @@
 
 my $jsDriverArgs = "-L " . join(" ", @testsToSkip);
-my $root; # intentionally left undefined
-my $skipBuild = 0;
-my $showHelp = 0;
+# These variables are intentionally left undefined.
+my $root;
+my $showHelp;
+my $skipBuild;
+
+my $buildJSC = 1;
 
 my $programName = basename($0);
+my $buildJSCDefault = $buildJSC ? "will check" : "will not check";
 my $usage = <<EOF;
 Usage: $programName [options] [options to pass to build system]
@@ -65 +69 @@
   --jsDriver-args=              A string of arguments to pass to jsDriver.pl
   --root=                       Path to pre-built root containing jsc
+  --[no-]build                  Check (or don't check) to see if the jsc build is up-to-date (default: $buildJSCDefault)
 EOF
 
@@ -70 +75 @@
     'j|jsDriver-args=s' => \$jsDriverArgs,
     'root=s' => \$root,
+    'build!' => \$buildJSC,
     'skip-build' => \$skipBuild,
     'help' => \$showHelp
 );
 
+# FIXME: We'll remove this and the --skip-build option once we change over the buildbot configuration
+# to use --no-build. See <https://bugs.webkit.org/show_bug.cgi?id=62767> for more details.
+$buildJSC = 0 if $skipBuild;
+
 # Assume any arguments left over from GetOptions are assumed to be build arguments
 my @buildArgs = @ARGV;
@@ -87 +97 @@
 setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
 
-if (!defined($root) && !$skipBuild) {
+if (!defined($root) && $buildJSC) {
     chdirWebKit();