Changeset 39202 in webkit


Ignore:
Timestamp:
Dec 11, 2008 2:20:57 AM (15 years ago)
Author:
vestbo@webkit.org
Message:

2008-12-08 Dean McNamee <​deanm@chromium.org>

Reviewed by Darin Adler.

Always append a trailing slash when using PHP's sys_get_temp_dir().

This allows these tests to run on Linux, where this API returns the
directory without a trailing slash.

  • 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:
Location:
trunk/LayoutTests
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r39196 r39202  
     12008-12-08  Dean McNamee  <deanm@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Always append a trailing slash when using PHP's sys_get_temp_dir().
     6
     7        This allows these tests to run on Linux, where this API returns the
     8        directory without a trailing slash.
     9
     10        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php:
     11        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php:
     12        * http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php:
     13        * http/tests/xmlhttprequest/resources/portabilityLayer.php:
     14        * http/tests/xmlhttprequest/resources/reset-temp-file.php:
     15
    1162008-12-10  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
    217

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-invalidation.php

    r35540 r39202  
    22require_once 'portabilityLayer.php';
    33
    4 $tempDir = sys_get_temp_dir();
    5 $tmpFile = $tempDir . $_GET['filename'];
     4$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
    65
    76function fail()

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache-timeout.php

    r35540 r39202  
    22require_once 'portabilityLayer.php';
    33
    4 $tempDir = sys_get_temp_dir();
    5 $tmpFile = $tempDir . $_GET['filename'];
     4$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
    65
    76function fail()

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-basic-preflight-cache.php

    r35540 r39202  
    22require_once 'portabilityLayer.php';
    33
    4 $tempDir = sys_get_temp_dir();
    5 $tmpFile = $tempDir . $_GET['filename'];
     4$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
    65
    76function fail()

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/portabilityLayer.php

    r35540 r39202  
    33if (!function_exists('sys_get_temp_dir')) {
    44    // Based on http://www.phpit.net/article/creating-zip-tar-archives-dynamically-php/2/
     5    // If the builtin PHP sys_get_temp_dir doesn't exist, we replace it with one that will
     6    // try to guess from the environment.  Since sys_get_temp_dir() doesn't return a trailing
     7    // slash on all system (see comment at http://us.php.net/sys_get_temp_dir), we don't
     8    // append a trailing slash, and expect callers to append one when needed.
    59    function sys_get_temp_dir()
    610    {
    711        // Try to get from environment variable
    812        if (!empty($_ENV['TMP'])) {
    9             return realpath($_ENV['TMP']) . "/";
     13            return realpath($_ENV['TMP']);
    1014        } else if (!empty($_ENV['TMPDIR']) ) {
    11             return realpath($_ENV['TMPDIR']) . "/";
     15            return realpath($_ENV['TMPDIR']);
    1216        } else if ( !empty($_ENV['TEMP'])) {
    13             return realpath( $_ENV['TEMP']) . "/";
     17            return realpath( $_ENV['TEMP']);
    1418        }
    1519        return FALSE;

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/reset-temp-file.php

    r35540 r39202  
    22require_once 'portabilityLayer.php';
    33
    4 $tempDir = sys_get_temp_dir();
    5 $tmpFile = $tempDir . $_GET['filename'];
     4$tmpFile = sys_get_temp_dir() . '/' . $_GET['filename'];
    65unlink($tmpFile)
    76?>
Note: See TracChangeset for help on using the changeset viewer.