com phpruntests: Add a temp directory to properties: build.xml phpdefinitions.txt phpdefinitions.txt_sample

Commit: 37c1c9bfa7b07d7e1c2e9ba49b04f2d963298143 Author: Zoe Slattery <zoe@php.net> Fri, 11 May 2012 08:16:12 +0000 Parents: 48bb681ca2440c4a9c3ba713ed5376c2defb0d6a Branches: master Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=37c1c9bfa7b07d7e1c2e9ba49b04f2d963298143 Log: Add a temp directory to properties Changed paths: M build.xml D phpdefinitions.txt A phpdefinitions.txt_sample Diff: diff --git a/build.xml b/build.xml index 6e73e9b..bcf8938 100755 --- a/build.xml +++ b/build.xml @@ -59,15 +59,15 @@ <delete dir="_compare" /> <mkdir dir="_compare" /> - <delete dir="/tmp/phpruntests" /> - <mkdir dir="/tmp/phpruntests" /> + <delete dir="${temp_directory}/phpruntests" /> + <mkdir dir="${temp_directory}/phpruntests" /> - <copy file="${project.basedir}/QA/QATESTS.tgz" tofile="/tmp/phpruntests/QATESTS.tgz" /> + <copy file="${project.basedir}/QA/QATESTS.tgz" tofile="${temp_directory}/phpruntests/QATESTS.tgz" /> - <exec command="tar xfz QATESTS.tgz" dir="/tmp/phpruntests" /> + <exec command="tar xfz QATESTS.tgz" dir="${temp_directory}/phpruntests" /> - <exec command="${php} -n ${php_source}/run-tests.php -n -p ${php_to_test} /tmp/phpruntests/Zend /tmp/phpruntests/ext /tmp/phpruntests/sapi /tmp/phpruntests/tests > ${project.basedir}/_compare/old.out" dir="/tmp/phpruntests" passthru="true" checkReturn="true"/> - <exec command="${php} -n ${project.basedir}/src/run-tests.php -n -p ${php_to_test} -o csv -s ${project.basedir}/_compare/new.out /tmp/phpruntests" dir="/tmp/phpruntests" passthru="true" checkReturn="true" /> + <exec command="${php} -n ${php_source}/run-tests.php -n -p ${php_to_test} ${temp_directory}/phpruntests/Zend ${temp_directory}/phpruntests/ext ${temp_directory}/phpruntests/sapi ${temp_directory}/phpruntests/tests > ${project.basedir}/_compare/old.out" dir="${temp_directory}/phpruntests" passthru="true" checkReturn="true"/> + <exec command="${php} -n ${project.basedir}/src/run-tests.php -n -p ${php_to_test} -o csv -s ${project.basedir}/_compare/new.out ${temp_directory}/phpruntests" dir="${temp_directory}/phpruntests" passthru="true" checkReturn="true" /> <exec command="${php} -n QA/compareNewOld.php ${project.basedir}/_compare/new.out ${project.basedir}/_compare/old.out phpruntests > ${project.basedir}/_compare/compare_new_old.out" dir="${project.basedir}" passthru="true" checkReturn="true"/> diff --git a/phpdefinitions.txt b/phpdefinitions.txt deleted file mode 100644 index d1e7c52..0000000 --- a/phpdefinitions.txt +++ /dev/null @@ -1,9 +0,0 @@ -# This file is used as a phing property file and is also read by rtTestBoootstrap.php to determine which -# PHP exectables to use in running unit tests - -#These are example settings, you will need to unomment and change them to the right paths on your system -# -#php=/usr/bin/php -#php_to_test=/usr/local/php540/bin/php -#php_cgi_to_test=/usr/local/php540/bin/php-cgi -#php_source=/Users/zoe/Applications/PHP/php-5.4.0 diff --git a/phpdefinitions.txt_sample b/phpdefinitions..txt_sample new file mode 100644 index 0000000..b1e68bc --- /dev/null +++ b/phpdefinitions.txt_sample @@ -0,0 +1,17 @@ +# This file is used as a phing property file and is also read by rtTestBoootstrap.php to determine which +# PHP exectables to use in running unit tests + +#These are example settings, you will change them to the right paths on your system +#then copy this to phpdefinitions.txt +# +#Your system defualt PHP +php=/usr/bin/php +# +#The version of PHP that you intend to test +php_to_test=/usr/local/php540/bin/php +# +#The location of a copy run-tests.php for running comparison results (qa target) +php_source=/Users/zoe/Applications/PHP/php-5.4.0 +# +#Temporary (writable) directory - also used buy qa target +temp_directory=/tmp