Author: jdillon
Date: Thu Feb  1 00:18:30 2007
New Revision: 502157

URL: http://svn.apache.org/viewvc?view=rev&rev=502157
Log:
Include all of the javatest output from tck-work
Now that we spit out lots of info, add a separator() for clarity

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/ProjectController.groovy

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy?view=diff&rev=502157&r1=502156&r2=502157
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy Thu Feb  1 00:18:30 2007
@@ -119,6 +119,8 @@
         def targetDir = new File('target/runtime').canonicalFile
         log.info "Target dir: $targetDir"
         
+        separator()
+        
         // Collect the harness
         ant.mkdir(dir: targetDir)
         ant.copy(todir: targetDir, verbose: true) {
@@ -218,6 +220,8 @@
                 exclude(name: '**/target/**')
             }
         }
+        
+        separator()
     }
     
     def collectResults = {
@@ -231,23 +235,26 @@
         def targetDir = new File("reports/tck/$workflowId/$iteration").canonicalFile
         log.info "Target dir: $targetDir"
         
-        ant.mkdir(dir: targetDir)
+        separator()
         
         // Copy test output to be saved/remoted
+        ant.mkdir(dir: targetDir)
         ant.copy(todir: targetDir, verbose: true) {
             fileset(dir: sourceDir) {
                 include(name: 'logs/**')
                 include(name: 'summary.properties')
-                
-                //
-                // TODO: Shall we also include the javatest output too?
-                //
-                // NOTE: Can probably drop the webcontainer bits here,
-                //       may also want to re-root this stuff under javatest/ or something
-                //
-                // include(name: "tck-work/$webcontainer/**")
             }
         }
+        
+        // Include the javatest workdir output
+        ant.mkdir(dir: "$targetDir/work")
+        ant.copy(todir: "$targetDir/work", verbose: true) {
+            fileset(dir: "$sourceDir/tck-work/$webcontainer") {
+                include(name: '**')
+            }
+        }
+        
+        separator()
     }
     
     def generateReport = {
@@ -295,6 +302,15 @@
         args << "-DsummariesDirectory=$summariesDir"
         args << "-DreportsDirectory=ignored"
         args << "-DoutputDirectory=$reportDir"
+        
+        //
+        // NOTE: We really want to have easy links to the javatest/server logs from the html report
+        //       which generally means copying them into reportDir (duplicated them from artifacts)
+        //
+        
+        //
+        // TODO: Generate summary of iterations, with links to logs in addition to a test summary
+        //
         
         maven.execute(args)
     }

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/ProjectController.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/ProjectController.groovy?view=diff&rev=502157&r1=502156&r2=502157
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/ProjectController.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/ProjectController.groovy Thu Feb  1 00:18:30 2007
@@ -57,4 +57,10 @@
     def fail(reason) {
         throw new ActionFailure(reason)
     }
+    
+    def separator() {
+        println ''
+        println '=' * 80
+        println ''
+    }
 }