Commit 032862b0 authored by ap@webkit.org's avatar ap@webkit.org

Reviewed by Adam Roben.

        Fix run-iexploder-tests and run-mangleme-tests to work with updated shared scripts and
        configuration files.

        * Scripts/run-iexploder-tests:
        * Scripts/run-mangleme-tests:
        Renamed runSafari to not conflict with the one in webkitdirs.
        Added SSLCertificateFile option for httpd, as now needed.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 567092fb
2008-05-29 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Adam Roben.
Fix run-iexploder-tests and run-mangleme-tests to work with updated shared scripts and
configuration files.
* Scripts/run-iexploder-tests:
* Scripts/run-mangleme-tests:
Renamed runSafari to not conflict with the one in webkitdirs.
Added SSLCertificateFile option for httpd, as now needed.
2008-05-27 Kevin Ollivier <kevino@theolliviers.com>
wx build fix. Update the sample app after wxWebFrame->wxWebBrowserShell rename.
......
......@@ -41,7 +41,7 @@ use webkitdirs;
sub openHTTPDIfNeeded();
sub closeHTTPD();
sub runSafari();
sub runSafariWithIExploder();
# Argument handling
my $guardMalloc = '';
......@@ -69,7 +69,7 @@ if ($downloadTest) {
system "/usr/bin/curl -o ~/Desktop/iexploder$downloadTest.html \"http://127.0.0.1:$httpdPort/iexploder.cgi?lookup=1&test=$downloadTest\"";
print "Saved the test as iexploder$downloadTest.html on the desktop\n";
} else {
runSafari();
runSafariWithIExploder();
print "Last generated tests:\n";
system "grep 'iexploder.cgi' /tmp/WebKit/access_log.txt | tail -n -5 | awk -F'[ =&\\?]' '{if (\$8 == \"lookup\") print \$11; else print \$9}'";
}
......@@ -77,7 +77,7 @@ if ($downloadTest) {
closeHTTPD();
sub runSafari()
sub runSafariWithIExploder()
{
my $redirectTo;
if (@ARGV) {
......@@ -134,6 +134,7 @@ sub openHTTPDIfNeeded()
$httpdConfig = "$testDirectory/http/conf/apache2-httpd.conf" if `$httpdPath -v` =~ m|Apache/2|;
my $documentRoot = "$iExploderDirectory/htdocs";
my $typesConfig = "$testDirectory/http/conf/mime.types";
my $sslCertificate = "$testDirectory/http/conf/webkit-httpd.pem";
my $listen = "127.0.0.1:$httpdPort";
open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath,
......@@ -143,6 +144,7 @@ sub openHTTPDIfNeeded()
"-c", "TypesConfig \"$typesConfig\"",
"-c", "CustomLog \"/tmp/WebKit/access_log.txt\" common",
"-c", "ErrorLog \"/tmp/WebKit/error_log.txt\"",
"-c", "SSLCertificateFile \"$sslCertificate\"",
# Apache wouldn't run CGIs with permissions==700 otherwise
"-c", "User \"#$<\"");
......
......@@ -41,7 +41,7 @@ use webkitdirs;
sub openHTTPDIfNeeded();
sub closeHTTPD();
sub runSafari();
sub runSafariWithMangleme();
# Argument handling
my $guardMalloc = '';
......@@ -72,7 +72,7 @@ if ($downloadTest) {
system "/usr/bin/curl -o ~/Desktop/mangleme$downloadTest.html http://127.0.0.1:$httpdPort/remangle.cgi?$downloadTest";
print "Saved the test as mangleme$downloadTest.html on the desktop\n";
} else {
runSafari();
runSafariWithMangleme();
print "Last generated tests:\n";
system "grep 'Mangle attempt' /tmp/WebKit/error_log.txt | tail -n -5 | awk ' {print \$4}'";
}
......@@ -80,7 +80,7 @@ if ($downloadTest) {
closeHTTPD();
sub runSafari()
sub runSafariWithMangleme()
{
my $redirectTo;
if (@ARGV) {
......@@ -137,6 +137,7 @@ sub openHTTPDIfNeeded()
$httpdConfig = "$testDirectory/http/conf/apache2-httpd.conf" if `$httpdPath -v` =~ m|Apache/2|;
my $documentRoot = "$manglemeDirectory";
my $typesConfig = "$testDirectory/http/conf/mime.types";
my $sslCertificate = "$testDirectory/http/conf/webkit-httpd.pem";
my $listen = "127.0.0.1:$httpdPort";
open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath,
......@@ -146,6 +147,7 @@ sub openHTTPDIfNeeded()
"-c", "TypesConfig \"$typesConfig\"",
"-c", "CustomLog \"/tmp/WebKit/access_log.txt\" common",
"-c", "ErrorLog \"/tmp/WebKit/error_log.txt\"",
"-c", "SSLCertificateFile \"$sslCertificate\"",
# Apache wouldn't run CGIs with permissions==700 otherwise
"-c", "User \"#$<\"");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment