Changeset 590 for trunk


Ignore:
Timestamp:
2009-04-01T17:40:12+02:00 (6 years ago)
Author:
moo
Message:

change the way to run all php tests, with php-src php-cli php-cgi symlink to correct target

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.frag

    r585 r590  
    3939 
    4040xcachetest: 
     41    $(SED) "s#\\./modules/#$(top_builddir)/modules/#" < $(srcdir)/xcache-test.ini > $(top_builddir)/tmp-php.ini 
    4142    TEST_PHP_SRCDIR=$(top_srcdir) \ 
    4243    CC="$(CC)" \ 
    43         $(srcdir)/run-xcachetest -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS) $(TEST_ARGS) -c $(srcdir)/xcache-test.ini 
     44        $(srcdir)/run-xcachetest -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini 
  • trunk/run-xcachetest

    r522 r590  
    11#!/bin/sh 
     2 
     3getAbsolutePath() { 
     4    which readlink >/dev/null 2>&1 && readlink -f "$@" || echo "$@" 
     5} 
    26 
    37# use symlink first 
    48if test -x ./php-cli ; then 
    5     php_cli=./php-cli 
     9    php_cli=`getAbsolutePath ./php-cli` 
    610elif test ! -z "$TEST_PHP_EXECUTABLE" && test -x "$TEST_PHP_EXECUTABLE"; then 
    711    php_cli="$TEST_PHP_EXECUTABLE" 
     
    1115 
    1216if test -x ./php-cgi ; then 
    13     php_cgi=./php-cgi 
     17    php_cgi=`getAbsolutePath ./php-cgi` 
    1418else 
    1519    php_cgi="`which php-cgi`" 
    1620fi 
    1721 
    18 test -z "$PHP_SRC" && PHP_SRC=./php-src 
    19 if test -z "$TEST_PHP_USER" ; then 
    20     TEST_PHP_USER="$PHP_SRC/tests" 
    21     for i in Zend ZendEngine2 ext/standard/tests ext/reflection/tests ext/spl/tests; do 
    22         if test -d "$PHP_SRC/$i" ; then 
    23             TEST_PHP_USER="$TEST_PHP_USER,$PHP_SRC/$i" 
    24         fi 
    25     done 
    26 fi 
     22test -z "$PHP_SRC" && PHP_SRC=`getAbsolutePath ./php-src` 
    2723 
    2824TEST_PHP_EXECUTABLE="$php_cli" 
    2925TEST_PHP_CGI_EXECUTABLE="$php_cgi" 
     26TEST_PHP_SRCDIR="$PHP_SRC" 
    3027 
     28export TEST_PHP_EXECUTABLE 
    3129export TEST_PHP_CGI_EXECUTABLE 
    32 export TEST_PHP_EXECUTABLE 
    33 export TEST_PHP_USER 
     30export TEST_PHP_SRCDIR 
    3431 
    3532echo "XCache test running with:" 
    3633echo "TEST_PHP_CGI_EXECUTABLE: $TEST_PHP_CGI_EXECUTABLE" 
    3734echo "TEST_PHP_EXECUTABLE:     $TEST_PHP_EXECUTABLE" 
    38 echo "TEST_PHP_USER:           $TEST_PHP_USER" 
    3935 
    4036exec "$php_cli" "$@" 
Note: See TracChangeset for help on using the changeset viewer.