Browse Source

merge devel stuffs from trunk

git-svn-id: svn://svn.lighttpd.net/xcache/branches/3.0@1396 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 8 years ago
parent
commit
53cc8d9671
  1. 3
      devel/run
  2. 12
      run-xcachetest
  3. 13
      xcache-test.ini

3
devel/run

@ -300,7 +300,8 @@ run() {
val*)
shift
export USE_ZEND_ALLOC=0
tracer=(valgrind --gen-suppressions=all)
export ZEND_DONT_UNLOAD_MODULES=1
tracer=(valgrind -v --gen-suppressions=all)
;;
esac

12
run-xcachetest

@ -21,7 +21,8 @@ fi
TEST_PHP_EXECUTABLE="$php_cli"
TEST_PHP_CGI_EXECUTABLE="$php_cgi"
test -z "$TEST_PHP_SRCDIR" && TEST_PHP_SRCDIR=`getAbsolutePath ./php-src`
real_php_src=`getAbsolutePath ./php-src`;
test -z "$TEST_PHP_SRCDIR" && TEST_PHP_SRCDIR=$real_php_src
export TEST_PHP_EXECUTABLE
export TEST_PHP_CGI_EXECUTABLE
@ -32,5 +33,10 @@ echo "TEST_PHP_CGI_EXECUTABLE: $TEST_PHP_CGI_EXECUTABLE"
echo "TEST_PHP_EXECUTABLE: $TEST_PHP_EXECUTABLE"
echo "TEST_PHP_SRCDIR: $TEST_PHP_SRCDIR"
run_tests_php=$TEST_PHP_SRCDIR/run-tests.php
exec "$php_cli" -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" $run_tests_php "$@"
run_tests_src=$real_php_src/run-tests.php
if test -z "$TEST_EXT" ; then
sed "s#'ext',##g" < "$run_tests_src" > run-tests.php
else
cp "$run_tests_src" run-tests.php
fi
exec "$php_cli" -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" `getAbsolutePath ./run-tests.php` "$@"

13
xcache-test.ini

@ -1,17 +1,20 @@
date.timezone = Asia/Shanghai
memory_limit = 256M
error_reporting = E_ALL|E_STRICT
error_reporting = E_ALL|E_STRICT|E_DEPRECATED
display_errors = On
report_memleaks = 0
[xcache]
extension_dir="./modules/"
extension_dir="./.libs/"
extension=xcache.so
xcache.cacher = On
xcache.test = 1
xcache.stat = 1
xcache.experimental = On
xcache.size = 16M
xcache.count = 1
xcache.size = 64M
xcache.count = 2
xcache.var_size = 1M
xcache.var_count = 1
xcache.var_count = 2
xcache.var_slots = 1000
; xcache.mmap_path = "/dev/zero"
xcache.mmap_path = "/tmp/xcache"

Loading…
Cancel
Save