Changeset 1573 in svn


Ignore:
Timestamp:
2014-11-12T18:49:04Z (3 years ago)
Author:
Xuefer
Message:

fix tests for older php

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/run-xcachetest

    r1401 r1573  
    1414fi
    1515
     16test_args="-c \"$TEST_INI\""' -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1"'
     17
    1618if test -x ./php-cgi ; then
    1719    php_cgi=`getAbsolutePath ./php-cgi`
     
    2022fi
    2123
    22 TEST_PHP_EXECUTABLE="$php_cli"
    23 TEST_PHP_CGI_EXECUTABLE="$php_cgi"
     24echo '#!/bin/sh' > ./php-cli-test
     25echo 'exec "'$php_cli'" '$test_args' "$@"' >> php-cli-test
     26chmod +x ./php-cli-test
     27
     28echo '#!/bin/sh' > ./php-cgi-test
     29echo 'exec "'$php_cgi'" '$test_args' "$@"' >> php-cgi-test
     30chmod +x ./php-cgi-test
     31
     32TEST_PHP_EXECUTABLE=`getAbsolutePath ./php-cli-test`
     33TEST_PHP_CGI_EXECUTABLE=`getAbsolutePath ./php-cgi-test`
    2434real_php_src=`getAbsolutePath ./php-src`;
    2535test -z "$TEST_PHP_SRCDIR" && TEST_PHP_SRCDIR=$real_php_src
     
    4959}
    5060run_tests_src=$real_php_src/run-tests.php
    51 patch_run_tests_ext < "$run_tests_src" | patch_run_tests_report_leaks > run-tests.php
    52 exec "$php_cli" -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" `getAbsolutePath ./run-tests.php` "$@"
     61patch_run_tests_ext < "$run_tests_src" | sed "s#^\\\$test_dirs = array('.*#\\\$test_dirs = array();#" | patch_run_tests_report_leaks > run-tests.php
     62exec "$TEST_PHP_EXECUTABLE" `getAbsolutePath ./run-tests.php` "$@"
  • trunk/tests/skipif.inc

    r1383 r1573  
    11<?php
    2 if (!extension_loaded("xcache")) {
     2if (version_compare(phpversion(), '5.2', '>=') && !extension_loaded("xcache")) {
    33    die("skip xcache extension not loaded");
    44}
  • trunk/tests/xcache_is_autoglobal.phpt

    r1497 r1573  
    1010--FILE--
    1111<?php
    12 var_dump(xcache_is_autoglobal("GLOBALS"));
     12var_dump(xcache_is_autoglobal("_GET"));
    1313?>
    1414--EXPECT--
Note: See TracChangeset for help on using the changeset viewer.