You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ja...@apache.org on 2010/04/29 18:25:31 UTC
svn commit: r939369 -
/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Author: jawarner
Date: Thu Apr 29 16:25:31 2010
New Revision: 939369
URL: http://svn.apache.org/viewvc?rev=939369&view=rev
Log:
Need to support running the report generation for tomcat and jetty
Modified:
geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.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?rev=939369&r1=939368&r2=939369&view=diff
==============================================================================
--- 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 Apr 29 16:25:31 2010
@@ -362,6 +362,8 @@ class Controller extends gbuild.system.P
}
def generateReport = {
+ def webcontainer = params.require('webcontainer')
+
def sourceDir = new File("target/results").canonicalFile
log.info "Source dir: $sourceDir"
assert sourceDir.exists() : sourceDir
@@ -370,11 +372,23 @@ class Controller extends gbuild.system.P
log.info "Target dir: $targetDir"
// Find all of the result archives
- def files = ant.fileScanner {
- fileset(dir: sourceDir) {
- include(name: 'tomcat/runtests-results-*.zip')
- include(name: 'jetty/runtests-results-*.zip')
- }
+
+ switch(webcontainer) {
+ case 'tomcat' :
+ def files = ant.fileScanner {
+ fileset(dir: sourceDir) {
+ include(name: 'tomcat/runtests-results-*.zip')
+ }
+ }
+ break
+
+ case 'jetty' :
+ def files = ant.fileScanner {
+ fileset(dir: sourceDir) {
+ include(name: 'jetty/runtests-results-*.zip')
+ }
+ }
+ break
}
def archives = []