Changeset 1396 in svn


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

merge devel stuffs from trunk

Location:
branches/3.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/devel/run

    r1348 r1396  
    301301        shift
    302302        export USE_ZEND_ALLOC=0
    303         tracer=(valgrind --gen-suppressions=all)
     303        export ZEND_DONT_UNLOAD_MODULES=1
     304        tracer=(valgrind -v --gen-suppressions=all)
    304305        ;;
    305306    esac
  • 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` "$@"
  • branches/3.0/xcache-test.ini

    r1026 r1396  
     1date.timezone = Asia/Shanghai
    12memory_limit = 256M
    2 error_reporting = E_ALL|E_STRICT
     3error_reporting = E_ALL|E_STRICT|E_DEPRECATED
     4display_errors = On
     5report_memleaks = 0
    36
    47[xcache]
    5 extension_dir="./modules/"
     8extension_dir="./.libs/"
    69extension=xcache.so
    710xcache.cacher = On
     
    912xcache.stat = 1
    1013xcache.experimental = On
    11 xcache.size = 16M
    12 xcache.count = 1
     14xcache.size = 64M
     15xcache.count = 2
    1316xcache.var_size = 1M
    14 xcache.var_count = 1
     17xcache.var_count = 2
    1518xcache.var_slots = 1000
    1619; xcache.mmap_path = "/dev/zero"
Note: See TracChangeset for help on using the changeset viewer.