Ignore:
Timestamp:
2013-09-26T09:36:44+02:00 (15 months ago)
Author:
moo
Message:

merge from trunk

Location:
branches/3.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0

    • Property svn:mergeinfo changed
      /trunkmerged: 1401
  • branches/3.0/run-xcachetest

    r1396 r1402  
    3434echo "TEST_PHP_SRCDIR:         $TEST_PHP_SRCDIR" 
    3535 
     36patch_run_tests_ext() { 
     37    if test -z "$TEST_EXT" ; then 
     38        sed "s#'ext',##g" 
     39    else 
     40        cat 
     41    fi 
     42} 
     43patch_run_tests_report_leaks() { 
     44    if test -z "$TEST_REPORT_MEMLEAKS" ; then 
     45        sed "s#'report_memleaks=1',#'report_memleaks=0',#g" 
     46    else 
     47        cat 
     48    fi 
     49} 
    3650run_tests_src=$real_php_src/run-tests.php 
    37 if test -z "$TEST_EXT" ; then 
    38     sed "s#'ext',##g" < "$run_tests_src" > run-tests.php 
    39 else 
    40     cp "$run_tests_src" run-tests.php 
    41 fi 
     51patch_run_tests_ext < "$run_tests_src" | patch_run_tests_report_leaks > run-tests.php 
    4252exec "$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.