zoe Sun Jun 28 12:25:00 2009 UTC
Modified files:
/phpruntests/src/taskScheduler rtTaskTestGroup.php
/phpruntests/src/testrun rtPhpTestRun.php
/phpruntests/src/testgroup rtPhpTestGroup.php
/phpruntests/src/configuration rtCommandLineOptions.php
Log:
add option for different types of output
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskTestGroup.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskTestGroup.php
diff -u phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.2
phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.3
--- phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.2 Sat Jun 27
17:47:54 2009
+++ phpruntests/src/taskScheduler/rtTaskTestGroup.php Sun Jun 28 12:25:00 2009
@@ -27,7 +27,12 @@
{
$testGroup = new rtPhpTestGroup($this->runConfiguration,
$this->subDirectory);
$testGroup->runGroup($this->runConfiguration);
- $testGroup->writeGroup();
+
+ $outType = 'list';
+ if ($this->runConfiguration->hasCommandLineOption('o')) {
+ $outType =
$this->runConfiguration->getCommandLineOption('o');
+ }
+ $testGroup->writeGroup($outType);
return true;
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.13&r2=1.14&diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.13
phpruntests/src/testrun/rtPhpTestRun.php:1.14
--- phpruntests/src/testrun/rtPhpTestRun.php:1.13 Sat Jun 27 13:53:54 2009
+++ phpruntests/src/testrun/rtPhpTestRun.php Sun Jun 28 12:25:00 2009
@@ -36,6 +36,12 @@
// $preConditionList->check($this->commandLine,
$this->environmentVariables);
$preConditionList->check($runConfiguration);
+
+ //Set the type of output. Defaults to 'list' - comatible with old
version
+ $this->outType = 'list';
+ if ($runConfiguration->hasCommandLineOption('o')) {
+ $this->outType =
$runConfiguration->getCommandLineOption('o');
+ }
if ($runConfiguration->getSetting('TestDirectories') != null) {
@@ -73,7 +79,7 @@
foreach ($subDirectories as $subDirectory) {
$testGroup = new rtPhpTestGroup($runConfiguration,
$subDirectory);
$testGroup->runGroup($runConfiguration);
- $testGroup->writeGroup();
+ $testGroup->writeGroup($this->outType);
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/testgroup/rtPhpTestGroup.php?r1=1.9&r2=1.10&diff_format=u
Index: phpruntests/src/testgroup/rtPhpTestGroup.php
diff -u phpruntests/src/testgroup/rtPhpTestGroup.php:1.9
phpruntests/src/testgroup/rtPhpTestGroup.php:1.10
--- phpruntests/src/testgroup/rtPhpTestGroup.php:1.9 Sun Jun 14 13:52:21 2009
+++ phpruntests/src/testgroup/rtPhpTestGroup.php Sun Jun 28 12:25:00 2009
@@ -70,9 +70,9 @@
}
}
- public function writeGroup()
+ public function writeGroup($outType)
{
- $testOutputWriter = rtTestOutputWriter::getInstance($this->results,
'list');
+ $testOutputWriter = rtTestOutputWriter::getInstance($this->results,
$outType);
$testOutputWriter->write($this->testDirectory);
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtCommandLineOptions.php?r1=1.6&r2=1.7&diff_format=u
Index: phpruntests/src/configuration/rtCommandLineOptions.php
diff -u phpruntests/src/configuration/rtCommandLineOptions.php:1.6
phpruntests/src/configuration/rtCommandLineOptions.php:1.7
--- phpruntests/src/configuration/rtCommandLineOptions.php:1.6 Fri Jun 26
00:07:24 2009
+++ phpruntests/src/configuration/rtCommandLineOptions.php Sun Jun 28
12:25:00 2009
@@ -39,6 +39,7 @@
'd',
'p',
's',
+ 'o', //new for output type (list, xml, csv...)
'z', //parallel - run out of obvious letters
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
