Ignore:
Timestamp:
2013-09-25T05:04:43+02:00 (20 months ago)
Author:
moo
Message:

merge devel stuffs from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/run-xcachetest

    r863 r1396  
    2222TEST_PHP_EXECUTABLE="$php_cli"
    2323TEST_PHP_CGI_EXECUTABLE="$php_cgi"
    24 test -z "$TEST_PHP_SRCDIR" && TEST_PHP_SRCDIR=`getAbsolutePath ./php-src`
     24real_php_src=`getAbsolutePath ./php-src`;
     25test -z "$TEST_PHP_SRCDIR" && TEST_PHP_SRCDIR=$real_php_src
    2526
    2627export TEST_PHP_EXECUTABLE
     
    3334echo "TEST_PHP_SRCDIR:         $TEST_PHP_SRCDIR"
    3435
    35 run_tests_php=$TEST_PHP_SRCDIR/run-tests.php
    36 exec "$php_cli" -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" $run_tests_php "$@"
     36run_tests_src=$real_php_src/run-tests.php
     37if test -z "$TEST_EXT" ; then
     38    sed "s#'ext',##g" < "$run_tests_src" > run-tests.php
     39else
     40    cp "$run_tests_src" run-tests.php
     41fi
     42exec "$php_cli" -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" `getAbsolutePath ./run-tests.php` "$@"
Note: See TracChangeset for help on using the changeset viewer.