zoe Wed, 09 May 2012 16:26:29 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=325627
Log: tidying up Changed paths: U php/phpruntests/trunk/build.xml D php/phpruntests/trunk/phpt-tests/sample_clean.php D php/phpruntests/trunk/phpt-tests/sample_clean_fail.php U php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt U php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt A php/phpruntests/trunk/phpt-tests/utils/ A php/phpruntests/trunk/phpt-tests/utils/hw.php A php/phpruntests/trunk/phpt-tests/utils/hw.save A php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php D php/phpruntests/trunk/phpt-tests/windows_line_endings.php U php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php Modified: php/phpruntests/trunk/build.xml =================================================================== --- php/phpruntests/trunk/build.xml 2012-05-09 16:12:35 UTC (rev 325626) +++ php/phpruntests/trunk/build.xml 2012-05-09 16:26:29 UTC (rev 325627) @@ -11,6 +11,15 @@ <delete dir="QA/sapi" /> <delete dir="QA/tests" /> <delete dir="QA/Zend" /> + <delete> + <fileset dir="phpt-tests" includes="*.out" /> + <fileset dir="phpt-tests" includes="*.exp" /> + <fileset dir="phpt-tests" includes="*.diff" /> + <fileset dir="phpt-tests" includes="*.log" /> + <fileset dir="phpt-tests" includes="*.sh" /> + <fileset dir="phpt-tests" includes="*.post" /> + <fileset dir="phpt-tests" includes="*.php" /> + </delete> </target> <target name="qa" depends="lint, test, coverage, compare, doc" description="Perform quality assurance."> @@ -28,13 +37,6 @@ <include name="**/*.php"/> </fileset> </phplint> - - <phplint haltonfailure="true"> - <fileset dir="tests"> - <include name="*.php"/> - <include name="**/*.php"/> - </fileset> - </phplint> </target> <target name="test" description="Run all unit tests."> Deleted: php/phpruntests/trunk/phpt-tests/sample_clean.php =================================================================== --- php/phpruntests/trunk/phpt-tests/sample_clean.php 2012-05-09 16:12:35 UTC (rev 325626) +++ php/phpruntests/trunk/phpt-tests/sample_clean.php 2012-05-09 16:26:29 UTC (rev 325627) @@ -1,7 +0,0 @@ -<?php - - $file_name = dirname(__FILE__) . "/cleantest.tmp"; - file_put_contents($file_name, "hello world"); - echo "written\n"; - -?> Deleted: php/phpruntests/trunk/phpt-tests/sample_clean_fail.php =================================================================== --- php/phpruntests/trunk/phpt-tests/sample_clean_fail.php 2012-05-09 16:12:35 UTC (rev 325626) +++ php/phpruntests/trunk/phpt-tests/sample_clean_fail.php 2012-05-09 16:26:29 UTC (rev 325627) @@ -1,7 +0,0 @@ -<?php - - $file_name = dirname(__FILE__) . "/cleantest.tmp"; - file_put_contents($file_name, "hello world"); - echo "written\n"; - -?> Modified: php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt =================================================================== --- php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt 2012-05-09 16:12:35 UTC (rev 325626) +++ php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt 2012-05-09 16:26:29 UTC (rev 325627) @@ -1,6 +1,6 @@ --TEST-- sample test for file_external --FILE_EXTERNAL-- -hw.php +utils/hw.php --EXPECT-- hello world Modified: php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt =================================================================== --- php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt 2012-05-09 16:12:35 UTC (rev 325626) +++ php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt 2012-05-09 16:26:29 UTC (rev 325627) @@ -5,8 +5,8 @@ --FILE-- <?php $content = file_get_contents('php://input'); - -if ($content != gzencode('blahblah=blah')) +$string = gzdecode($content); +if ($string != "blahblah=blah") { echo "invalid gzipped content"; } else { Added: php/phpruntests/trunk/phpt-tests/utils/hw.php =================================================================== --- php/phpruntests/trunk/phpt-tests/utils/hw.php (rev 0) +++ php/phpruntests/trunk/phpt-tests/utils/hw.php 2012-05-09 16:26:29 UTC (rev 325627) @@ -0,0 +1,3 @@ +<?php + echo "hello world\n"; +?> Added: php/phpruntests/trunk/phpt-tests/utils/hw.save =================================================================== --- php/phpruntests/trunk/phpt-tests/utils/hw.save (rev 0) +++ php/phpruntests/trunk/phpt-tests/utils/hw.save 2012-05-09 16:26:29 UTC (rev 325627) @@ -0,0 +1,3 @@ +<?php + echo "hello world\n"; +?> Added: php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php =================================================================== --- php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php (rev 0) +++ php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php 2012-05-09 16:26:29 UTC (rev 325627) @@ -0,0 +1,10 @@ +<?php +// Utility to create a test case with windows line endings. +$testFile = $argv[1]; +$windowsTestFile = $argv[2]; + +$string = file_get_contents($testFile); +$string2 = preg_replace("/\\n/", "\r\n", $string); +file_put_contents($windowsTestFile, (binary) $string2); + +?> Deleted: php/phpruntests/trunk/phpt-tests/windows_line_endings.php =================================================================== --- php/phpruntests/trunk/phpt-tests/windows_line_endings.php 2012-05-09 16:12:35 UTC (rev 325626) +++ php/phpruntests/trunk/phpt-tests/windows_line_endings.php 2012-05-09 16:26:29 UTC (rev 325627) @@ -1,10 +0,0 @@ -<?php -// Utility to create a test case with windows line endings. -$testFile = $argv[1]; -$windowsTestFile = $argv[2]; - -$string = file_get_contents($testFile); -$string2 = preg_replace("/\\n/", "\r\n", $string); -file_put_contents($windowsTestFile, (binary) $string2); - -?> Modified: php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php =================================================================== --- php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php 2012-05-09 16:12:35 UTC (rev 325626) +++ php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php 2012-05-09 16:26:29 UTC (rev 325627) @@ -12,7 +12,7 @@ { $this->php = trim(shell_exec("which php")); $this->php_cgi = trim(shell_exec("which php-cgi")); - + $this->path_to_tests = realpath(dirname(__FILE__) . '/../../phpt-tests'); $this->sample_test = $this->path_to_tests . '/sample_cookie.phpt'; } @@ -31,7 +31,7 @@ //Retrieve the array of test file names $testFiles = $config->getSetting('TestFiles'); - + //Read the test file $testFile = new rtPhpTestFile(); $testFile->doRead($testFiles[0]);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php