com phpruntests: remove hard coded paths: build.xml
| From: | David Soria Parra | Date: | Wed, 09 May 2012 18:57:48 +0000 |
| Subject: | com phpruntests: remove hard coded paths: build.xml | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66286@lists.php.net to get a copy of this message | ||
Commit: b1ddef2e426054bb1ccee09bcd3be906ca888d1d
Author: Zoe Slattery <zoe@php.net> Wed, 9 May 2012 18:57:48 +0000
Parents: 772692d8bc3eb860b12bc5c1a3df1dec5f26e630
Branches: master
Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=b1ddef2e426054bb1ccee09bcd3be906ca888d1d
Log:
remove hard coded paths
Changed paths:
M build.xml
Diff:
diff --git a/build.xml b/build.xml
index cb5cbd2..c5dc5f9 100755
--- a/build.xml
+++ b/build.xml
@@ -50,7 +50,9 @@
</target>
<target name="compare" description="Old/New comparison of phpt
results.">
- <fail unless="php" message="Path to PHP executable not defined, use
-Dphp=/path/to/php" />
+ <fail unless="php" message="Path to standard PHP executable not defined, use
-Dphp=/path/to/php" />
+ <fail unless="php_to_test" message="Path to test PHP source dir not defined,
use -Dphp_to_test=/path/to/php_source_dir" />
+
<delete dir="_compare" />
<mkdir dir="_compare" />
@@ -62,8 +64,8 @@
<exec command="tar xfz QATESTS.tgz" dir="/tmp/phpruntests" />
- <exec command="${php} -n /Users/zoe/Applications/PHP/php-5.4.0/run-tests.php -n -p
${php} /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} -o csv -s
${project.basedir}/_compare/new.out /tmp/phpruntests" dir="/tmp/phpruntests"
passthru="true" checkReturn="true" />
+ <exec command="${php} -n ${php_to_test}/run-tests.php -n -p ${php_to_test}/sapi/cli/php
/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}/sapi/cli/php -o csv -s ${project.basedir}/_compare/new.out /tmp/phpruntests"
dir="/tmp/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"/>