cvs: php-gcov-web(SOC06) /cron cron.sh valgrind.php

nlopess Tue Aug 8 19:04:26 2006 UTC Modified files: (Branch: SOC06) /php-gcov-web/cron cron.sh valgrind.php Log: simplify the cron script and make it faster also http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/cron.sh?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-gcov-web/cron/cron.sh diff -u php-gcov-web/cron/cron.sh:1.1.2.2 php-gcov-web/cron/cron.sh:1.1.2.3 --- php-gcov-web/cron/cron.sh:1.1.2.2 Tue Aug 8 18:03:03 2006 +++ php-gcov-web/cron/cron.sh Tue Aug 8 19:04:26 2006 @@ -1,9 +1,6 @@ #!/bin/sh -LC_ALL=C -export LC_ALL - -VALGRIND=valgrind +export LC_ALL=C # file that contains the PHP version tags filename=tags.inc @@ -45,40 +42,19 @@ #test for success of the make operation if ( make > /dev/null 2> ${TMPDIR}/php_build.log ); then - #echo pass > ${OUTDIR}/last_make_status.inc - MAKESTATUS=pass - # note: start this enables valgrind - export NO_INTERACTION=1 - export TEST_PHP_VALGRIND=${VALGRIND} - make test > ${TMPDIR}/php_test_valgrind.log - php ${WORKDIR}/valgrind.php ${TMPDIR} ${OUTDIR} ${PHPSRC} - # note: end this enables valgrind + export TEST_PHP_ARGS="-m -U -n -q -s ${TMPDIR}/php_test.log" - #rm .php_cov_info.ltpdata - #rm -r "*.gcov" - - make lcov --warn-undefined-variables - make lcov-html --warn-undefined-variables - #rm -fr ${OUTDIR}/lcov_html + make lcov mv lcov_html ${OUTDIR} + php ${WORKDIR}/valgrind.php ${TMPDIR} ${OUTDIR} ${PHPSRC} - export NO_INTERACTION=1 - #export TEST_PHP_VALGRIND= - - # note: start this enables run-tests - export TEST_PHP_EXECUTABLE="./sapi/cli/php" - ./sapi/cli/php run-tests.php -U -m > ${TMPDIR}/php_test.log - # note: end this enables run-tests - - echo make successful + echo "make successful" else - #if make failed - MAKESTATUS=fail + echo "make failed" + fi - echo make failed - fi php ${WORKDIR}/cron.php ${TMPDIR} ${OUTDIR} ${PHPSRC} ${MAKESTATUS} ${PHPVERSION} done http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/valgrind.php?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-gcov-web/cron/valgrind.php diff -u php-gcov-web/cron/valgrind.php:1.1.2.2 php-gcov-web/cron/valgrind.php:1.1.2.3 --- php-gcov-web/cron/valgrind.php:1.1.2.2 Tue Aug 8 18:03:04 2006 +++ php-gcov-web/cron/valgrind.php Tue Aug 8 19:04:26 2006 @@ -21,7 +21,7 @@ $version = basename($phpdir, __FILE__); // fix filename after the others are fixed -$data = file_get_contents("$tmpdir/php_test_valgrind.log"); +$data = file_get_contents("$tmpdir/php_test.log"); //$write = html_header('Valgrind Reports');