You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/11/20 17:52:47 UTC
svn commit: r1037264 - in
/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS:
Controller.groovy report/ReportGenerator.groovy
Author: genspring
Date: Sat Nov 20 16:52:47 2010
New Revision: 1037264
URL: http://svn.apache.org/viewvc?rev=1037264&view=rev
Log:
Fix the iteration.name param in ReportGenerator.groovy
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/config/projects/Geronimo_CTS/report/ReportGenerator.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=1037264&r1=1037263&r2=1037264&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 Sat Nov 20 16:52:47 2010
@@ -136,20 +136,20 @@ class Controller extends gbuild.system.P
}
def showProcessesAndTemp() {
- /* def shell = new ShellExecutor()
+ def shell = new ShellExecutor()
shell << """
- ps -ef | grep anthill | grep -v com.urbancode.anthill3.main | grep -v grep | grep -v /$0
+ ps -ef | grep anthill | grep -v com.urbancode.anthill3.main | grep -v grep | grep -v \$0
echo ""
echo "Tmp files:"
- ls -lh /tmp | grep -v `basename /$0`
+ ls -lh /tmp | grep -v `basename \$0`
"""
- shell.execute()*/
+ shell.execute()
}
def runtests = {
- // showEnv()
- // showProcessesAndTemp()
+ showEnv()
+ showProcessesAndTemp()
def exec = new ExecCommand(context)
exec.executable = 'project/tck-testsuite/runtests'
@@ -267,7 +267,7 @@ class Controller extends gbuild.system.P
}
// Clean up after retard-o-tron TCK
- /* ant.delete() {
+ ant.delete() {
fileset(dir: '/tmp') {
include(name: 'anthill-cts-props.txt')
include(name: 'geronimo*.tmp')
@@ -279,21 +279,21 @@ class Controller extends gbuild.system.P
include(name: 'deniedFile*tmp')
include(name: 'fSimpleTabularData*ser')
}
- }*/
+ }
//
// HACK: Show what processes and tmp are left around afterwards
//
- // showProcessesAndTemp()
+ showProcessesAndTemp()
// This isn't working properly. Comment it out for now.
// Nuke any bastard children
//new BastardChildReaper().reap()
// Still need to make sure that the server isn't left around after the test finishes
- // ShellExecutor.execute('pkill -9 -f server.jar')
- // ShellExecutor.execute('pkill -9 -f geronimo-main.jar')
- // ShellExecutor.execute('pkill -9 -f dbprocedures.jar')
- // ShellExecutor.execute('pkill -9 -f admin-cli.jar')
+ ShellExecutor.execute('pkill -9 -f server.jar')
+ ShellExecutor.execute('pkill -9 -f geronimo-main.jar')
+ ShellExecutor.execute('pkill -9 -f dbprocedures.jar')
+ ShellExecutor.execute('pkill -9 -f admin-cli.jar')
}
}
@@ -404,7 +404,7 @@ class Controller extends gbuild.system.P
def targetDir = new File("target/results/$webcontainer").canonicalFile
log.info "Target dir: $targetDir"
- separator()
+ separator()
ant.mkdir(dir: targetDir)
@@ -438,6 +438,7 @@ class Controller extends gbuild.system.P
def generateReport = {
def webcontainer = params.require('webcontainer')
def javaeeLevel = params.require('javaee.level')
+ def iterationName =params.get('iteration.name')
def sourceDir = new File("target/results").canonicalFile
log.info "Source dir: $sourceDir"
@@ -469,7 +470,7 @@ class Controller extends gbuild.system.P
separator()
- new ReportGenerator(null, targetDir, javaeeLevel).generate()
+ new ReportGenerator(archives, targetDir, javaeeLevel, iterationName).generate()
separator()
}
Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy?rev=1037264&r1=1037263&r2=1037264&view=diff
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy Sat Nov 20 16:52:47 2010
@@ -49,10 +49,13 @@ class ReportGenerator extends LogSupport
String javaeeLevel
- def ReportGenerator(List archives, File targetDir, String javaeeLevel) {
+ String iterationName
+
+ def ReportGenerator(List archives, File targetDir, String javaeeLevel,String iterationName) {
this.archives = archives
this.targetDir = targetDir
this.javaeeLevel = javaeeLevel
+ this.iterationName=iterationName
assert archives.size() > 0
@@ -165,9 +168,6 @@ class ReportGenerator extends LogSupport
// Load the iterations.xml configuration so we can use that for rendering
def cfg = new IterationConfigurator()
- def javaeeLevel = params.require('javaee.level')
- def iterationName =params.get('iteration.name');
-
if (javaeeLevel.equals('web')) {
if(iterationName==null||iterationName.equals('all')) {