Title: [88012] trunk/Tools
- Revision
- 88012
- Author
- [email protected]
- Date
- 2011-06-03 06:56:34 -0700 (Fri, 03 Jun 2011)
Log Message
2011-06-03 Andras Becsi <[email protected]>
Reviewed by Csaba Osztrogonác.
Print error message when there is no httpd present on the system
https://bugs.webkit.org/show_bug.cgi?id=61939
* Scripts/old-run-webkit-tests: Propose to run with --no-httpd.
* Scripts/webkitperl/httpd.pm:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (88011 => 88012)
--- trunk/Tools/ChangeLog 2011-06-03 13:47:02 UTC (rev 88011)
+++ trunk/Tools/ChangeLog 2011-06-03 13:56:34 UTC (rev 88012)
@@ -1,3 +1,13 @@
+2011-06-03 Andras Becsi <[email protected]>
+
+ Reviewed by Csaba Osztrogonác.
+
+ Print error message when there is no httpd present on the system
+ https://bugs.webkit.org/show_bug.cgi?id=61939
+
+ * Scripts/old-run-webkit-tests: Propose to run with --no-httpd.
+ * Scripts/webkitperl/httpd.pm:
+
2011-06-03 Mikhail Naganov <[email protected]>
Reviewed by Yury Semikhatsky.
Modified: trunk/Tools/Scripts/old-run-webkit-tests (88011 => 88012)
--- trunk/Tools/Scripts/old-run-webkit-tests 2011-06-03 13:47:02 UTC (rev 88011)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2011-06-03 13:56:34 UTC (rev 88012)
@@ -525,7 +525,11 @@
if (!$testHTTP) {
$ignoredDirectories{'http'} = 1;
$ignoredDirectories{'websocket'} = 1;
+} elsif (!hasHTTPD()) {
+ print "\nNo httpd found. Cannot run http tests.\nPlease use --no-http if you do not want to run http tests.\n"
+ exit 1;
}
+
if (!$testWebSocket) {
$ignoredDirectories{'websocket'} = 1;
}
Modified: trunk/Tools/Scripts/webkitperl/httpd.pm (88011 => 88012)
--- trunk/Tools/Scripts/webkitperl/httpd.pm 2011-06-03 13:47:02 UTC (rev 88011)
+++ trunk/Tools/Scripts/webkitperl/httpd.pm 2011-06-03 13:56:34 UTC (rev 88012)
@@ -47,6 +47,7 @@
$VERSION = 1.00;
@ISA = qw(Exporter);
@EXPORT = qw(&getHTTPDPath
+ &hasHTTPD
&getHTTPDConfigPathForTestDirectory
&getDefaultConfigForTestDirectory
&openHTTPD
@@ -86,6 +87,12 @@
return $httpdPath;
}
+sub hasHTTPD
+{
+ my @command = (getHTTPDPath(), "-v");
+ return system(@command) == 0;
+}
+
sub getDefaultConfigForTestDirectory
{
my ($testDirectory) = @_;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
