2008-12-21 David Levin <levin@chromium.org>

        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=22950

        Attempted fix for 4 failing XMLHttpReuqest tests on Tiger:
         access-control-basic-allow-preflight-cache-invalidation-by-header.html
         access-control-basic-allow-preflight-cache-invalidation-by-method.html
         access-control-basic-allow-preflight-cache-timeout.html
         access-control-basic-allow-preflight-cache.html

        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php:
        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php:
        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php:
        * http/tests/xmlhttprequest/resources/portabilityLayer.php:
        * http/tests/xmlhttprequest/resources/reset-temp-file.php:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@39434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 260f01f..1a30ff2 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2008-12-21  David Levin  <levin@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22950
+
+        Attempted fix for 4 failing XMLHttpReuqest tests on Tiger:
+         access-control-basic-allow-preflight-cache-invalidation-by-header.html
+         access-control-basic-allow-preflight-cache-invalidation-by-method.html
+         access-control-basic-allow-preflight-cache-timeout.html
+         access-control-basic-allow-preflight-cache.html
+
+        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php:
+        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php:
+        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php:
+        * http/tests/xmlhttprequest/resources/portabilityLayer.php:
+        * http/tests/xmlhttprequest/resources/reset-temp-file.php:
+
 2008-12-22  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 
         Reviewed by George Staikos.

diff --git a/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php b/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php
index 4e01956..0fd6eaf 100755 (executable)
--- a/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php
+++ b/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php
@@ -1,7 +1,7 @@
 <?php
 require_once 'portabilityLayer.php';
 
-$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
+$tmpFile = ensureTrailingSlash(sys_get_temp_dir()) . $_GET['filename'];
 
 function fail()
 {

diff --git a/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php b/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php
index 3374866..4a60fe2 100755 (executable)
--- a/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php
+++ b/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php
@@ -1,7 +1,7 @@
 <?php
 require_once 'portabilityLayer.php';
 
-$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
+$tmpFile = ensureTrailingSlash(sys_get_temp_dir()) . $_GET['filename'];
 
 function fail()
 {

diff --git a/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php b/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php
index c6f5896..ad6fd84 100755 (executable)
--- a/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php
+++ b/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php
@@ -1,7 +1,7 @@
 <?php
 require_once 'portabilityLayer.php';
 
-$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
+$tmpFile = ensureTrailingSlash(sys_get_temp_dir()) . $_GET['filename'];
 
 function fail()
 {

diff --git a/LayoutTests/http/tests/xmlhttprequest/resources/portabilityLayer.php b/LayoutTests/http/tests/xmlhttprequest/resources/portabilityLayer.php
index 8502ea0..fc789b1 100755 (executable)
--- a/LayoutTests/http/tests/xmlhttprequest/resources/portabilityLayer.php
+++ b/LayoutTests/http/tests/xmlhttprequest/resources/portabilityLayer.php
@@ -29,4 +29,10 @@ if (!function_exists('file_put_contents')) {
     }
 }
 
+function ensureTrailingSlash($path)
+{
+    if ($path[strlen($path) - 1] == '/')
+        return $path;
+    return $path . '/';
+}
 ?>

diff --git a/LayoutTests/http/tests/xmlhttprequest/resources/reset-temp-file.php b/LayoutTests/http/tests/xmlhttprequest/resources/reset-temp-file.php
index de5a827..271f83e 100755 (executable)
--- a/LayoutTests/http/tests/xmlhttprequest/resources/reset-temp-file.php
+++ b/LayoutTests/http/tests/xmlhttprequest/resources/reset-temp-file.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'portabilityLayer.php';
 
-$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
+$tmpFile = ensureTrailingSlash(sys_get_temp_dir()) . $_GET['filename'];
 unlink($tmpFile)
 ?>