Changeset 1404


Ignore:
Timestamp:
2013-09-26T09:49:09+02:00 (13 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: 1403
  • branches/3.0/devel/run

    r1396 r1404  
    7575        return 1 
    7676    fi 
    77     find . -iname \*.c | sort | while read -r sourceFile; do 
     77    find . -iname \*.c | LANG=C sort | while read -r sourceFile; do 
    7878        sourceFile=${sourceFile#./} 
    7979        { 
     
    119119                    fi 
    120120                esac 
    121             done | sort | uniq 
     121            done | LANG=C sort | uniq 
    122122        } | xargs 
    123123    done > Makefile.frag.deps 
     
    260260    retest) 
    261261        shift 
    262         $MAKE $MAKEOPTS xcachetest "$@" TESTS="`grep '^/.*\.phpt$' php_test_results_*.txt | uniq | xargs`" 
     262        lastResult=$(ls php_test_results_*.txt | LANG=C sort | tail -n1) 
     263        $MAKE $MAKEOPTS xcachetest "$@" TESTS="$(grep '^/.*\.phpt$' $lastResult | uniq | xargs)" 
    263264        return 
    264265        ;; 
Note: See TracChangeset for help on using the changeset viewer.