cvs: php-gcov-web(SOC06) /cron config.sh cron.sh tags.inc

nlopess Sun Sep 3 13:06:00 2006 UTC Modified files: (Branch: SOC06) /php-gcov-web/cron tags.inc config.sh cron.sh Log: enhance the cron script, by testing if valgrind exists, create some dirs when needed, etc.. all todo items related with the script should be done http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/tags.inc?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-gcov-web/cron/tags.inc diff -u php-gcov-web/cron/tags.inc:1.1.2.5 php-gcov-web/cron/tags.inc:1.1.2.6 --- php-gcov-web/cron/tags.inc:1.1.2.5 Sun Sep 3 11:46:03 2006 +++ php-gcov-web/cron/tags.inc Sun Sep 3 13:06:00 2006 @@ -1,5 +1,5 @@ -/tmp -/var/local/gcov/www +/tmp/gcov +/www/gcov PHP_4_4 PHP_5_2 PHP_HEAD http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/config.sh?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-gcov-web/cron/config.sh diff -u php-gcov-web/cron/config.sh:1.1.2.1 php-gcov-web/cron/config.sh:1.1.2.2 --- php-gcov-web/cron/config.sh:1.1.2.1 Sat Jul 8 19:25:37 2006 +++ php-gcov-web/cron/config.sh Sun Sep 3 13:06:00 2006 @@ -1,6 +1,7 @@ #!/bin/sh -PHPSRC=/home/quadra23/temp/PHP_5_2 -TMPDIR=/home/quadra23/temp/tmp -OUTDIR=/var/local/gcov/www/PHP_5_2 +PHPSRC=/tmp/gcov +TMPDIR=/tmp +OUTDIR=/www/gcov +CVSROOT=:pserver:cvsread@cvs.php.net:/repository VALGRIND=valgrind http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/cron.sh?r1=1.1.2.7&r2=1.1.2.8&diff_format=u Index: php-gcov-web/cron/cron.sh diff -u php-gcov-web/cron/cron.sh:1.1.2.7 php-gcov-web/cron/cron.sh:1.1.2.8 --- php-gcov-web/cron/cron.sh:1.1.2.7 Fri Sep 1 16:32:35 2006 +++ php-gcov-web/cron/cron.sh Sun Sep 3 13:06:00 2006 @@ -15,6 +15,7 @@ # Calculate how many elements there are in a php version array TAGS_COUNT=${#TAGS_ARRAY[@]} +BUILT_SOME=0 PHPROOT=${TAGS_ARRAY[0]} OUTROOT=${TAGS_ARRAY[1]} @@ -36,7 +37,6 @@ else if [ $BUILD = $PHPTAG ]; then BUILD_VERSION=1 - #todo: if tag does not exist, output error else BUILD_VERSION=0 fi @@ -45,30 +45,55 @@ # If this version should be built if [ $BUILD_VERSION = 1 ]; then - # todo: make sure all the following directories exist + BUILT_SOME=1 + OUTDIR=${OUTROOT}/${PHPTAG} PHPSRC=${PHPROOT}/${PHPTAG} TMPDIR=${PHPROOT}/tmp/${PHPTAG} - cd ${PHPSRC} + mkdir -p $OUTDIR + mkdir -p $TMPDIR + + cd ${PHPROOT} + if [ -d ${PHPTAG} ]; then + cd ${PHPTAG} + cvs -q up + else + cvs -q -d ${CVSROOT} co -d ${PHPTAG} -r ${PHPTAG} php-src + cd ${PHPTAG} + fi ./cvsclean - cvs -q up - ./buildconf --force - ./config.nice + ./buildconf --force > /dev/null + + if [ -x ./config.nice ]; then + ./config.nice > /dev/null + else + # try to run with the default options + ./configure > /dev/null + fi if ( make > /dev/null 2> ${TMPDIR}/php_build.log ); then #test for success of the make operation MAKESTATUS=pass - export TEST_PHP_ARGS="-m -U -n -q --keep-all" + TEST_PHP_ARGS="-U -n -q --keep-all" - # LCOV operations - make lcov > ${TMPDIR}/php_test.log - rm -fr ${OUTDIR}/lcov_html - mv lcov_html ${OUTDIR} + # only run valgrind testing if it is available + if (valgrind --version >/dev/null 2>&1 && test "$VALGRIND" ); then + TEST_PHP_ARGS+=" -m" + fi + + # test for lcov support + if ( grep lcov Makefile ); then + make lcov > ${TMPDIR}/php_test.log + rm -fr ${OUTDIR}/lcov_html + mv lcov_html ${OUTDIR} + else + make test > ${TMPDIR}/php_test.log + fi - echo "make successful" + echo "make successful: ${PHPTAG}" else MAKESTATUS=fail echo "make failed" @@ -78,3 +103,11 @@ fi # End verify build PHP version done + + +# display an error if the tag doesn't exist +if [ $BUILT_SOME = 0 ]; then + echo "Invalid tag specified: '$BUILD'" + echo + exit 1 +fi