com phpruntests: Update test bucket to dev stream, temporary fix to INI sects: QA/QATESTS.tgz QA/createQaTestBucket.sh
src/configuration/rtIniAsCommandLineArgs.php src/testcase/rtTestConfiguration.php src/testcase/sections/executablesections/rtSkipIfSection.php
src/testrun/rtPhpTestRun.php tests/configuration/rtIniAsCommandLineArgsTest.php

Commit: 53e9743eceb770fa759cb80fcf634a203053e53b Author: zoe slattery <zoe@php.net> Wed, 16 May 2012 09:54:00 +0100 Parents: 3089bb73e1ba8bd3e3beec9ed75988b7fcb62942 Branches: master Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=53e9743eceb770fa759cb80fcf634a203053e53b Log: Update test bucket to dev stream, temporary fix to INI sects Changed paths: M QA/QATESTS.tgz M QA/createQaTestBucket.sh M src/configuration/rtIniAsCommandLineArgs.php M src/testcase/rtTestConfiguration.php M src/testcase/sections/executablesections/rtSkipIfSection.php M src/testrun/rtPhpTestRun.php M tests/configuration/rtIniAsCommandLineArgsTest.php

diff --git a/QA/QATESTS.tgz b/QA/QATESTS.tgz index 55be370..652290c 100644 Binary files a/QA/QATESTS.tgz and b/QA/QATESTS.tgz differ diff --git a/QA/createQaTestBucket.sh b/QA/createQaTestBucket.sh index dd46475..fd719ad 100644 --- a/QA/createQaTestBucket.sh +++ b/QA/createQaTestBucket.sh @@ -1,71 +1,71 @@ #!/bin/sh # Use this to create the QA test bucket. eq $2=/tmp/blah, $1=/path/to/php/source mkdir -p $2/ext/ctype/tests -cp -r $1/php-5.4.0/ext/ctype/tests/* $2/ext/ctype/tests +cp -r $1/ext/ctype/tests/* $2/ext/ctype/tests mkdir -p $2/ext/date/tests -cp -r $1/php-5.4.0/ext/date/tests/* $2/ext/date/tests +cp -r $1/ext/date/tests/* $2/ext/date/tests mkdir -p $2/ext/dom/tests -cp -r $1/php-5.4.0/ext/dom/tests/* $2/ext/dom/tests +cp -r $1/ext/dom/tests/* $2/ext/dom/tests mkdir -p $2/ext/ereg/tests -cp -r $1/php-5.4.0/ext/ereg/tests/* $2/ext/ereg/tests +cp -r $1/ext/ereg/tests/* $2/ext/ereg/tests mkdir -p $2/ext/fileinfo/tests -cp -r $1/php-5.4.0/ext/fileinfo/tests/* $2/ext/fileinfo/tests +cp -r $1/ext/fileinfo/tests/* $2/ext/fileinfo/tests mkdir -p $2/ext/filter/tests -cp -r $1/php-5.4.0/ext/filter/tests/* $2/ext/filter/tests +cp -r $1/ext/filter/tests/* $2/ext/filter/tests mkdir -p $2/ext/iconv/tests -cp -r $1/php-5.4.0/ext/iconv/tests/* $2/ext/iconv/tests +cp -r $1/ext/iconv/tests/* $2/ext/iconv/tests mkdir -p $2/ext/json/tests -cp -r $1/php-5.4.0/ext/json/tests/* $2/ext/json/tests +cp -r $1/ext/json/tests/* $2/ext/json/tests mkdir -p $2/ext/libxml/tests -cp -r $1/php-5.4.0/ext/libxml/tests/* $2/ext/libxml/tests +cp -r $1/ext/libxml/tests/* $2/ext/libxml/tests mkdir -p $2/ext/mysql/tests -cp -r $1/php-5.4.0/ext/mysql/tests/* $2/ext/mysql/tests +cp -r $1/ext/mysql/tests/* $2/ext/mysql/tests mkdir -p $2/ext/mysqli/tests -cp -r $1/php-5.4.0/ext/mysqli/tests/* $2/ext/mysqli/tests +cp -r $1/ext/mysqli/tests/* $2/ext/mysqli/tests mkdir -p $2/ext/pcre/tests -cp -r $1/php-5.4.0/ext/pcre/tests/* $2/ext/pcre/tests +cp -r $1/ext/pcre/tests/* $2/ext/pcre/tests mkdir -p $2/ext/pdo/tests -cp -r $1/php-5.4.0/ext/pdo/tests/* $2/ext/pdo/tests +cp -r $1/ext/pdo/tests/* $2/ext/pdo/tests mkdir -p $2/ext/pdo_mysql/tests -cp -r $1/php-5.4.0/ext/pdo_mysql/tests/* $2/ext/pdo_mysql/tests +cp -r $1/ext/pdo_mysql/tests/* $2/ext/pdo_mysql/tests mkdir -p $2/ext/pdo_sqlite/tests -cp -r $1/php-5.4.0/ext/pdo_sqlite/tests/* $2/ext/pdo_sqlite/tests +cp -r $1/ext/pdo_sqlite/tests/* $2/ext/pdo_sqlite/tests mkdir -p $2/ext/phar/tests -cp -r $1/php-5.4.0/ext/phar/tests/* $2/ext/phar/tests +cp -r $1/ext/phar/tests/* $2/ext/phar/tests mkdir -p $2/ext/posix/tests -cp -r $1/php-5.4.0/ext/posix/tests/* $2/ext/posix/tests +cp -r $1/ext/posix/tests/* $2/ext/posix/tests mkdir -p $2/ext/reflection/tests -cp -r $1/php-5.4.0/ext/reflection/tests/* $2/ext/reflection/tests +cp -r $1/ext/reflection/tests/* $2/ext/reflection/tests mkdir -p $2/ext/session/tests -cp -r $1/php-5.4.0/ext/session/tests/* $2/ext/session/tests +cp -r $1/ext/session/tests/* $2/ext/session/tests mkdir -p $2/ext/spl/examples/tests -cp -r $1/php-5.4.0/ext/spl/examples/tests/* $2/ext/spl/examples/tests +cp -r $1/ext/spl/examples/tests/* $2/ext/spl/examples/tests mkdir -p $2/ext/spl/tests -cp -r $1/php-5.4.0/ext/spl/tests/* $2/ext/spl/tests +cp -r $1/ext/spl/tests/* $2/ext/spl/tests mkdir -p $2/ext/sqlite3/tests -cp -r $1/php-5.4.0/ext/sqlite3/tests/* $2/ext/sqlite3/tests +cp -r $1/ext/sqlite3/tests/* $2/ext/sqlite3/tests mkdir -p $2/ext/standard/tests -cp -r $1/php-5.4.0/ext/standard/tests/* $2/ext/standard/tests +cp -r $1/ext/standard/tests/* $2/ext/standard/tests mkdir -p $2/ext/tokenizer/tests -cp -r $1/php-5.4.0/ext/tokenizer/tests/* $2/ext/tokenizer/tests +cp -r $1/ext/tokenizer/tests/* $2/ext/tokenizer/tests mkdir -p $2/ext/xml/tests -cp -r $1/php-5.4.0/ext/xml/tests/* $2/ext/xml/tests +cp -r $1/ext/xml/tests/* $2/ext/xml/tests mkdir -p $2/ext/xmlreader/tests -cp -r $1/php-5.4.0/ext/xmlreader/tests/* $2/ext/xmlreader/tests +cp -r $1/ext/xmlreader/tests/* $2/ext/xmlreader/tests mkdir -p $2/ext/xmlwriter/tests -cp -r $1/php-5.4.0/ext/xmlwriter/tests/* $2/ext/xmlwriter/tests +cp -r $1/ext/xmlwriter/tests/* $2/ext/xmlwriter/tests mkdir -p $2/ext/zlib/tests -cp -r $1/php-5.4.0/ext/zlib/tests/* $2/ext/zlib/tests +cp -r $1/ext/zlib/tests/* $2/ext/zlib/tests mkdir -p $2/sapi/cgi/tests -cp -r $1/php-5.4.0/sapi/cgi/tests/* $2/sapi/cgi/tests +cp -r $1/sapi/cgi/tests/* $2/sapi/cgi/tests mkdir -p $2/sapi/cli/tests -cp -r $1/php-5.4.0/sapi/cli/tests/* $2/sapi/cli/tests +cp -r $1/sapi/cli/tests/* $2/sapi/cli/tests mkdir -p $2/sapi/tests -cp -r $1/php-5.4.0/sapi/tests/* $2/sapi/tests +cp -r $1/sapi/tests/* $2/sapi/tests mkdir -p $2/tests -cp -r $1/php-5.4.0/tests/* $2/tests +cp -r $1/tests/* $2/tests mkdir -p $2/Zend/tests -cp -r $1/php-5.4.0/Zend/tests/* $2/Zend/tests +cp -r $1/Zend/tests/* $2/Zend/tests #extract these tests as they don't run outside the PHP source tree rm $2/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt rm $2/ext/spl/examples/tests/dualiterator_001.phpt diff --git a/src/configuration/rtIniAsCommandLineArgs.php b/src/configuration/rtIniAsCommandLineArgs.php index e74160c..196c8fc 100644 --- a/src/configuration/rtIniAsCommandLineArgs.php +++ b/src/configuration/rtIniAsCommandLineArgs.php @@ -68,7 +68,11 @@ class rtIniAsCommandLineArgs $setting = $this->stripSpaces($setting); $args .= " -d \"$setting\""; } else { - throw new rtException("Invalid INI setting $setting"); + //TODO ext/libxml/tests/bug61367-read.phpt + // and ext/libxml/tests/bug61367-write.phpt + // introduce a comment mid-section which triggers + // this exception. Fix tests or doc? + //throw new rtException("Invalid INI setting $setting"); } } diff --git a/src/testcase/rtTestConfiguration.php b/src/testcase/rtTestConfiguration.php index 44abeb2..b369d2b 100644 --- a/src/testcase/rtTestConfiguration.php +++ b/src/testcase/rtTestConfiguration.php @@ -17,6 +17,7 @@ class rtTestConfiguration { protected $environmentVariables; protected $phpCommandLineArguments; + protected $phpNonFileSectionCommandLineArguments; protected $testCommandLineArguments; protected $phpExecutable; protected $inputFileString; @@ -90,7 +91,10 @@ class rtTestConfiguration protected function setPhpCommandLineArguments(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection) { - $this->phpCommandLineArguments = $runConfiguration->getSetting('PhpCommandLineArguments'); + //Use different arguments for running SKIPIF and so on. The INI settings may be designed to + //produce an error whaich will inetrfere with SKIPIF processing. + $this->phpNonFileSectionCommandLineArguments = $runConfiguration->getSetting('PhpCommandLineArguments'); + $this->phpCommandLineArguments = $runConfiguration->getSetting('PhpCommandLineArguments'); if (array_key_exists('INI', $sections)) { $sections['INI']->substitutePWD($fileSection->getFileName()); $additionalArguments = $sections['INI']->getCommandLineArguments(); @@ -167,6 +171,11 @@ class rtTestConfiguration { return $this->phpCommandLineArguments; } + + public function getPhpNonFileSectionCommandLineArguments() + { + return $this->phpNonFileSectionCommandLineArguments; + } public function getTestCommandLineArguments() { diff --git a/src/testcase/sections/executablesections/rtSkipIfSection.php b/src/testcase/sections/executablesections/rtSkipIfSection.php index e90325d..8d3a95e 100644 --- a/src/testcase/sections/executablesections/rtSkipIfSection.php +++ b/src/testcase/sections/executablesections/rtSkipIfSection.php @@ -36,7 +36,7 @@ class rtSkipIfSection extends rtExecutableSection } $phpCommand = $phpExecutable; - $phpCommand .= ' '.$testCase->testConfiguration->getPhpCommandLineArguments(); + $phpCommand .= ' '.$testCase->testConfiguration->getPhpNonFileSectionCommandLineArguments(); $phpCommand .= ' -f '.$this->fileName; $this->phpCommand = $phpCommand; diff --git a/src/testrun/rtPhpTestRun.php b/src/testrun/rtPhpTestRun.php index d9fbaca..87147c2 100644 --- a/src/testrun/rtPhpTestRun.php +++ b/src/testrun/rtPhpTestRun.php @@ -61,7 +61,7 @@ class rtPhpTestRun foreach ($runConfiguration->getSetting('TestDirectories') as $testDirectory) { $subDirectories = array_merge($subDirectories, rtUtil::parseDir($testDirectory)); } - + // check for the cmd-line-option 'z' which defines parellel-execution $processCount = 0; if ($runConfiguration->hasCommandLineOption('z')) { @@ -72,6 +72,7 @@ class rtPhpTestRun $processCount = 2; } } + // check for the cmd-line-option 'v' which defines the report-status $reportStatus = 0; diff --git a/tests/configuration/rtIniAsCommandLineArgsTest.php b/tests/configuration/rtIniAsCommandLineArgsTest.php index df02821..9b57d30 100644 --- a/tests/configuration/rtIniAsCommandLineArgsTest.php +++ b/tests/configuration/rtIniAsCommandLineArgsTest.php @@ -43,17 +43,17 @@ class rtIniAsCommandLineArgsTest extends PHPUnit_Framework_TestCase $this->assertEquals($last37, 'r_mode=U_INVALID_SUBSTITUTE\" -d \"a=f\"'); } - /** - * @expectedException rtException - */ - public function testInvalidArg() + +/* + * TODO: Reinstate this test when decided what to do about comments in INI sections + public function testInvalidArg() { $iniSet = new rtIniAsCommandLineArgs(); $iniSet->setBase(); $addStr = $iniSet->settingsToArguments(array('af'), $iniSet->getBasePhpDArgs()); } +*/ - public function testValidDoubleEquals() { $iniSet = new rtIniAsCommandLineArgs();