revert script check-ins that I didn't mean to commit
authorslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Dec 2007 22:10:45 +0000 (22:10 +0000)
committerslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Dec 2007 22:10:45 +0000 (22:10 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/Scripts/run-iexploder-tests
WebKitTools/Scripts/run-mangleme-tests

index 05f2dc0..6acff18 100755 (executable)
@@ -130,25 +130,13 @@ sub openHTTPDIfNeeded()
     my $testDirectory = getcwd() . "/LayoutTests";
     my $iExploderDirectory = getcwd() . "/WebKitTools/iExploder";
     my $httpdPath = "/usr/sbin/httpd";
-    my $httpdConfig;
-    if (isCygwin()) {
-        my $windowsConfDirectory = "$testDirectory/http/conf/";
-        unless (-x "/usr/lib/apache/libphp4.dll") {
-            copy("$windowsConfDirectory/libphp4.dll", "/usr/lib/apache/libphp4.dll");
-            chmod(0755, "/usr/lib/apache/libphp4.dll");
-        }
-        $httpdConfig = "$windowsConfDirectory/cygwin-httpd.conf";
-    } else {
-        $httpdConfig = "$testDirectory/http/conf/httpd.conf";
-        $httpdConfig = "$testDirectory/http/conf/apache2-httpd.conf" if `$httpdPath -v` =~ m|Apache/2|;
-    }
+    my $httpdConfig = "$testDirectory/http/conf/httpd.conf";
+    $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 $listen = "127.0.0.1:$httpdPort";
-    #my $absTestResultsDirectory = File::Spec->rel2abs(glob $testResultsDirectory);
-    my $sslCertificate = "$testDirectory/http/conf/webkit-httpd.pem";
 
-    my @args = (
+    open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath, 
         "-f", "$httpdConfig",
         "-C", "DocumentRoot \"$documentRoot\"",
         "-C", "Listen $listen",
@@ -156,14 +144,7 @@ sub openHTTPDIfNeeded()
         "-c", "CustomLog \"/tmp/WebKit/access_log.txt\" common",
         "-c", "ErrorLog \"/tmp/WebKit/error_log.txt\"",
         # Apache wouldn't run CGIs with permissions==700 otherwise
-        "-c", "User \"#$<\""
-    );
-
-    # FIXME: Enable this on Windows once <rdar://problem/5345985> is fixed
-    push(@args, "-c", "SSLCertificateFile \"$sslCertificate\"") unless isCygwin();
-
-    open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath, @args);
-    
+        "-c", "User \"#$<\"");
 
     my $retryCount = 20;
     while (system("/usr/bin/curl -q --silent --stderr - --output /dev/null $listen") && $retryCount) {
index aae98b6..78b5d14 100755 (executable)
@@ -74,7 +74,7 @@ if ($downloadTest) {
 } else {
     runSafari();
     print "Last generated tests:\n";
-    system "grep 'Mangle attempt' /tmp/WebKit/error_log.txt | tail -n -5 | awk ' {print \$12}'";
+    system "grep 'Mangle attempt' /tmp/WebKit/error_log.txt | tail -n -5 | awk ' {print \$4}'";
 }
 
 closeHTTPD();
@@ -104,7 +104,7 @@ sub runSafari()
     
     local %ENV;
     $ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc;
-    system "WebKitTools/Scripts/run-safari /tmp/WebKit/redirect.html";
+    system "WebKitTools/Scripts/run-safari", "-NSOpen", "/tmp/WebKit/redirect.html";
 }
 
 sub openHTTPDIfNeeded()
@@ -133,25 +133,13 @@ sub openHTTPDIfNeeded()
     my $testDirectory = getcwd() . "/LayoutTests";
     my $manglemeDirectory = getcwd() . "/WebKitBuild/mangleme";
     my $httpdPath = "/usr/sbin/httpd";
-    my $httpdConfig;
-    if (isCygwin()) {
-        my $windowsConfDirectory = "$testDirectory/http/conf/";
-        unless (-x "/usr/lib/apache/libphp4.dll") {
-            copy("$windowsConfDirectory/libphp4.dll", "/usr/lib/apache/libphp4.dll");
-            chmod(0755, "/usr/lib/apache/libphp4.dll");
-        }
-        $httpdConfig = "$windowsConfDirectory/cygwin-httpd.conf";
-    } else {
-        $httpdConfig = "$testDirectory/http/conf/httpd.conf";
-        $httpdConfig = "$testDirectory/http/conf/apache2-httpd.conf" if `$httpdPath -v` =~ m|Apache/2|;
-    }
+    my $httpdConfig = "$testDirectory/http/conf/httpd.conf";
+    $httpdConfig = "$testDirectory/http/conf/apache2-httpd.conf" if `$httpdPath -v` =~ m|Apache/2|;
     my $documentRoot = "$manglemeDirectory";
     my $typesConfig = "$testDirectory/http/conf/mime.types";
     my $listen = "127.0.0.1:$httpdPort";
-    #my $absTestResultsDirectory = File::Spec->rel2abs(glob $testResultsDirectory);
-    my $sslCertificate = "$testDirectory/http/conf/webkit-httpd.pem";
 
-    my @args = (
+    open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath, 
         "-f", "$httpdConfig",
         "-C", "DocumentRoot \"$documentRoot\"",
         "-C", "Listen $listen",
@@ -159,14 +147,7 @@ sub openHTTPDIfNeeded()
         "-c", "CustomLog \"/tmp/WebKit/access_log.txt\" common",
         "-c", "ErrorLog \"/tmp/WebKit/error_log.txt\"",
         # Apache wouldn't run CGIs with permissions==700 otherwise
-        "-c", "User \"#$<\""
-    );
-
-    # FIXME: Enable this on Windows once <rdar://problem/5345985> is fixed
-    push(@args, "-c", "SSLCertificateFile \"$sslCertificate\"") unless isCygwin();
-
-    open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath, @args);
-
+        "-c", "User \"#$<\"");
 
     my $retryCount = 20;
     while (system("/usr/bin/curl -q --silent --stderr - --output /dev/null $listen") && $retryCount) {