g2              Mon Jul  6 20:35:54 2009 UTC

  Modified files:              
    /phpruntests/src/configuration      rtCommandLineOptions.php 
    /phpruntests/src/testrun    rtPhpTestRun.php 
    /phpruntests/src/testcase   rtTestOutputWriter.php 
  Log:
  phpruntests - update outputWriter, adjusted command-line-arguments
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtCommandLineOptions.php?r1=1.8&r2=1.9&diff_format=u
Index: phpruntests/src/configuration/rtCommandLineOptions.php
diff -u phpruntests/src/configuration/rtCommandLineOptions.php:1.8 
phpruntests/src/configuration/rtCommandLineOptions.php:1.9
--- phpruntests/src/configuration/rtCommandLineOptions.php:1.8  Sun Jul  5 
20:51:16 2009
+++ phpruntests/src/configuration/rtCommandLineOptions.php      Mon Jul  6 
20:35:53 2009
@@ -23,7 +23,7 @@
         'm',
         'q',
         'x',
-        'v',
+        'v', // verbose-mode level 1
         'h',
     );
 
@@ -38,17 +38,17 @@
         'c',
         'd',
         'p',
-        's',
-        'o',  //new for output type (list, xml, csv...)
-       'z',  //parallel - run out of obvious letters
-       'g', // flushing report durring test-execution 
+        's',  // save - defines the filename to store the results
+        'o',  // output type (list, xml, csv...)
+       'z',  // parallel - run out of obvious letters
     );
 
     /**
      * @var array
      */
     protected $longOptions = array(
-        'verbose',
+        'vv',  // verbose-mode level 2
+       'vvv',  // verbose-mode level 3
         'help',
         'keep-all',
         'keep-php',
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.20&r2=1.21&diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.20 
phpruntests/src/testrun/rtPhpTestRun.php:1.21
--- phpruntests/src/testrun/rtPhpTestRun.php:1.20       Sun Jul  5 20:51:16 2009
+++ phpruntests/src/testrun/rtPhpTestRun.php    Mon Jul  6 20:35:54 2009
@@ -63,15 +63,14 @@
                }
             }
 
-            // check for the cmd-line-option 'g' which defines the 
report-status
+            // check for the cmd-line-option 'v' which defines the 
report-status
             $reportStatus = 0;
-            if ($runConfiguration->hasCommandLineOption('g')) {
-               
-               $reportStatus = $runConfiguration->getCommandLineOption('g');
-               
-               if (!is_numeric($reportStatus) || $processCount < 0) {
-                       $reportStatus = 1;
-               }
+            if ($runConfiguration->hasCommandLineOption('v')) {
+                               $reportStatus = 1;
+            } else if ($runConfiguration->hasCommandLineOption('vv')) {
+                               $reportStatus = 2;
+            } else if ($runConfiguration->hasCommandLineOption('vvv')) {
+                               $reportStatus = 3;
             }
                
             // create the task-list
@@ -98,9 +97,14 @@
                        $outputWriter = rtTestOutputWriter::getInstance($type);
                        $outputWriter->setResultList($resultList);
                        $outputWriter->printOverview(sizeof($taskList), 
$scheduler->getProcessCount());
+
+                       $filename = null;
+                       if ($runConfiguration->hasCommandLineOption('s')) {
+                               $filename = 
$runConfiguration->getCommandLineOption('s');
+                       }
                        
-               if ($runConfiguration->hasCommandLineOption('o')) {
-                   $outputWriter->write();     
+               if ($type || $filename) {
+                   $outputWriter->write($filename);    
             }
 
         } else {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestOutputWriter.php?r1=1.7&r2=1.8&diff_format=u
Index: phpruntests/src/testcase/rtTestOutputWriter.php
diff -u phpruntests/src/testcase/rtTestOutputWriter.php:1.7 
phpruntests/src/testcase/rtTestOutputWriter.php:1.8
--- phpruntests/src/testcase/rtTestOutputWriter.php:1.7 Sun Jul  5 20:51:16 2009
+++ phpruntests/src/testcase/rtTestOutputWriter.php     Mon Jul  6 20:35:54 2009
@@ -70,7 +70,7 @@
     
     
     
-    public function write()
+    public function write($filename=null)
     {
        $this->createOutput();
        
@@ -80,10 +80,12 @@
                        mkdir(self::OUTPUT_DIR);
                }
 
-               $file = 
self::OUTPUT_DIR.'/results_'.microtime(true).'.'.$this->type;
+               if (is_null($filename)) {
+                       $filename = 
self::OUTPUT_DIR.'/results_'.round(microtime(true)).'.'.$this->type;
+               }
                
-               if (file_put_contents($file, $this->output)) {
-                       print "\nThe Test-Results were saved in <$file>\n";
+               if (file_put_contents($filename, $this->output)) {
+                       print "\nThe Test-Results were saved in <$filename>\n";
                } else {
                        print "\nError while saving results.\n";
                }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to