Title: [89136] trunk/Tools
- Revision
- 89136
- Author
- dba...@webkit.org
- Date
- 2011-06-17 08:06:29 -0700 (Fri, 17 Jun 2011)
Log Message
2011-06-17 Daniel Bates <dba...@rim.com>
Rubber-stamped by Eric Seidel.
Remove run-_javascript_core-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-_javascript_core-tests. Also, add a remark about these options to the usage message
printed by run-_javascript_core-tests.
We'll remove --skip-build in a follow up patch once the master buildbot picks up the changes.
* Scripts/run-_javascript_core-tests: Additionally, remove unnecessary initialization
of $showHelp.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89135 => 89136)
--- trunk/Tools/ChangeLog 2011-06-17 12:40:35 UTC (rev 89135)
+++ trunk/Tools/ChangeLog 2011-06-17 15:06:29 UTC (rev 89136)
@@ -1,3 +1,21 @@
+2011-06-17 Daniel Bates <dba...@rim.com>
+
+ Rubber-stamped by Eric Seidel.
+
+ Remove run-_javascript_core-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-_javascript_core-tests. Also, add a remark about these options to the usage message
+ printed by run-_javascript_core-tests.
+
+ We'll remove --skip-build in a follow up patch once the master buildbot picks up the changes.
+
+ * Scripts/run-_javascript_core-tests: Additionally, remove unnecessary initialization
+ of $showHelp.
+
2011-06-17 Joone Hur <joone....@collabora.co.uk>
Reviewed by Martin Robinson.
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (89135 => 89136)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2011-06-17 12:40:35 UTC (rev 89135)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2011-06-17 15:06:29 UTC (rev 89136)
@@ -54,25 +54,35 @@
);
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]
--help Show this help message
--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
GetOptions(
'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;
@@ -86,7 +96,7 @@
setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
-if (!defined($root) && !$skipBuild) {
+if (!defined($root) && $buildJSC) {
chdirWebKit();
push(@buildArgs, argumentsForConfiguration());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
